NetworkChangeNotifierChromeos: Handle IPConfig property changes on the default network

chromeos/dbus/shill_service_client_stub.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/shill_service_client_stub.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 236 matching lines @@
   return this;
 }
 
 // ShillServiceClient::TestInterface overrides.
 
 void ShillServiceClientStub::AddService(const std::string& service_path,
                                         const std::string& name,
                                         const std::string& type,
                                         const std::string& state,
                                         bool add_to_watch_list) {
-  DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
-      AddService(service_path, add_to_watch_list);
+  AddServiceInternal(service_path, name, type, state, "", add_to_watch_list);
+}
 
-  base::DictionaryValue* properties =
-      GetModifiableServiceProperties(service_path);
-  properties->SetWithoutPathExpansion(
-      flimflam::kSSIDProperty,
-      base::Value::CreateStringValue(service_path));
-  properties->SetWithoutPathExpansion(
-      flimflam::kNameProperty,
-      base::Value::CreateStringValue(name));
-  properties->SetWithoutPathExpansion(
-      flimflam::kTypeProperty,
-      base::Value::CreateStringValue(type));
-  properties->SetWithoutPathExpansion(
-      flimflam::kStateProperty,
-      base::Value::CreateStringValue(state));
+void ShillServiceClientStub::AddServiceWithIPConfig(
+    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) {
+  AddServiceInternal(service_path, name, type, state, ipconfig_path,

[pneubeck (no reviews), 2013/03/28 10:37:54]

Why not adding the implementation here?

[gauravsh, 2013/03/28 18:48:54]

No particular reason. Done.

+                     add_to_watch_list);
 }
 
 void ShillServiceClientStub::RemoveService(const std::string& service_path) {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       RemoveService(service_path);
 
   stub_services_.RemoveWithoutPathExpansion(service_path, NULL);
 }
 
 void ShillServiceClientStub::SetServiceProperty(const std::string& service_path,
@@ skipping 11 matching lines @@
   return properties;
 }
 
 void ShillServiceClientStub::ClearServices() {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       ClearServices();
 
   stub_services_.Clear();
 }
 
+void ShillServiceClientStub::AddServiceInternal(
+    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);
+
+  base::DictionaryValue* properties =
+      GetModifiableServiceProperties(service_path);
+  properties->SetWithoutPathExpansion(
+      flimflam::kSSIDProperty,
+      base::Value::CreateStringValue(service_path));
+  properties->SetWithoutPathExpansion(
+      flimflam::kNameProperty,
+      base::Value::CreateStringValue(name));
+  properties->SetWithoutPathExpansion(
+      flimflam::kTypeProperty,
+      base::Value::CreateStringValue(type));
+  properties->SetWithoutPathExpansion(
+      flimflam::kStateProperty,
+      base::Value::CreateStringValue(state));
+  if (!ipconfig_path.empty())
+    properties->SetWithoutPathExpansion(
+        shill::kIPConfigProperty,
+        base::Value::CreateStringValue(ipconfig_path));
+}
+
 void ShillServiceClientStub::SetDefaultProperties() {
   const bool add_to_watchlist = true;
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableStubEthernet)) {
     AddService("stub_ethernet", "eth0",
                flimflam::kTypeEthernet,
                flimflam::kStateOnline,
                add_to_watchlist);
   }
@@ skipping 93 matching lines @@
   std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
       observer_list_.find(device_path);
   if (iter != observer_list_.end())
     return *(iter->second);
   PropertyObserverList* observer_list = new PropertyObserverList();
   observer_list_[device_path] = observer_list;
   return *observer_list;
 }
 
 }  // namespace chromeos