commit b879d14880ce685b874d0837b907816323a74f15
author Ben Chan <benchan@chromium.org> Tue May 15 11:10:32 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue May 15 12:21:23 2012 -0700
tree 05b11c3acd67dfac44f3b730c39639973f53ae5a
parent 9fdf137271659498c0d942c3510a8133478555a7

shill: wimax: Use WiMaxManager DBus constants defined in system_api.

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

Change-Id: If2eb43f2fb80736a103642b33a3577cf6e24241f
Reviewed-on: https://gerrit.chromium.org/gerrit/22713
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

wimax_provider.cc

diff --git a/wimax_provider.cc b/wimax_provider.cc
index 9e07886..b2495a0 100644
--- a/wimax_provider.cc
+++ b/wimax_provider.cc
@@ -5,6 +5,7 @@
 #include "shill/wimax_provider.h"
 
 #include <base/bind.h>
+#include <chromeos/dbus/service_constants.h>
 
 #include "shill/dbus_properties_proxy_interface.h"
 #include "shill/error.h"
@@ -19,12 +20,6 @@
 
 namespace shill {
 
-namespace {
-// TODO(petkov): Declare these in chromeos/dbus/service_constants.h.
-const char kWiMaxManagerServicePath[] = "/org/chromium/WiMaxManager";
-const char kWiMaxManagerServiceName[] = "org.chromium.WiMaxManager";
-}  // namespace
-
 WiMaxProvider::WiMaxProvider(ControlInterface *control,
                              EventDispatcher *dispatcher,
                              Metrics *metrics,
@@ -46,7 +41,8 @@
   }
   properties_proxy_.reset(
       proxy_factory_->CreateDBusPropertiesProxy(
-          kWiMaxManagerServicePath, kWiMaxManagerServiceName));
+          wimax_manager::kWiMaxManagerServicePath,
+          wimax_manager::kWiMaxManagerServiceName));
   properties_proxy_->set_properties_changed_callback(
       Bind(&WiMaxProvider::OnPropertiesChanged, Unretained(this)));
   manager_proxy_.reset(proxy_factory_->CreateWiMaxManagerProxy());