Add NetworkHandler to own network handlers in src/chromeos/network

chromeos/network/managed_network_configuration_handler.h

-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+ // 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.
 
 #ifndef CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_
 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_handler_callbacks.h"
 #include "chromeos/network/network_profile_observer.h"
 #include "chromeos/network/onc/onc_constants.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace chromeos {
 
+class NetworkConfigurationHandler;
 class NetworkProfileHandler;
+class NetworkStateHandler;
 class NetworkUIData;
 
 // The ManagedNetworkConfigurationHandler class is used to create and configure
 // networks in ChromeOS using ONC and takes care of network policies.
 //
 // Its interface exposes only ONC and should decouple users from Shill.
 // Internally it translates ONC to Shill dictionaries and calls through to the
 // NetworkConfigurationHandler.
 //
 // For accessing lists of visible networks, and other state information, see the
@@ skipping 13 matching lines @@
 // 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.
 
 class CHROMEOS_EXPORT ManagedNetworkConfigurationHandler
     : public NetworkProfileObserver {
  public:
   typedef std::map<std::string, const base::DictionaryValue*> GuidToPolicyMap;
   typedef std::map<std::string, GuidToPolicyMap> UserToPoliciesMap;
 
-  // Initializes the singleton.
-  static void Initialize(NetworkProfileHandler* profile_handler);
-
-  // Returns if the singleton is initialized.
-  static bool IsInitialized();
-
-  // Destroys the singleton.
-  static void Shutdown();
-
-  // Initialize() must be called before this.
-  static ManagedNetworkConfigurationHandler* Get();
+  virtual ~ManagedNetworkConfigurationHandler();
 
   // Returns the NetworkUIData parsed from the UIData property of
   // |shill_dictionary|. If parsing fails or the field doesn't exist, returns
   // NULL.
   static scoped_ptr<NetworkUIData> GetUIData(
       const base::DictionaryValue& shill_dictionary);
 
   // Provides the properties of the network with |service_path| to |callback|.
   void GetProperties(
       const std::string& service_path,
@@ skipping 46 matching lines @@
   // associated with |onc_source| is changed again with this function. For
   // device policies, |userhash| must be empty.
   void SetPolicy(onc::ONCSource onc_source,
                  const std::string& userhash,
                  const base::ListValue& network_configs_onc);
 
   // NetworkProfileObserver overrides
   virtual void OnProfileAdded(const NetworkProfile& profile) OVERRIDE;
   virtual void OnProfileRemoved(const NetworkProfile& profile) OVERRIDE;
 
+  NetworkConfigurationHandler* network_configuration_handler() {
+    return network_configuration_handler_;
+  }
+
  private:
+  friend class NetworkHandler;
+  friend class ManagedNetworkConfigurationHandlerTest;
   class PolicyApplicator;
 
-  explicit ManagedNetworkConfigurationHandler(
-      NetworkProfileHandler* profile_handler);
-  virtual ~ManagedNetworkConfigurationHandler();
+  ManagedNetworkConfigurationHandler();
+
+  void Init(NetworkStateHandler* network_state_handler,
+            NetworkProfileHandler* network_profile_handler,
+            NetworkConfigurationHandler* network_configuration_handler);
+
 
   void GetManagedPropertiesCallback(
       const network_handler::DictionaryResultCallback& callback,
       const network_handler::ErrorCallback& error_callback,
       const std::string& service_path,
       const base::DictionaryValue& shill_properties);
 
   const GuidToPolicyMap* GetPoliciesForUser(const std::string& userhash) const;
   const GuidToPolicyMap* GetPoliciesForProfile(
       const NetworkProfile& profile) const;
 
   // The DictionaryValues of the nested maps are owned by this class and are
   // explicitly deleted where necessary. If present, the empty string maps to
   // the device policy.
   UserToPoliciesMap policies_by_user_;
 
-  // A local reference to the policy handler singleton.
-  NetworkProfileHandler* profile_handler_;
+  // Local references to the associated handler instances.
+  NetworkStateHandler* network_state_handler_;
+  NetworkProfileHandler* network_profile_handler_;
+  NetworkConfigurationHandler* network_configuration_handler_;
 
   // For Shill client callbacks
   base::WeakPtrFactory<ManagedNetworkConfigurationHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_H_