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

chromeos/network/network_connection_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_CONNECTION_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
+#include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_handler_callbacks.h"
 
 namespace chromeos {
 
 class NetworkState;
 
 // The NetworkConnectionHandler class is used to manage network connection
 // requests. This is the only class that should make Shill Connect calls.
 // It handles the following steps:
 // 1. Determine whether or not sufficient information (e.g. passphrase) is
@@ skipping 15 matching lines @@
   static const char kErrorConnected[];
   static const char kErrorConnecting[];
   static const char kErrorNotConnected[];
   static const char kErrorPassphraseRequired[];
   static const char kErrorActivationRequired[];
   static const char kErrorCertificateRequired[];
   static const char kErrorConfigurationRequired[];
   static const char kErrorShillError[];
   static const char kErrorPreviousConnectFailed[];
 
-  // Sets the global instance. Must be called before any calls to Get().
-  static void Initialize();
-
-  // Destroys the global instance.
-  static void Shutdown();
-
-  // Gets the global instance. Initialize() must be called first.
-  static NetworkConnectionHandler* Get();
+  ~NetworkConnectionHandler();
 
   // ConnectToNetwork() will start an asynchronous connection attempt.
   // On success, |success_callback| will be called.
   // On failure, |error_callback| will be called with |error_name| one of:
   //  kErrorNotFound if no network matching |service_path| is found
   //    (hidden networks must be configured before connecting).
   //  kErrorConnected if already connected to the network.
   //  kErrorConnecting if already connecting to the network.
   //  kErrorCertificateRequired if the network requires a cert and none exists.
   //  kErrorPassphraseRequired if passphrase only is required.
@@ skipping 12 matching lines @@
   // On failure, |error_callback| will be called with |error_name| one of:
   //  kErrorNotFound if no network matching |service_path| is found.
   //  kErrorNotConnected if not connected to the network.
   //  kErrorShillError if a DBus or Shill error occurred.
   // |error_message| will contain and additional error string for debugging.
   void DisconnectNetwork(const std::string& service_path,
                          const base::Closure& success_callback,
                          const network_handler::ErrorCallback& error_callback);
 
  private:
+  friend class NetworkHandler;
+  friend class NetworkConnectionHandlerTest;
   NetworkConnectionHandler();
-  ~NetworkConnectionHandler();
+
+  void Init(NetworkStateHandler* network_state_handler,
+            NetworkConfigurationHandler* network_configuration_handler);
 
   // Calls Shill.Manager.Connect asynchronously.
   void CallShillConnect(
       const std::string& service_path,
       const base::Closure& success_callback,
       const network_handler::ErrorCallback& error_callback);
 
   // Calls Shill.Manager.Disconnect asynchronously.
   void CallShillDisconnect(
       const std::string& service_path,
@@ skipping 22 matching lines @@
       scoped_ptr<base::DictionaryValue> error_data);
 
   // Handle success or failure from Shill.Service.Connect.
   void HandleShillSuccess(const std::string& service_path,
                           const base::Closure& success_callback);
   void HandleShillFailure(const std::string& service_path,
                           const network_handler::ErrorCallback& error_callback,
                           const std::string& error_name,
                           const std::string& error_message);
 
+  // Local references to the associated handler instances.
+  NetworkStateHandler* network_state_handler_;
+  NetworkProfileHandler* network_profile_handler_;
+  NetworkConfigurationHandler* network_configuration_handler_;
+
   // Set of pending connect requests, used to prevent repeat attempts while
   // waiting for Shill.
   std::set<std::string> pending_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_