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

content/browser/geolocation/wifi_data_provider_chromeos.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.
 
 // Provides wifi scan API binding for chromeos, using proprietary APIs.
 
 #include "content/browser/geolocation/wifi_data_provider_chromeos.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
@@ skipping 124 matching lines @@
   // fails we'll retry at a rate in line with the polling policy.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WifiDataProviderChromeOs::DoStartTaskOnUIThread, this));
 }
 
 bool WifiDataProviderChromeOs::GetAccessPointData(
     WifiData::AccessPointDataSet* result) {
   chromeos::WifiAccessPointVector access_points;
-  if (!chromeos::GeolocationHandler::Get()->wifi_enabled())
+  if (!chromeos::NetworkHandler::Get()->geolocation_handler()->wifi_enabled())
     return false;
   int64 age_ms = 0;
-  if (!chromeos::GeolocationHandler::Get()->GetWifiAccessPoints(
-          &access_points, &age_ms)) {
+  if (!chromeos::NetworkHandler::Get()->geolocation_handler()->
+      GetWifiAccessPoints(&access_points, &age_ms)) {
     return false;
   }
   for (chromeos::WifiAccessPointVector::const_iterator i
            = access_points.begin();
        i != access_points.end(); ++i) {
     AccessPointData ap_data;
     ap_data.mac_address = ASCIIToUTF16(i->mac_address);
     ap_data.radio_signal_strength = i->signal_strength;
     ap_data.channel = i->channel;
     ap_data.signal_to_noise = i->signal_to_noise;
     ap_data.ssid = UTF8ToUTF16(i->ssid);
     result->insert(ap_data);
   }
   // If the age is significantly longer than our long polling time, assume the
   // data is stale and return false which will trigger a faster update.
   if (age_ms > kTwoNoChangePollingIntervalMilliseconds * 2)
     return false;
   return true;
 }
 
 // static
 template<>
 WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
   return new WifiDataProviderChromeOs();
 }
 
 }  // namespace content