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>
diff --git a/modem_manager.cc b/modem_manager.cc
index 2144f01..89a5ea3 100644
--- a/modem_manager.cc
+++ b/modem_manager.cc
@@ -7,6 +7,7 @@
#include <base/stl_util.h>
#include <mm/mm-modem.h>
+#include "shill/cellular_operator_info.h"
#include "shill/error.h"
#include "shill/logging.h"
#include "shill/modem.h"
@@ -26,6 +27,7 @@
Metrics *metrics,
Manager *manager,
GLib *glib,
+ CellularOperatorInfo *cellular_operator_info,
mobile_provider_db *provider_db)
: proxy_factory_(ProxyFactory::GetInstance()),
service_(service),
@@ -36,6 +38,7 @@
metrics_(metrics),
manager_(manager),
glib_(glib),
+ cellular_operator_info_(cellular_operator_info),
provider_db_(provider_db) {}
ModemManager::~ModemManager() {
@@ -119,22 +122,25 @@
}
// ModemManagerClassic
-ModemManagerClassic::ModemManagerClassic(const string &service,
- const string &path,
- ControlInterface *control_interface,
- EventDispatcher *dispatcher,
- Metrics *metrics,
- Manager *manager,
- GLib *glib,
- mobile_provider_db *provider_db) :
- ModemManager(service,
- path,
- control_interface,
- dispatcher,
- metrics,
- manager,
- glib,
- provider_db) {}
+ModemManagerClassic::ModemManagerClassic(
+ const string &service,
+ const string &path,
+ ControlInterface *control_interface,
+ EventDispatcher *dispatcher,
+ Metrics *metrics,
+ Manager *manager,
+ GLib *glib,
+ CellularOperatorInfo *cellular_operator_info,
+ mobile_provider_db *provider_db)
+ : ModemManager(service,
+ path,
+ control_interface,
+ dispatcher,
+ metrics,
+ manager,
+ glib,
+ cellular_operator_info,
+ provider_db) {}
ModemManagerClassic::~ModemManagerClassic() {}
@@ -161,6 +167,7 @@
dispatcher(),
metrics(),
manager(),
+ cellular_operator_info(),
provider_db()));
RecordAddedModem(modem);
InitModemClassic(modem);