commit dc1819d8d761028caa002a7c1d68eb96116e78b2
author Ben Chan <benchan@chromium.org> Tue May 13 16:30:31 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed May 14 08:35:21 2014 +0000
tree f9ec018b7fb48a4ed675c376980bfccc8b6b7f83
parent dfd0213b862bbeb26d5efcad4a6abf236ffef3a8

shill: cellular: use DBus service constants from system_api

BUG=None
CQ-DEPEND=CL:199602
CQ-DEPEND=CL:199609
TEST=`FEATURES=test emerge-$BOARD platform2`
TEST=Run network_3GModemPresent on DUT with gobi3k and mu736 modem.

Change-Id: I7ed3606a6a415c1c706eab01456191c7cbca10b2
Reviewed-on: https://chromium-review.googlesource.com/199619
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Thieu Le <thieule@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

modem_info.cc

diff --git a/modem_info.cc b/modem_info.cc
index 7a15563..9c3769e 100644
--- a/modem_info.cc
+++ b/modem_info.cc
@@ -5,7 +5,7 @@
 #include "shill/modem_info.h"
 
 #include <base/files/file_path.h>
-#include <mm/mm-modem.h>
+#include <chromeos/dbus/service_constants.h>
 #include <mobile_provider.h>
 
 #include "shill/cellular_operator_info.h"
@@ -17,19 +17,10 @@
 using base::FilePath;
 using std::string;
 
-// TODO(rochberg): Fix modemmanager-next-interfaces ebuild to include
-// these so that we can simply include ModemManager.h and use these
-// defines
-#define MM_DBUS_PATH    "/org/freedesktop/ModemManager1"
-#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
-
 namespace shill {
 
 namespace {
 
-const char kCromoService[] = "org.chromium.ModemManager";
-const char kCromoPath[] = "/org/chromium/ModemManager";
-
 const char kCellularOperatorInfoPath[] =
     "/usr/share/shill/cellular_operator_info";
 const char kMobileProviderDBPath[] =
@@ -66,9 +57,14 @@
   provider_db_ = mobile_provider_open_db(provider_db_path_.c_str());
   PLOG_IF(WARNING, !provider_db_)
       << "Unable to load mobile provider database: ";
+
+  RegisterModemManager(new ModemManagerClassic(cromo::kCromoServiceName,
+                                               cromo::kCromoServicePath,
+                                               this));
   RegisterModemManager(
-      new ModemManagerClassic(kCromoService, kCromoPath, this));
-  RegisterModemManager(new ModemManager1(MM_DBUS_SERVICE, MM_DBUS_PATH, this));
+      new ModemManager1(modemmanager::kModemManager1ServiceName,
+                        modemmanager::kModemManager1ServicePath,
+                        this));
 }
 
 void ModemInfo::Stop() {