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

chromeos/network/geolocation_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/geolocation_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
-static GeolocationHandler* g_geolocation_handler = NULL;
-
 GeolocationHandler::GeolocationHandler()
     : wifi_enabled_(false),
       weak_ptr_factory_(this) {
 }
 
 GeolocationHandler::~GeolocationHandler() {
   ShillManagerClient* manager_client =
       DBusThreadManager::Get()->GetShillManagerClient();
   if (manager_client)
     manager_client->RemovePropertyChangedObserver(this);
 }
 
 void GeolocationHandler::Init() {
   ShillManagerClient* manager_client =
       DBusThreadManager::Get()->GetShillManagerClient();
   manager_client->GetProperties(
       base::Bind(&GeolocationHandler::ManagerPropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()));
   manager_client->AddPropertyChangedObserver(this);
 }
 
-// static
-void GeolocationHandler::Initialize() {
-  CHECK(!g_geolocation_handler);
-  g_geolocation_handler = new GeolocationHandler();
-  g_geolocation_handler->Init();
-}
-
-// static
-void GeolocationHandler::Shutdown() {
-  CHECK(g_geolocation_handler);
-  delete g_geolocation_handler;
-  g_geolocation_handler = NULL;
-}
-
-// static
-GeolocationHandler* GeolocationHandler::Get() {
-  CHECK(g_geolocation_handler)
-      << "GeolocationHandler::Get() called before Initialize()";
-  return g_geolocation_handler;
-}
-
 bool GeolocationHandler::GetWifiAccessPoints(
     WifiAccessPointVector* access_points, int64* age_ms) {
   if (!wifi_enabled_)
     return false;
   // Always request updated access points.
   RequestWifiAccessPoints();
   // If no data has been received, return false.
   if (geolocation_received_time_.is_null())
     return false;
   if (access_points)
@@ skipping 95 matching lines @@
       std::string channel_str;
       if (entry->GetString(shill::kGeoChannelProperty, &channel_str))
         base::StringToInt(channel_str, &wap.channel);
       wifi_access_points_.push_back(wap);
     }
   }
   geolocation_received_time_ = base::Time::Now();
 }
 
 }  // namespace chromeos