Use setProperties for IP Config.

chromeos/network/network_configuration_handler.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 103 matching lines @@
   // Changes the profile for the network |service_path| to |profile_path|.
   // See notes on |source| and callbacks in class description above.
   void SetNetworkProfile(const std::string& service_path,
                          const std::string& profile_path,
                          NetworkConfigurationObserver::Source source,
                          const base::Closure& callback,
                          const network_handler::ErrorCallback& error_callback);
 
   // Construct and initialize an instance for testing.
   static NetworkConfigurationHandler* InitializeForTest(
-      NetworkStateHandler* network_state_handler);
+      NetworkStateHandler* network_state_handler,
+      NetworkDeviceHandler* network_device_handler);
 
  protected:
   friend class ClientCertResolverTest;
   friend class NetworkHandler;
   friend class NetworkConfigurationHandlerTest;
   friend class NetworkConfigurationHandlerStubTest;
   class ProfileEntryDeleter;
 
   NetworkConfigurationHandler();
-  void Init(NetworkStateHandler* network_state_handler);
+  void Init(NetworkStateHandler* network_state_handler,
+            NetworkDeviceHandler* network_device_handler);
 
   void RunCreateNetworkCallback(
       const std::string& profile_path,
       NetworkConfigurationObserver::Source source,
       scoped_ptr<base::DictionaryValue> configure_properties,
       const network_handler::StringResultCallback& callback,
       const dbus::ObjectPath& service_path);
 
   // Called from ProfileEntryDeleter instances when they complete causing
   // this class to delete the instance.
   void ProfileEntryDeleterCompleted(const std::string& service_path,
                                     const std::string& guid,
                                     NetworkConfigurationObserver::Source source,
                                     bool success);
   bool PendingProfileEntryDeleterForTest(const std::string& service_path) {
     return profile_entry_deleters_.count(service_path);
   }
 
   // Callback after moving a network configuration.
   void SetNetworkProfileCompleted(const std::string& service_path,
                                   const std::string& profile_path,
                                   NetworkConfigurationObserver::Source source,
                                   const base::Closure& callback);
 
+  // Helper method to send the SetProperties request to Shill. Called either
+  // directly from SetProperties, or after ClearProperties completes.
+  void SendSetPropertiesToShill(
+      const std::string& service_path,
+      scoped_ptr<base::DictionaryValue> changed_properties,
+      scoped_ptr<base::DictionaryValue> properties_to_set,
+      NetworkConfigurationObserver::Source source,
+      const base::Closure& callback,
+      const network_handler::ErrorCallback& error_callback);
+
   // Invoke the callback and inform NetworkStateHandler to request an update
   // for the service after setting properties.
   void SetPropertiesSuccessCallback(
       const std::string& service_path,
-      scoped_ptr<base::DictionaryValue> set_properties,
+      scoped_ptr<base::DictionaryValue> changed_properties,
       NetworkConfigurationObserver::Source source,
       const base::Closure& callback);
   void SetPropertiesErrorCallback(
       const std::string& service_path,
       const network_handler::ErrorCallback& error_callback,
       const std::string& dbus_error_name,
       const std::string& dbus_error_message);
 
-  // Invoke the callback and inform NetworkStateHandler to request an update
-  // for the service after clearing properties.
+  // Callbacks supporting ClearProperties. First the current properties are
+  // requested so that only set properties are cleared. On success this informs
+  // NetworkStateHandler to request an update for the service.
+  void ClearPropertiesGetCallback(
+      const std::string& service_path,
+      const std::vector<std::string>& names,
+      const base::Closure& callback,
+      const network_handler::ErrorCallback& error_callback,
+      DBusMethodCallStatus call_status,
+      const base::DictionaryValue& properties);
   void ClearPropertiesSuccessCallback(
       const std::string& service_path,
       const std::vector<std::string>& names,
       const base::Closure& callback,
       const base::ListValue& result);
   void ClearPropertiesErrorCallback(
       const std::string& service_path,
       const network_handler::ErrorCallback& error_callback,
       const std::string& dbus_error_name,
       const std::string& dbus_error_message);
 
-  // Unowned associated NetworkStateHandler* (global or test instance).
+  // Signals the device handler to request an IP config refresh.
+  void RequestRefreshIPConfigs(const std::string& service_path);
+
+  // Unowned associated Network*Handlers (global or test instance).
   NetworkStateHandler* network_state_handler_;
+  NetworkDeviceHandler* network_device_handler_;
 
   // Map of in-progress deleter instances. Owned by this class.
   std::map<std::string, ProfileEntryDeleter*> profile_entry_deleters_;
 
   ObserverList<NetworkConfigurationObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_