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

content/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/browser/browser.gni")
 import("//media/media_options.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
 
@@ skipping 45 matching lines @@
     "//content/browser/devtools:resources",
     "//content/browser/notifications:notification_proto",
     "//content/browser/service_worker:service_worker_proto",
     "//content/browser/speech/proto",
     "//content/common",
     "//content/public/common:common_sources",
     "//crypto",
     "//device/battery",
     "//device/bluetooth",
     "//device/gamepad",
+    "//device/geolocation:device_geolocation",
     "//device/power_save_blocker",
     "//device/vibration",
     "//gin",
     "//google_apis",
     "//gpu",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//media",
     "//media/capture",
     "//media/gpu/ipc/client",
@@ skipping 128 matching lines @@
           "media/capture/desktop_capture_device_aura.cc",
           "media/capture/desktop_capture_device_aura.h",
         ]
       }
       defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     }
   }
 
   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.
       "__ATLHOST_H__",
     ]
     deps += [
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
     ]
     libs += [
@@ skipping 58 matching lines @@
 
   if (is_linux && use_aura) {
     deps += [ "//build/linux:fontconfig" ]
   }
 
   if (use_x11) {
     configs += [ "//build/config/linux:x11" ]
     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" ]
   }
 
   if (is_android) {
     sources += rebase_path(content_browser_gypi_values.android_browser_sources,
                            ".",
                            "//content")
     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",
       "tracing/tracing_ui.cc",
       "tracing/tracing_ui.h",
 
       # Android skips most, but not all, of the speech code.
       "speech/audio_buffer.cc",
       "speech/audio_buffer.h",
       "speech/audio_encoder.cc",
@@ skipping 19 matching lines @@
       "//media/capture/video/android",
       "//media/mojo/interfaces",
       "//mojo/android:libsystem_java",
       "//ui/android",
     ]
     defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
     libs += [ "jnigraphics" ]
   }
 
   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",
       "//third_party/mozilla",
       "//third_party/sudden_motion_sensor",
       "//ui/accelerated_widget_mac",
     ]
     libs += [
       "Carbon.framework",
       "QuartzCore.framework",
@@ skipping 151 matching lines @@
   if (!is_component_build) {
     public_deps = [
       ":browser",
     ]
   } else {
     public_deps = [
       "//third_party/leveldatabase",
     ]
   }
 }