Move the chromeos implementation of WifiDataProvider back to chrome, since it has chrome dependencies.

TBR=avi
Review URL: http://codereview.chromium.org/6975030

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

7 files changed, 8 insertions, 11 deletions

diff --git a/content/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
index 68cc9be..0d7c314 100644
--- a/content/browser/geolocation/wifi_data_provider_chromeos.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc
@@ -4,7 +4,7 @@
 
 // Provides wifi scan API binding for chromeos, using proprietary APIs.
 
-#include "content/browser/geolocation/wifi_data_provider_chromeos.h"
+#include "chrome/browser/geolocation/wifi_data_provider_chromeos.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
diff --git a/content/browser/geolocation/wifi_data_provider_chromeos.h b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
index e60ac96..76b6174 100644
--- a/content/browser/geolocation/wifi_data_provider_chromeos.h
+++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
-#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
+#define CHROME_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
 #pragma once
 
 #include "content/browser/geolocation/wifi_data_provider_common.h"
@@ -70,4 +70,4 @@ class WifiDataProviderChromeOs : public WifiDataProviderImplBase {
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderChromeOs);
 };
 
-#endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
+#endif  // CHROME_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
diff --git a/content/browser/geolocation/wifi_data_provider_unittest_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc
index bd42286..4795bc8 100644
--- a/content/browser/geolocation/wifi_data_provider_unittest_chromeos.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_unittest_chromeos.cc
@@ -4,7 +4,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "content/browser/geolocation/wifi_data_provider_chromeos.h"
+#include "chrome/browser/geolocation/wifi_data_provider_chromeos.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::DoAll;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 57672ad..fcac008 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1096,6 +1096,8 @@
         'browser/geolocation/geolocation_prefs.h',
         'browser/geolocation/geolocation_settings_state.cc',
         'browser/geolocation/geolocation_settings_state.h',
+        'browser/geolocation/wifi_data_provider_chromeos.cc',
+        'browser/geolocation/wifi_data_provider_chromeos.h',
         'browser/global_keyboard_shortcuts_mac.h',
         'browser/global_keyboard_shortcuts_mac.mm',
         'browser/google/google_update.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 353b20d..6ebfcc5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1381,6 +1381,7 @@
         'browser/geolocation/geolocation_exceptions_table_model_unittest.cc',
         'browser/geolocation/geolocation_permission_context_unittest.cc',
         'browser/geolocation/geolocation_settings_state_unittest.cc',
+        'browser/geolocation/wifi_data_provider_unittest_chromeos.cc',
         'browser/global_keyboard_shortcuts_mac_unittest.mm',
         'browser/google/google_update_settings_unittest.cc',
         'browser/google/google_url_tracker_unittest.cc',
@@ -1912,7 +1913,6 @@
         '../content/browser/geolocation/location_arbitrator_unittest.cc',
         '../content/browser/geolocation/network_location_provider_unittest.cc',
         '../content/browser/geolocation/wifi_data_provider_common_unittest.cc',
-        '../content/browser/geolocation/wifi_data_provider_unittest_chromeos.cc',
         '../content/browser/geolocation/wifi_data_provider_unittest_win.cc',
         '../content/browser/geolocation/win7_location_api_unittest_win.cc',
         '../content/browser/geolocation/win7_location_provider_unittest_win.cc',
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 73c78e0..41ae24c 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -14,9 +14,6 @@ include_rules = [
 

   "+chrome/browser/browser_url_handler.h",

 

-  "+chrome/browser/chromeos/cros/cros_library.h",

-  "+chrome/browser/chromeos/cros/network_library.h",

-

   "+chrome/browser/debugger/devtools_manager.h",

   "+chrome/browser/debugger/devtools_netlog_observer.h",

 

diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 322abdb..6ba0c08 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -110,8 +110,6 @@
         'browser/geolocation/network_location_request.cc',
         'browser/geolocation/network_location_request.h',
         'browser/geolocation/osx_wifi.h',
-        'browser/geolocation/wifi_data_provider_chromeos.cc',
-        'browser/geolocation/wifi_data_provider_chromeos.h',
         'browser/geolocation/wifi_data_provider_common.cc',
         'browser/geolocation/wifi_data_provider_common.h',
         'browser/geolocation/wifi_data_provider_common_win.cc',