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

chromeos/network/network_configuration_handler.cc

 // 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.
 
 #include "chromeos/network/network_configuration_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_state_handler.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
-NetworkConfigurationHandler* g_configuration_handler_instance = NULL;
-
 // None of these error messages are user-facing: they should only appear in
 // logs.
 const char kErrorsListTag[] = "errors";
 const char kClearPropertiesFailedError[] = "Error.ClearPropertiesFailed";
 const char kClearPropertiesFailedErrorMessage[] = "Clear properties failed";
 const char kDBusFailedError[] = "Error.DBusFailed";
 const char kDBusFailedErrorMessage[] = "DBus call failed.";
 
 void ClearPropertiesCallback(
     const std::vector<std::string>& names,
@@ skipping 47 matching lines @@
                                          kDBusFailedError,
                                          kDBusFailedErrorMessage));
     LOG(ERROR) << "CallbackWithDictionaryValue failed for service path: "
                << service_path;
     error_callback.Run(kDBusFailedError, error_data.Pass());
   } else {
     callback.Run(service_path, value);
   }
 }
 
-void RunCreateNetworkCallback(
-    const network_handler::StringResultCallback& callback,
-    const dbus::ObjectPath& service_path) {
-  callback.Run(service_path.value());
-  // This may also get called when CreateConfiguration is used to update an
-  // existing configuration, so request a service update just in case.
-  // TODO(pneubeck): Separate 'Create' and 'Update' calls and only trigger
-  // this on an update.
-  NetworkStateHandler::Get()->RequestUpdateForNetwork(service_path.value());
-}
-
 void IgnoreObjectPathCallback(const base::Closure& callback,
                               const dbus::ObjectPath& object_path) {
   callback.Run();
 }
 
 }  // namespace
 
-// static
-void NetworkConfigurationHandler::Initialize() {
-  CHECK(!g_configuration_handler_instance);
-  g_configuration_handler_instance = new NetworkConfigurationHandler;
-}
-
-// static
-void NetworkConfigurationHandler::Shutdown() {
-  CHECK(g_configuration_handler_instance);
-  delete g_configuration_handler_instance;
-  g_configuration_handler_instance = NULL;
-}
-
-// static
-NetworkConfigurationHandler* NetworkConfigurationHandler::Get() {
-  CHECK(g_configuration_handler_instance)
-      << "NetworkConfigurationHandler::Get() called before Initialize()";
-  return g_configuration_handler_instance;
-}
-
 void NetworkConfigurationHandler::GetProperties(
     const std::string& service_path,
     const network_handler::DictionaryResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillServiceClient()->GetProperties(
       dbus::ObjectPath(service_path),
       base::Bind(&RunCallbackWithDictionaryValue,
                  callback,
                  error_callback,
                  service_path));
 }
 
 void NetworkConfigurationHandler::SetProperties(
     const std::string& service_path,
     const base::DictionaryValue& properties,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillManagerClient()->ConfigureService(
       properties,
       base::Bind(&IgnoreObjectPathCallback, callback),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  service_path, error_callback));
-  NetworkStateHandler::Get()->RequestUpdateForNetwork(service_path);
+  network_state_handler_->RequestUpdateForNetwork(service_path);
 }
 
 void NetworkConfigurationHandler::ClearProperties(
     const std::string& service_path,
     const std::vector<std::string>& names,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   DBusThreadManager::Get()->GetShillServiceClient()->ClearProperties(
       dbus::ObjectPath(service_path),
       names,
       base::Bind(&ClearPropertiesCallback,
                  names,
                  service_path,
                  callback,
                  error_callback),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::CreateConfiguration(
     const base::DictionaryValue& properties,
     const network_handler::StringResultCallback& callback,
-    const network_handler::ErrorCallback& error_callback) const {
+    const network_handler::ErrorCallback& error_callback) {
   ShillManagerClient* manager =
       DBusThreadManager::Get()->GetShillManagerClient();
 
   std::string type;
   properties.GetStringWithoutPathExpansion(flimflam::kTypeProperty, &type);
   // Shill supports ConfigureServiceForProfile only for network type WiFi. In
   // all other cases, we have to rely on GetService for now. This is
   // unproblematic for VPN (user profile only), but will lead to inconsistencies
   // with WiMax, for example.
   if (type == flimflam::kTypeWifi) {
     std::string profile;
     properties.GetStringWithoutPathExpansion(flimflam::kProfileProperty,
                                              &profile);
     manager->ConfigureServiceForProfile(
         dbus::ObjectPath(profile),
         properties,
-        base::Bind(&RunCreateNetworkCallback, callback),
+        base::Bind(&NetworkConfigurationHandler::RunCreateNetworkCallback,
+                   AsWeakPtr(), callback),
         base::Bind(&network_handler::ShillErrorCallbackFunction,
                    "", error_callback));
   } else {
     manager->GetService(
         properties,
-        base::Bind(&RunCreateNetworkCallback, callback),
+        base::Bind(&NetworkConfigurationHandler::RunCreateNetworkCallback,
+                   AsWeakPtr(), callback),
         base::Bind(&network_handler::ShillErrorCallbackFunction,
                    "", error_callback));
   }
 }
 
 void NetworkConfigurationHandler::RemoveConfiguration(
     const std::string& service_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) const {
   DBusThreadManager::Get()->GetShillServiceClient()->Remove(
       dbus::ObjectPath(service_path),
       callback,
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  service_path, error_callback));
 }
 
-NetworkConfigurationHandler::NetworkConfigurationHandler() {
+NetworkConfigurationHandler::NetworkConfigurationHandler()
+    : network_state_handler_(NULL) {
 }
 
 NetworkConfigurationHandler::~NetworkConfigurationHandler() {
 }
 
+void NetworkConfigurationHandler::Init(
+    NetworkStateHandler* network_state_handler) {
+  network_state_handler_ = network_state_handler;
+}
+
+void NetworkConfigurationHandler::RunCreateNetworkCallback(
+    const network_handler::StringResultCallback& callback,
+    const dbus::ObjectPath& service_path) {
+  callback.Run(service_path.value());
+  // This may also get called when CreateConfiguration is used to update an
+  // existing configuration, so request a service update just in case.
+  // TODO(pneubeck): Separate 'Create' and 'Update' calls and only trigger
+  // this on an update.
+  network_state_handler_->RequestUpdateForNetwork(service_path.value());
+}
+
+// static
+NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
+    NetworkStateHandler* network_state_handler) {
+  NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
+  handler->Init(network_state_handler);
+  return handler;
+}
+
 }  // namespace chromeos