Index: chromeos/dbus/fake_shill_service_client.cc |
diff --git a/chromeos/dbus/fake_shill_service_client.cc b/chromeos/dbus/fake_shill_service_client.cc |
index ef4ffe6e5d055036b3d89332433dba7d31019927..02a886e2eeea4505cef57b66ec8c58018c33f75f 100644 |
--- a/chromeos/dbus/fake_shill_service_client.cc |
+++ b/chromeos/dbus/fake_shill_service_client.cc |
@@ -309,12 +309,14 @@ void FakeShillServiceClient::AddService(const std::string& service_path, |
const std::string& state, |
bool add_to_visible_list, |
bool add_to_watch_list) { |
- AddServiceWithIPConfig(service_path, name, type, state, "", |
+ AddServiceWithIPConfig(service_path, "" /* guid */, name, |
+ type, state, "" /* ipconfig_path */, |
add_to_visible_list, add_to_watch_list); |
} |
void FakeShillServiceClient::AddServiceWithIPConfig( |
const std::string& service_path, |
+ const std::string& guid, |
const std::string& name, |
const std::string& type, |
const std::string& state, |
@@ -330,6 +332,11 @@ void FakeShillServiceClient::AddServiceWithIPConfig( |
base::DictionaryValue* properties = |
GetModifiableServiceProperties(service_path, true); |
connect_behavior_.erase(service_path); |
+ if (!guid.empty()) { |
pneubeck (no reviews)
2014/05/08 13:25:12
if the assumption is from now on that a service al
stevenjb
2014/05/08 22:32:26
The NetworkHandler layer enfoces that a service al
pneubeck (no reviews)
2014/05/12 13:37:07
oops. yes, you're right.
|
+ properties->SetWithoutPathExpansion( |
+ shill::kGuidProperty, |
+ base::Value::CreateStringValue(guid)); |
+ } |
shill_property_util::SetSSID(name, properties); |
properties->SetWithoutPathExpansion( |
shill::kNameProperty, |