Remove RadioData from geolocation

content/browser/geolocation/network_location_provider.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
 #define CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
 #pragma once
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/threading/thread.h"
 #include "content/browser/geolocation/device_data_provider.h"
 #include "content/browser/geolocation/location_provider.h"
 #include "content/browser/geolocation/network_location_request.h"
 #include "content/common/content_export.h"
 #include "content/public/common/geoposition.h"
 
 namespace content {
 class AccessTokenStore;
 }
 
 class NetworkLocationProvider
     : public LocationProviderBase,
-      public RadioDataProvider::ListenerInterface,
       public WifiDataProvider::ListenerInterface,
       public NetworkLocationRequest::ListenerInterface {
  public:
   // Cache of recently resolved locations. Public for tests.
   class CONTENT_EXPORT PositionCache {
    public:
     // The maximum size of the cache of positions for previously requested
     // device data.
     static const size_t kMaximumSize;
 
@@ skipping 43 matching lines @@
  private:
   // Satisfies a position request from cache or network.
   void RequestPosition();
 
   // Internal helper used by DeviceDataUpdateAvailable
   void OnDeviceDataUpdated();
 
   bool IsStarted() const;
 
   // DeviceDataProvider::ListenerInterface implementation.
-  virtual void DeviceDataUpdateAvailable(RadioDataProvider* provider) OVERRIDE;
   virtual void DeviceDataUpdateAvailable(WifiDataProvider* provider) OVERRIDE;
 
   // NetworkLocationRequest::ListenerInterface implementation.
   virtual void LocationResponseAvailable(const content::Geoposition& position,
                                          bool server_error,
                                          const string16& access_token,
-                                         const RadioData& radio_data,
                                          const WifiData& wifi_data) OVERRIDE;
 
   scoped_refptr<content::AccessTokenStore> access_token_store_;
 
-  // The device data providers, acquired via global factories.
-  RadioDataProvider* radio_data_provider_;
+  // The wifi data provider, acquired via global factories.
   WifiDataProvider* wifi_data_provider_;
 
-  // The radio and wifi data, flags to indicate if each data set is complete.
-  RadioData radio_data_;
+  // The  wifi data, flags to indicate if the data set is complete.
   WifiData wifi_data_;
-  bool is_radio_data_complete_;
   bool is_wifi_data_complete_;
 
   // The timestamp for the latest device data update.
   base::Time device_data_updated_timestamp_;
 
   // Cached value loaded from the token store or set by a previous server
   // response, and sent in each subsequent network request.
   string16 access_token_;
 
   // The current best position estimate.
   content::Geoposition position_;
 
   // Whether permission has been granted for the provider to operate.
   bool is_permission_granted_;
 
   bool is_new_data_available_;
 
   // The network location request object, and the url it uses.
   scoped_ptr<NetworkLocationRequest> request_;
 
   base::WeakPtrFactory<NetworkLocationProvider> weak_factory_;
   // The cache of positions.
   scoped_ptr<PositionCache> position_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLocationProvider);
 };
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_