Deprecate ShillNetworkClient and add GeolocationHandler

chrome/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 "chrome/browser/geolocation/wifi_data_provider_chromeos.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
@@ skipping 58 matching lines @@
     : network_library_(lib) {
   DCHECK(network_library_ != NULL);
 }
 
 NetworkLibraryWlanApi::~NetworkLibraryWlanApi() {
 }
 
 bool NetworkLibraryWlanApi::GetAccessPointData(
     WifiData::AccessPointDataSet* result) {
   WifiAccessPointVector access_points;
-  if (!network_library_->GetWifiAccessPoints(&access_points))
-    return false;
-  for (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->name);
-    result->insert(ap_data);
-  }
-  return !result->empty() || network_library_->wifi_enabled();
+  // TODO(stevenjb): Re-implement this with chromeos::GeolocationHandler. The
+  // previous code has been broken since switching to Shill. crbug.com/167987
+  return false;
 }
 
 }  // namespace
 }  // namespace chromeos
 
 WifiDataProviderChromeOs::WifiDataProviderChromeOs() : started_(false) {
 }
 
 WifiDataProviderChromeOs::~WifiDataProviderChromeOs() {
 }
@@ skipping 137 matching lines @@
   DCHECK(CalledOnClientThread());
   DCHECK(!started_);
   started_ = true;
   // Perform first scan ASAP regardless of the polling policy. If this scan
   // fails we'll retry at a rate in line with the polling policy.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WifiDataProviderChromeOs::DoStartTaskOnUIThread, this));
 }