| Index: chromeos/dbus/shill_service_client_stub.cc
|
| diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc
|
| index 677f9d651a61168b341a871851e88a24457948d3..deff9a22c5adbf225f331889e02e6eef5fe243ff 100644
|
| --- a/chromeos/dbus/shill_service_client_stub.cc
|
| +++ b/chromeos/dbus/shill_service_client_stub.cc
|
| @@ -112,8 +112,7 @@ void ShillServiceClientStub::SetProperty(const dbus::ObjectPath& service_path,
|
| if (value.GetAsString(&state) && state == flimflam::kStateOnline) {
|
| ShillManagerClient* manager_client =
|
| DBusThreadManager::Get()->GetShillManagerClient();
|
| - manager_client->GetTestInterface()->RemoveService(service_path.value());
|
| - manager_client->GetTestInterface()->AddServiceAtIndex(
|
| + manager_client->GetTestInterface()->MoveServiceToIndex(
|
| service_path.value(), 0, true);
|
| }
|
| }
|
| @@ -290,7 +289,7 @@ void ShillServiceClientStub::AddServiceWithIPConfig(
|
| const std::string& ipconfig_path,
|
| bool add_to_watch_list) {
|
| DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
|
| - AddService(service_path, add_to_watch_list);
|
| + AddManagerService(service_path, add_to_watch_list);
|
|
|
| base::DictionaryValue* properties =
|
| GetModifiableServiceProperties(service_path);
|
| @@ -314,7 +313,7 @@ void ShillServiceClientStub::AddServiceWithIPConfig(
|
|
|
| void ShillServiceClientStub::RemoveService(const std::string& service_path) {
|
| DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
|
| - RemoveService(service_path);
|
| + RemoveManagerService(service_path);
|
|
|
| stub_services_.RemoveWithoutPathExpansion(service_path, NULL);
|
| }
|
| @@ -336,7 +335,7 @@ const base::DictionaryValue* ShillServiceClientStub::GetServiceProperties(
|
|
|
| void ShillServiceClientStub::ClearServices() {
|
| DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
|
| - ClearServices();
|
| + ClearManagerServices();
|
|
|
| stub_services_.Clear();
|
| }
|
|
|