commit 62028b2ae0517c4b82180cbb826fa7a6b66f9ce4
author Ben Chan <benchan@chromium.org> Mon Nov 05 11:20:02 2012 -0800
committer Gerrit <chrome-bot@google.com> Mon Nov 05 14:38:36 2012 -0800
tree 5bd25b9816d9e854f4a6e5e2a1d15e1bb3449acd
parent d7479f1303d16afdb3a02e2faa25db3dd5d866f1

shill: cellular: Instantiate and propagate CellularOperatorInfo object.

BUG=chrome-os-partner:11985
TEST=Build and run unit tests.

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

modem_manager_unittest.cc

diff --git a/modem_manager_unittest.cc b/modem_manager_unittest.cc
index f61aaa5..4266737 100644
--- a/modem_manager_unittest.cc
+++ b/modem_manager_unittest.cc
@@ -40,6 +40,7 @@
                    Metrics *metrics,
                    Manager *manager,
                    GLib *glib,
+                   CellularOperatorInfo *cellular_operator_info,
                    mobile_provider_db *provider_db)
       : ModemManager(service,
                      path,
@@ -48,6 +49,7 @@
                      metrics,
                      manager,
                      glib,
+                     cellular_operator_info,
                      provider_db) {}
 
   virtual ~ModemManagerCore() {}
@@ -65,8 +67,10 @@
   virtual void SetUp() {
     modem_.reset(new StrictModem(
         kOwner, kService, kModemPath, &control_interface_, &dispatcher_,
-        &metrics_, &manager_, static_cast<mobile_provider_db *>(NULL)));
+        &metrics_, &manager_, static_cast<CellularOperatorInfo *>(NULL),
+        static_cast<mobile_provider_db *>(NULL)));
   }
+
  protected:
   static const char kService[];
   static const char kPath[];
@@ -98,6 +102,7 @@
                        &metrics_,
                        &manager_,
                        &glib_,
+                       NULL,
                        NULL) {}
 
   virtual void TearDown() {
@@ -173,6 +178,7 @@
                               Metrics *metrics,
                               Manager *manager,
                               GLib *glib,
+                              CellularOperatorInfo *cellular_operator_info,
                               mobile_provider_db *provider_db) :
       ModemManagerClassic(service,
                           path,
@@ -181,6 +187,7 @@
                           metrics,
                           manager,
                           glib,
+                          cellular_operator_info,
                           provider_db) {}
   MOCK_METHOD1(InitModemClassic, void(shared_ptr<ModemClassic>));
 };
@@ -196,6 +203,7 @@
                        &metrics_,
                        &manager_,
                        &glib_,
+                       NULL,
                        NULL),
         proxy_(new MockModemManagerProxy()),
         proxy_factory_(this) {
@@ -256,6 +264,7 @@
                         Metrics *metrics,
                         Manager *manager,
                         GLib *glib,
+                        CellularOperatorInfo *cellular_operator_info,
                         mobile_provider_db *provider_db) :
       ModemManager1(service,
                     path,
@@ -264,6 +273,7 @@
                     metrics,
                     manager,
                     glib,
+                    cellular_operator_info,
                     provider_db) {}
   MOCK_METHOD2(InitModem1, void(shared_ptr<Modem1>,
                                 const DBusInterfaceToProperties &));
@@ -281,6 +291,7 @@
                        &metrics_,
                        &manager_,
                        &glib_,
+                       NULL,
                        NULL),
         proxy_(new MockDBusObjectManagerProxy()),
         proxy_factory_(this) {