Move geolocation code to content namespace.

TBR=scottmg
Review URL: https://codereview.chromium.org/11276058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164586 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 11 deletions

diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
index a415c66..265ddc1 100644
--- a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
@@ -12,7 +12,14 @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "content/public/browser/browser_thread.h"
 
+using content::AccessPointData;
 using content::BrowserThread;
+using content::GenericPollingPolicy;
+using content::PollingPolicyInterface;
+using content::WifiData;
+using content::WifiDataProvider;
+using content::WifiDataProviderCommon;
+using content::WifiDataProviderImplBase;
 
 namespace {
 // The time periods between successive polls of the wifi data.
diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.h b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
index 2d9fa7d..5d6ecae 100644
--- a/chrome/browser/geolocation/wifi_data_provider_chromeos.h
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
@@ -12,17 +12,17 @@ namespace chromeos {
 class NetworkLibrary;
 }
 
-class WifiDataProviderChromeOs : public WifiDataProviderImplBase {
+class WifiDataProviderChromeOs : public content::WifiDataProviderImplBase {
  public:
   WifiDataProviderChromeOs();
 
   // WifiDataProviderImplBase
   virtual bool StartDataProvider() OVERRIDE;
   virtual void StopDataProvider() OVERRIDE;
-  virtual bool GetData(WifiData* data) OVERRIDE;
+  virtual bool GetData(content::WifiData* data) OVERRIDE;
 
   // Allows injection of |lib| for testing.
-  static WifiDataProviderCommon::WlanApiInterface* NewWlanApi(
+  static content::WifiDataProviderCommon::WlanApiInterface* NewWlanApi(
       chromeos::NetworkLibrary* lib);
 
  private:
@@ -35,13 +35,13 @@ class WifiDataProviderChromeOs : public WifiDataProviderImplBase {
 
   // Client thread
   void DidWifiScanTaskNoResults();
-  void DidWifiScanTask(const WifiData& new_data);
+  void DidWifiScanTask(const content::WifiData& new_data);
   void MaybeNotifyListeners(bool update_available);
   void DidStartFailed();
 
   // WifiDataProviderCommon
-  virtual WifiDataProviderCommon::WlanApiInterface* NewWlanApi();
-  virtual PollingPolicyInterface* NewPollingPolicy();
+  virtual content::WifiDataProviderCommon::WlanApiInterface* NewWlanApi();
+  virtual content::PollingPolicyInterface* NewPollingPolicy();
 
   // Will schedule a scan; i.e. enqueue DoWifiScanTask deferred task.
   void ScheduleNextScan(int interval);
@@ -53,13 +53,13 @@ class WifiDataProviderChromeOs : public WifiDataProviderImplBase {
   void ScheduleStop();
 
   // Underlying OS wifi API. (UI thread)
-  scoped_ptr<WifiDataProviderCommon::WlanApiInterface> wlan_api_;
+  scoped_ptr<content::WifiDataProviderCommon::WlanApiInterface> wlan_api_;
 
   // Controls the polling update interval. (client thread)
-  scoped_ptr<PollingPolicyInterface> polling_policy_;
+  scoped_ptr<content::PollingPolicyInterface> polling_policy_;
 
   // The latest wifi data. (client thread)
-  WifiData wifi_data_;
+  content::WifiData wifi_data_;
 
   // Whether we have strated the data provider. (client thread)
   bool started_;
diff --git a/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc
index 1407449..fbd9925 100644
--- a/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc
@@ -40,8 +40,8 @@ class GeolocationChromeOsWifiDataProviderTest : public testing::Test {
   }
 
   chromeos::MockNetworkLibrary net_lib_;
-  scoped_ptr<WifiDataProviderCommon::WlanApiInterface> api_;
-  WifiData::AccessPointDataSet ap_data_;
+  scoped_ptr<content::WifiDataProviderCommon::WlanApiInterface> api_;
+  content::WifiData::AccessPointDataSet ap_data_;
 };
 
 TEST_F(GeolocationChromeOsWifiDataProviderTest, WifiPoweredOff) {