Upstream Android Geolocation

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 1ef5f79ee793a376f092c8a757ed0551cf0bc4d8..bfb48846938eb40b24135c67c1023eb3479261d4 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -308,6 +308,8 @@
     'browser/gamepad/platform_data_fetcher_mac.mm',
     'browser/gamepad/platform_data_fetcher_win.cc',
     'browser/gamepad/platform_data_fetcher_win.h',
+    'browser/geolocation/android_location_api_adapter.cc',
+    'browser/geolocation/android_location_api_adapter.h',
     'browser/geolocation/arbitrator_dependency_factory.cc',
     'browser/geolocation/arbitrator_dependency_factory.h',
     'browser/geolocation/core_location_data_provider_mac.h',
@@ -331,6 +333,8 @@
     'browser/geolocation/location_arbitrator.h',
     'browser/geolocation/location_provider.cc',
     'browser/geolocation/location_provider.h',
+    'browser/geolocation/location_provider_android.cc',
+    'browser/geolocation/location_provider_android.h',
     'browser/geolocation/network_location_provider.cc',
     'browser/geolocation/network_location_provider.h',
     'browser/geolocation/network_location_request.cc',
@@ -801,10 +805,27 @@
         # A main loop would be handled in Java.
         'browser/browser_main_loop.cc',
         'browser/browser_main_loop.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',
+      ],
+      'dependencies': [
+        'content.gyp:content_jni_headers',
+        'content.gyp:content_java',
+      ],
+      'include_dirs': [
+        '<(SHARED_INTERMEDIATE_DIR)/content',
       ],
       'dependencies!': [
         '../third_party/flac/flac.gyp:libflac',
-      ]}],
+      ],
+    }, { # OS!="android"
+      'sources!': [
+        'browser/geolocation/android_location_api_adapter.cc',
+        'browser/geolocation/android_location_api_adapter.h',
+      ],
+    }],
     ['OS=="mac"', {
       'sources': [
         # Build necessary Mozilla sources