NetworkChangeNotifierChromeos: Handle IPConfig property changes on the default network

chromeos/dbus/shill_service_client_stub.cc

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 0a380bc2600a09e91f52fd15c452317d7ef4f718..58398fe5ac25af4557c757687ae4a005409d90cf 100644
--- a/chromeos/dbus/shill_service_client_stub.cc
+++ b/chromeos/dbus/shill_service_client_stub.cc
@@ -253,6 +253,7 @@ void ShillServiceClientStub::AddService(const std::string& service_path,
                                         const std::string& name,
                                         const std::string& type,
                                         const std::string& state,
+                                        const std::string& ipconfig_path,
                                         bool add_to_watch_list) {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       AddService(service_path, add_to_watch_list);
@@ -271,6 +272,10 @@ void ShillServiceClientStub::AddService(const std::string& service_path,
   properties->SetWithoutPathExpansion(
       flimflam::kStateProperty,
       base::Value::CreateStringValue(state));
+  if (!ipconfig_path.empty())
+    properties->SetWithoutPathExpansion(
+        flimflam::kStateProperty,
+        base::Value::CreateStringValue(state));
 }
 
 void ShillServiceClientStub::RemoveService(const std::string& service_path) {
@@ -310,12 +315,14 @@ void ShillServiceClientStub::SetDefaultProperties() {
     AddService("stub_ethernet", "eth0",
                flimflam::kTypeEthernet,
                flimflam::kStateOnline,
+               "",
                add_to_watchlist);
   }
 
   AddService("stub_wifi1", "wifi1",
              flimflam::kTypeWifi,
              flimflam::kStateOnline,
+             "",
              add_to_watchlist);
   SetServiceProperty("stub_wifi1",
                      flimflam::kSecurityProperty,
@@ -324,6 +331,7 @@ void ShillServiceClientStub::SetDefaultProperties() {
   AddService("stub_wifi2", "wifi2_PSK",
              flimflam::kTypeWifi,
              flimflam::kStateIdle,
+             "",
              add_to_watchlist);
   SetServiceProperty("stub_wifi2",
                      flimflam::kSecurityProperty,
@@ -336,6 +344,7 @@ void ShillServiceClientStub::SetDefaultProperties() {
   AddService("stub_cellular1", "cellular1",
              flimflam::kTypeCellular,
              flimflam::kStateIdle,
+             "",
              add_to_watchlist);
   base::StringValue technology_value(flimflam::kNetworkTechnologyGsm);
   SetServiceProperty("stub_cellular1",
@@ -351,11 +360,13 @@ void ShillServiceClientStub::SetDefaultProperties() {
   AddService("stub_vpn1", "vpn1",
              flimflam::kTypeVPN,
              flimflam::kStateOnline,
+             "",
              add_to_watchlist);
 
   AddService("stub_vpn2", "vpn2",
              flimflam::kTypeVPN,
              flimflam::kStateOffline,
+             "",
              add_to_watchlist);
 }