| Index: chromeos/network/geolocation_handler.cc
|
| diff --git a/chromeos/network/geolocation_handler.cc b/chromeos/network/geolocation_handler.cc
|
| index ed9aeb5a412a98236eb9805e1b2ccfa97a2edcdf..dfccd6d646128df15073d6f73ec278bb3a1a8033 100644
|
| --- a/chromeos/network/geolocation_handler.cc
|
| +++ b/chromeos/network/geolocation_handler.cc
|
| @@ -13,8 +13,6 @@
|
|
|
| namespace chromeos {
|
|
|
| -static GeolocationHandler* g_geolocation_handler = NULL;
|
| -
|
| GeolocationHandler::GeolocationHandler()
|
| : wifi_enabled_(false),
|
| weak_ptr_factory_(this) {
|
| @@ -36,27 +34,6 @@ void GeolocationHandler::Init() {
|
| 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_)
|
|
|