Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:…

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_surfaces',
     '../components/components.gyp:display_compositor',
@@ skipping 86 matching lines @@
     # The public render_widget_host.h needs to re-export skia defines.
     '../skia/skia.gyp:skia',
     'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
   ],
   'include_dirs': [
     '..',
     '<(INTERMEDIATE_DIR)',
   ],
   'variables': {
     'public_browser_sources': [
+      'public/browser/access_token_store.h',
       'public/browser/android/browser_media_player_manager_register.cc',
       'public/browser/android/browser_media_player_manager_register.h',
       'public/browser/android/compositor.h',
       'public/browser/android/compositor_client.h',
       'public/browser/android/content_protocol_handler.h',
       'public/browser/android/content_view_core.h',
       'public/browser/android/content_view_layer_renderer.h',
       'public/browser/android/devtools_auth.h',
       'public/browser/android/external_video_surface_container.h',
       'public/browser/android/service_registry_android.h',
@@ skipping 67 matching lines @@
       'public/browser/download_manager_delegate.h',
       'public/browser/download_save_info.cc',
       'public/browser/download_save_info.h',
       'public/browser/download_url_parameters.cc',
       'public/browser/download_url_parameters.h',
       'public/browser/favicon_status.cc',
       'public/browser/favicon_status.h',
       'public/browser/file_descriptor_info.h',
       'public/browser/focused_node_details.h',
       'public/browser/font_list_async.h',
+      'public/browser/geolocation_delegate.cc',
+      'public/browser/geolocation_provider.h',
       'public/browser/global_request_id.h',
       'public/browser/gpu_data_manager.h',
       'public/browser/gpu_data_manager_observer.h',
       'public/browser/gpu_service_registry.cc',
       'public/browser/gpu_service_registry.h',
       'public/browser/gpu_utils.cc',
       'public/browser/gpu_utils.h',
       'public/browser/histogram_fetcher.h',
       'public/browser/host_zoom_map.h',
       'public/browser/indexed_db_context.h',
       'public/browser/indexed_db_info.h',
       'public/browser/interstitial_page.h',
       'public/browser/interstitial_page_delegate.cc',
       'public/browser/interstitial_page_delegate.h',
       'public/browser/invalidate_type.h',
       'public/browser/javascript_dialog_manager.cc',
       'public/browser/javascript_dialog_manager.h',
       'public/browser/load_from_memory_cache_details.cc',
       'public/browser/load_from_memory_cache_details.h',
       'public/browser/load_notification_details.h',
       'public/browser/local_storage_usage_info.h',
+      'public/browser/location_provider.h',
       'public/browser/media_capture_devices.h',
       'public/browser/media_device_id.cc',
       'public/browser/media_device_id.h',
       'public/browser/memory_pressure_controller.cc',
       'public/browser/memory_pressure_controller.h',
       'public/browser/message_port_delegate.h',
       'public/browser/message_port_provider.h',
       'public/browser/native_web_keyboard_event.h',
       'public/browser/navigation_controller.cc',
       'public/browser/navigation_controller.h',
@@ skipping 576 matching lines @@
       'browser/frame_host/render_frame_proxy_host.cc',
       'browser/frame_host/render_frame_proxy_host.h',
       'browser/frame_host/render_widget_host_view_child_frame.cc',
       'browser/frame_host/render_widget_host_view_child_frame.h',
       'browser/frame_host/render_widget_host_view_guest.cc',
       'browser/frame_host/render_widget_host_view_guest.h',
       'browser/gamepad/gamepad_service.cc',
       'browser/gamepad/gamepad_service.h',
       'browser/gamepad/gamepad_shared_buffer_impl.cc',
       'browser/gamepad/gamepad_shared_buffer_impl.h',
+      'browser/geolocation/empty_wifi_data_provider.cc',
+      'browser/geolocation/empty_wifi_data_provider.h',
+      'browser/geolocation/geolocation_provider_impl.cc',
+      'browser/geolocation/geolocation_provider_impl.h',
+      'browser/geolocation/geolocation_service_context.cc',
+      'browser/geolocation/geolocation_service_context.h',
+      'browser/geolocation/geolocation_service_impl.cc',
+      'browser/geolocation/geolocation_service_impl.h',
+      'browser/geolocation/location_api_adapter_android.cc',
+      'browser/geolocation/location_api_adapter_android.h',
+      'browser/geolocation/location_arbitrator.h',
+      'browser/geolocation/location_arbitrator_impl.cc',
+      'browser/geolocation/location_arbitrator_impl.h',
+      'browser/geolocation/location_provider_android.cc',
+      'browser/geolocation/location_provider_android.h',
+      'browser/geolocation/location_provider_base.cc',
+      'browser/geolocation/location_provider_base.h',
+      'browser/geolocation/network_location_provider.cc',
+      'browser/geolocation/network_location_provider.h',
+      'browser/geolocation/network_location_request.cc',
+      'browser/geolocation/network_location_request.h',
+      'browser/geolocation/wifi_data.cc',
+      'browser/geolocation/wifi_data.h',
+      'browser/geolocation/wifi_data_provider.cc',
+      'browser/geolocation/wifi_data_provider.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',
+      'browser/geolocation/wifi_data_provider_common_win.h',
+      'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
+      'browser/geolocation/wifi_data_provider_linux.cc',
+      'browser/geolocation/wifi_data_provider_linux.h',
+      'browser/geolocation/wifi_data_provider_mac.cc',
+      'browser/geolocation/wifi_data_provider_mac.h',
+      'browser/geolocation/wifi_data_provider_manager.cc',
+      'browser/geolocation/wifi_data_provider_manager.h',
+      'browser/geolocation/wifi_data_provider_win.cc',
+      'browser/geolocation/wifi_data_provider_win.h',
+      'browser/geolocation/wifi_polling_policy.h',
       'browser/gpu/browser_gpu_channel_host_factory.cc',
       'browser/gpu/browser_gpu_channel_host_factory.h',
       'browser/gpu/browser_gpu_memory_buffer_manager.cc',
       'browser/gpu/browser_gpu_memory_buffer_manager.h',
       'browser/gpu/compositor_util.cc',
       'browser/gpu/compositor_util.h',
       'browser/gpu/gpu_data_manager_impl.cc',
       'browser/gpu/gpu_data_manager_impl.h',
       'browser/gpu/gpu_data_manager_impl_private.cc',
       'browser/gpu/gpu_data_manager_impl_private.h',
@@ skipping 1163 matching lines @@
       'direct_dependent_settings': {
         'defines': ['APPCACHE_USE_SIMPLE_CACHE'],
       },
       'link_settings': {
         'libraries': [
           '-ljnigraphics',
         ],
       },
       'sources/': [
         ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\\.cc$'],
+        ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
+        ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
         ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'],
         ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
       ],
       'sources': [
         '<@(android_browser_sources)',
       ],
       'sources!': [
         'browser/browser_ipc_logging.cc',
+        'browser/geolocation/device_data_provider.cc',
+        'browser/geolocation/empty_device_data_provider.cc',
+        'browser/geolocation/wifi_data_provider_common.cc',
         'browser/media/session/media_session_delegate_default.cc',
         'browser/power_usage_monitor_impl.cc',
         'browser/power_usage_monitor_impl.h',
         'browser/renderer_host/native_web_keyboard_event.cc',
       ]
     }],
     ['OS=="mac"', {
       'sources/': [
         ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'],
       ],
+      'sources!': [
+        'browser/geolocation/empty_wifi_data_provider.cc',
+      ],
       'dependencies': [
         '../media/media.gyp:media',
         '../third_party/mozilla/mozilla.gyp:mozilla',
         '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_motion_sensor',
         '../ui/accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_widget_mac',
       ],
     }],
     ['chromeos==1', {
       'dependencies': [
         '../build/linux/system.gyp:dbus',
         '../chromeos/chromeos.gyp:chromeos',
         '../chromeos/chromeos.gyp:power_manager_proto',
       ],
       'sources!': [
         'browser/device_sensors/data_fetcher_shared_memory_default.cc',
+        'browser/geolocation/wifi_data_provider_linux.cc',
       ],
     }],
     ['use_aura==1', {
       'dependencies': [
         '../ui/aura/aura.gyp:aura',
         '../ui/aura_extra/aura_extra.gyp:aura_extra',
         '../ui/strings/ui_strings.gyp:ui_strings',
       ],
     }, {
       'sources/': [
@@ skipping 23 matching lines @@
     }],
     ['enable_web_speech==0 and OS=="android"', {
       'sources/': [
         ['exclude', '^browser/speech/'],
         ['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h)$'],
         ['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'],
         ['include', '^browser/speech/speech_recognizer\\.h$'],
         ['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'],
       ],
     }],
+    ['OS == "win"', {
+      'sources!': [
+        'browser/geolocation/empty_wifi_data_provider.cc',
+      ],
+    }],
     ['OS == "linux" and use_dbus==1', {
+      'sources!': [
+        'browser/geolocation/empty_wifi_data_provider.cc',
+      ],
       'dependencies': [
         '../build/linux/system.gyp:dbus',
         '../dbus/dbus.gyp:dbus',
       ],
+    }, {  # OS != "linux" or use_dbus==0
+      'sources!': [
+        'browser/geolocation/wifi_data_provider_linux.cc',
+      ],
     }],
     ['enable_browser_cdms==1', {
       'sources': [
         'browser/media/cdm/browser_cdm_manager.cc',
         'browser/media/cdm/browser_cdm_manager.h',
       ],
     }],
     ['OS == "linux"', {
       'dependencies': [
         '../third_party/boringssl/boringssl.gyp:boringssl',
@@ skipping 23 matching lines @@
       ],
     }],
     ['OS != "mac" and OS != "android"', {
       'sources!': [
         'browser/gpu/gpu_surface_tracker.cc',
         'browser/gpu/gpu_surface_tracker.h',
       ],
     }],
   ],
 }