Commit 3c40822a authored by benchan@chromium.org's avatar benchan@chromium.org

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
parent bbe73452
...@@ -249,7 +249,7 @@ void FakeShillDeviceClient::AddDevice(const std::string& device_path, ...@@ -249,7 +249,7 @@ void FakeShillDeviceClient::AddDevice(const std::string& device_path,
shill::kDBusObjectProperty, base::Value::CreateStringValue(object_path)); shill::kDBusObjectProperty, base::Value::CreateStringValue(object_path));
properties->SetWithoutPathExpansion( properties->SetWithoutPathExpansion(
shill::kDBusServiceProperty, shill::kDBusServiceProperty,
base::Value::CreateStringValue(modemmanager::kModemManager1)); base::Value::CreateStringValue(modemmanager::kModemManager1ServiceName));
if (NetworkTypePattern::Cellular().MatchesType(type)) { if (NetworkTypePattern::Cellular().MatchesType(type)) {
properties->SetWithoutPathExpansion(shill::kCellularAllowRoamingProperty, properties->SetWithoutPathExpansion(shill::kCellularAllowRoamingProperty,
new base::FundamentalValue(false)); new base::FundamentalValue(false));
......
...@@ -471,7 +471,7 @@ void NetworkSmsHandler::DevicePropertiesCallback( ...@@ -471,7 +471,7 @@ void NetworkSmsHandler::DevicePropertiesCallback(
return; return;
} }
dbus::ObjectPath object_path(object_path_string); dbus::ObjectPath object_path(object_path_string);
if (service_name == modemmanager::kModemManager1) { if (service_name == modemmanager::kModemManager1ServiceName) {
device_handlers_.push_back( device_handlers_.push_back(
new ModemManager1NetworkSmsDeviceHandler( new ModemManager1NetworkSmsDeviceHandler(
this, service_name, object_path)); this, service_name, object_path));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment