Reland 2:Geolocation: move from content/browser to device/

content/browser/BUILD.gn

Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 35b2f198f77181648b747a85d1b78592258bec0e..6f43a3fb6afab01b0915bb2d9d92e75b833839b1 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -63,6 +63,7 @@ source_set("browser") {
     "//device/battery",
     "//device/bluetooth",
     "//device/gamepad",
+    "//device/geolocation:device_geolocation",
     "//device/power_save_blocker",
     "//device/vibration",
     "//gin",
@@ -211,10 +212,7 @@ source_set("browser") {
   }
 
   if (is_win) {
-    sources -= [
-      "device_sensors/data_fetcher_shared_memory_default.cc",
-      "geolocation/empty_wifi_data_provider.cc",
-    ]
+    sources -= [ "device_sensors/data_fetcher_shared_memory_default.cc" ]
     defines += [
       # This prevents the inclusion of atlhost.h which paired
       # with the windows 8 sdk it does the wrong thing.
@@ -293,18 +291,6 @@ source_set("browser") {
     deps += [ "//ui/gfx/x" ]
   }
 
-  # Dealing with *wifi_data_provider_*.cc is also a bit complicated given
-  # android, chromeos, linux and use_dbus.
-  if (is_android) {
-    sources -= [ "geolocation/wifi_data_provider_common.cc" ]
-  }
-  if (is_chromeos || (is_linux && !use_dbus)) {
-    sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
-  }
-  if (is_linux && use_dbus) {
-    sources -= [ "geolocation/empty_wifi_data_provider.cc" ]
-  }
-
   if (use_pango) {
     configs += [ "//build/config/linux/pangocairo" ]
   }
@@ -316,10 +302,6 @@ source_set("browser") {
     sources -= [
       "browser_ipc_logging.cc",
       "device_sensors/data_fetcher_shared_memory_default.cc",
-      "geolocation/network_location_provider.cc",
-      "geolocation/network_location_provider.h",
-      "geolocation/network_location_request.cc",
-      "geolocation/network_location_request.h",
       "media/session/media_session_delegate_default.cc",
       "power_usage_monitor_impl.cc",
       "power_usage_monitor_impl.h",
@@ -359,11 +341,7 @@ source_set("browser") {
   }
 
   if (is_mac) {
-    sources -= [
-      "device_sensors/data_fetcher_shared_memory_default.cc",
-      "geolocation/empty_wifi_data_provider.cc",
-      "geolocation/empty_wifi_data_provider.h",
-    ]
+    sources -= [ "device_sensors/data_fetcher_shared_memory_default.cc" ]
     deps += [
       "//media",
       "//sandbox/mac:sandbox",