From 3c40822a6e1072078a01819eef72f218ab3ed2e3 Mon Sep 17 00:00:00 2001 From: "benchan@chromium.org" Date: Sat, 17 May 2014 16:59:31 +0000 Subject: Use modemmanager::kModemManager1ServiceName DBus service constant. modemmanager::kModemManager1 has been deprecated and replaced by modemmanager::kModemManager1ServiceName. See https://chromium-review.googlesource.com/#/c/199602/ for details. BUG=None TEST=Run chromeos_unittests. TEST=Send a SMS to a 3G falco and check that a SMS notification is shown. R=stevenjb@chromium.org Review URL: https://codereview.chromium.org/287193004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271230 0039d316-1c4b-4281-b951-d872f2087c98 --- chromeos/dbus/fake_shill_device_client.cc | 2 +- chromeos/network/network_sms_handler.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chromeos/dbus/fake_shill_device_client.cc b/chromeos/dbus/fake_shill_device_client.cc index 9f987bb..0da8f28 100644 --- a/chromeos/dbus/fake_shill_device_client.cc +++ b/chromeos/dbus/fake_shill_device_client.cc @@ -249,7 +249,7 @@ void FakeShillDeviceClient::AddDevice(const std::string& device_path, shill::kDBusObjectProperty, base::Value::CreateStringValue(object_path)); properties->SetWithoutPathExpansion( shill::kDBusServiceProperty, - base::Value::CreateStringValue(modemmanager::kModemManager1)); + base::Value::CreateStringValue(modemmanager::kModemManager1ServiceName)); if (NetworkTypePattern::Cellular().MatchesType(type)) { properties->SetWithoutPathExpansion(shill::kCellularAllowRoamingProperty, new base::FundamentalValue(false)); diff --git a/chromeos/network/network_sms_handler.cc b/chromeos/network/network_sms_handler.cc index d6e608c..9968d60 100644 --- a/chromeos/network/network_sms_handler.cc +++ b/chromeos/network/network_sms_handler.cc @@ -471,7 +471,7 @@ void NetworkSmsHandler::DevicePropertiesCallback( return; } dbus::ObjectPath object_path(object_path_string); - if (service_name == modemmanager::kModemManager1) { + if (service_name == modemmanager::kModemManager1ServiceName) { device_handlers_.push_back( new ModemManager1NetworkSmsDeviceHandler( this, service_name, object_path)); -- cgit v1.1