Defer NetworkConfigurationHandler::CreateShillConfiguration callback

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 <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/network/network_configuration_observer.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_handler_callbacks.h"
+#include "chromeos/network/network_state_handler_observer.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace dbus {
 class ObjectPath;
 }
 
@@ skipping 15 matching lines @@
 //
 // Note on callbacks: Because all the functions here are meant to be
 // asynchronous, they all take a |callback| of some type, and an
 // |error_callback|. When the operation succeeds, |callback| will be called, and
 // when it doesn't, |error_callback| will be called with information about the
 // error, including a symbolic name for the error and often some error message
 // that is suitable for logging. None of the error message text is meant for
 // user consumption.  Both |callback| and |error_callback| are permitted to be
 // null callbacks.
 class CHROMEOS_EXPORT NetworkConfigurationHandler
-    : public base::SupportsWeakPtr<NetworkConfigurationHandler> {
+    : public NetworkStateHandlerObserver {
  public:
-  ~NetworkConfigurationHandler();
+  ~NetworkConfigurationHandler() override;
 
   // Manages the observer list.
   void AddObserver(NetworkConfigurationObserver* observer);
   void RemoveObserver(NetworkConfigurationObserver* observer);
 
   // Gets the properties of the network with id |service_path|. See note on
   // |callback| and |error_callback|, in class description above.
   void GetShillProperties(
       const std::string& service_path,
       const network_handler::DictionaryResultCallback& callback,
@@ skipping 44 matching lines @@
       const network_handler::ErrorCallback& error_callback);
 
   // 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);
 
+  // NetworkStateHandlerObserver
+  void NetworkListChanged() override;
+  void OnShuttingDown() override;
+
   // Construct and initialize an instance for testing.
   static NetworkConfigurationHandler* InitializeForTest(
       NetworkStateHandler* network_state_handler,
       NetworkDeviceHandler* network_device_handler);
 
  private:
   friend class ClientCertResolverTest;
   friend class NetworkHandler;
   friend class NetworkConfigurationHandlerTest;
   friend class NetworkConfigurationHandlerStubTest;
   class ProfileEntryDeleter;
 
   NetworkConfigurationHandler();
   void Init(NetworkStateHandler* network_state_handler,
             NetworkDeviceHandler* network_device_handler);
 
-  void RunCreateNetworkCallback(
+  // Called when a configuration completes. This will wait for the cached
+  // state (NetworkStateHandler) to update before triggering the callback.
+  void ConfigurationCompleted(
       const std::string& profile_path,
       NetworkConfigurationObserver::Source source,
       std::unique_ptr<base::DictionaryValue> configure_properties,
       const network_handler::ServiceResultCallback& 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,
@@ skipping 47 matching lines @@
   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.
   std::map<std::string, std::unique_ptr<ProfileEntryDeleter>>
       profile_entry_deleters_;
 
+  // Map of configuration callbacks to run once the service becomes available
+  // in the NetworkStateHandler cache.
+  std::map<std::string, network_handler::ServiceResultCallback>
+      configure_callbacks_;
+
   base::ObserverList<NetworkConfigurationObserver, true> observers_;
 
+  base::WeakPtrFactory<NetworkConfigurationHandler> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigurationHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_CONFIGURATION_HANDLER_H_