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 14 matching lines @@
   }
 
   bool operator()(const NetworkProfile& profile) {
     return profile.path == path_;
   }
 
  private:
   std::string path_;
 };
 
-class NetworkProfileHandlerImpl : public NetworkProfileHandler {
- public:
-  NetworkProfileHandlerImpl() {
-    DBusThreadManager::Get()->GetShillManagerClient()->
-        AddPropertyChangedObserver(this);
-
-    // Request the initial profile list.
-    DBusThreadManager::Get()->GetShillManagerClient()->GetProperties(
-        base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback,
-                   weak_ptr_factory_.GetWeakPtr()));
-  }
-
-  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 20 matching lines @@
 
   const base::ListValue* profiles_value = NULL;
   value.GetAsList(&profiles_value);
   DCHECK(profiles_value);
 
   std::vector<std::string> new_profile_paths;
   bool result = ConvertListValueToStringVector(*profiles_value,
                                                &new_profile_paths);
   DCHECK(result);
 
+  VLOG(2) << "Profiles: " << profiles_.size();
   // Search for removed profiles.
   std::vector<std::string> removed_profile_paths;
   for (ProfileList::const_iterator it = profiles_.begin();
        it != profiles_.end(); ++it) {
     if (std::find(new_profile_paths.begin(),
                   new_profile_paths.end(),
                   it->path) == new_profile_paths.end()) {
       removed_profile_paths.push_back(it->path);
     }
   }
@@ skipping 66 matching lines @@
            profiles_.begin();
        it != profiles_.end(); ++it) {
     if (it->userhash == userhash)
       return &*it;
   }
   return NULL;
 }
 
 NetworkProfileHandler::NetworkProfileHandler()
     : weak_ptr_factory_(this) {
+  DBusThreadManager::Get()->GetShillManagerClient()->
+      AddPropertyChangedObserver(this);
+
+  // Request the initial profile list.
+  DBusThreadManager::Get()->GetShillManagerClient()->GetProperties(
+      base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 NetworkProfileHandler::~NetworkProfileHandler() {
+  DBusThreadManager::Get()->GetShillManagerClient()->
+      RemovePropertyChangedObserver(this);
 }
 
 }  // namespace chromeos