commit 8799a4a8aae726eb563dda4b6a9093614375d519
author Ben Chan <benchan@chromium.org> Sat Apr 13 16:00:13 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Apr 15 17:11:51 2013 -0700
tree 86b1c894764cba982c05a84ecf69cf49f6b5586a
parent 5489b7a5b2f76725f4016846d57e1bad12e046e4

shill: cellular: Remove code interacting with old ModemManager.

BUG=chromium:231086
TEST=Tested the following:
1. Build and run unit tests.
2. Run 'mm_debug' on lumpy with Gobi3k modem and link with E362 modem.
3. Run network_3GSmokeTest autotest lumpy with Gobi3k modem and link
   with E362 modem.
4. Verify shill runs properly on lumpy without modem.

Change-Id: Idf537561b4066511979bec2c10cbaf7bcec9b1d8
Reviewed-on: https://gerrit.chromium.org/gerrit/48087
Reviewed-by: Thieu Le <thieule@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

modem_info_unittest.cc

diff --git a/modem_info_unittest.cc b/modem_info_unittest.cc
index 0944228..804b11a 100644
--- a/modem_info_unittest.cc
+++ b/modem_info_unittest.cc
@@ -64,18 +64,16 @@
   EXPECT_EQ(0, modem_info_.modem_managers_.size());
   EXPECT_CALL(glib_, BusWatchName(_, _, _, _, _, _, _))
       .WillOnce(Return(kWatcher))
-      .WillOnce(Return(kWatcher + 1))
-      .WillOnce(Return(kWatcher + 2));
+      .WillOnce(Return(kWatcher + 1));
   modem_info_.provider_db_path_ = kTestMobileProviderDBPath;
   modem_info_.Start();
-  EXPECT_EQ(3, modem_info_.modem_managers_.size());
+  EXPECT_EQ(2, modem_info_.modem_managers_.size());
   EXPECT_TRUE(modem_info_.provider_db_);
   EXPECT_TRUE(mobile_provider_lookup_by_name(modem_info_.provider_db_, "AT&T"));
   EXPECT_FALSE(mobile_provider_lookup_by_name(modem_info_.provider_db_, "xyz"));
 
   EXPECT_CALL(glib_, BusUnwatchName(kWatcher)).Times(1);
   EXPECT_CALL(glib_, BusUnwatchName(kWatcher + 1)).Times(1);
-  EXPECT_CALL(glib_, BusUnwatchName(kWatcher + 2)).Times(1);
   modem_info_.Stop();
   EXPECT_EQ(0, modem_info_.modem_managers_.size());
   EXPECT_FALSE(modem_info_.provider_db_);
@@ -89,9 +87,8 @@
   // Passes ownership of the database.
   modem_info_.provider_db_ = mobile_provider_open_db(kTestMobileProviderDBPath);
   EXPECT_TRUE(modem_info_.provider_db_);
-  modem_info_.RegisterModemManager<ModemManagerClassic>(
-      kService,
-      "/dbus/service/path");
+  modem_info_.RegisterModemManager(
+      new ModemManagerClassic(kService, "/dbus/service/path", &modem_info_));
   ASSERT_EQ(1, modem_info_.modem_managers_.size());
   ModemManager *manager = modem_info_.modem_managers_[0];
   EXPECT_EQ(kService, manager->service_);