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

chromeos/network/network_profile_handler.cc

 // 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.
 
 #include "chromeos/network/network_profile_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/network/network_profile_observer.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
-static NetworkProfileHandler* g_profile_handler_instance = NULL;
-
 namespace {
 
 bool ConvertListValueToStringVector(const base::ListValue& string_list,
                                     std::vector<std::string>* result) {
   for (size_t i = 0; i < string_list.GetSize(); ++i) {
     std::string str;
     if (!string_list.GetString(i, &str))
       return false;
     result->push_back(str);
   }
@@ skipping 34 matching lines @@
   }
 
   virtual ~NetworkProfileHandlerImpl() {
     DBusThreadManager::Get()->GetShillManagerClient()->
         RemovePropertyChangedObserver(this);
   }
 };
 
 }  // namespace
 
-// static
-NetworkProfileHandler* NetworkProfileHandler::Initialize() {
-  CHECK(!g_profile_handler_instance);
-  g_profile_handler_instance = new NetworkProfileHandlerImpl();
-  return g_profile_handler_instance;
-}
-
-// static
-bool NetworkProfileHandler::IsInitialized() {
-  return g_profile_handler_instance;
-}
-
-// static
-void NetworkProfileHandler::Shutdown() {
-  CHECK(g_profile_handler_instance);
-  delete g_profile_handler_instance;
-  g_profile_handler_instance = NULL;
-}
-
-// static
-NetworkProfileHandler* NetworkProfileHandler::Get() {
-  CHECK(g_profile_handler_instance);
-  return g_profile_handler_instance;
-}
-
 void NetworkProfileHandler::AddObserver(NetworkProfileObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void NetworkProfileHandler::RemoveObserver(NetworkProfileObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void NetworkProfileHandler::GetManagerPropertiesCallback(
     DBusMethodCallStatus call_status,
@@ skipping 63 matching lines @@
 void NetworkProfileHandler::GetProfilePropertiesCallback(
     const std::string& profile_path,
     const base::DictionaryValue& properties) {
   std::string userhash;
   properties.GetStringWithoutPathExpansion(shill::kUserHashProperty,
                                            &userhash);
 
   AddProfile(NetworkProfile(profile_path, userhash));
 }
 
+void NetworkProfileHandler::AddProfileForTest(const NetworkProfile& profile) {
+  AddProfile(profile);
+}
+
 void NetworkProfileHandler::AddProfile(const NetworkProfile& profile) {
   VLOG(2) << "Adding profile " << profile.ToDebugString() << ".";
   profiles_.push_back(profile);
   FOR_EACH_OBSERVER(NetworkProfileObserver, observers_,
                     OnProfileAdded(profiles_.back()));
 }
 
 void NetworkProfileHandler::RemoveProfile(const std::string& profile_path) {
   VLOG(2) << "Removing profile for path " << profile_path << ".";
   ProfileList::iterator found = std::find_if(profiles_.begin(), profiles_.end(),
@@ skipping 29 matching lines @@
 }
 
 NetworkProfileHandler::NetworkProfileHandler()
     : weak_ptr_factory_(this) {
 }
 
 NetworkProfileHandler::~NetworkProfileHandler() {
 }
 
 }  // namespace chromeos