Add a mechanism to pause and resume geolocation requests.

content/browser/geolocation/location_api_adapter_android.cc

Index: content/browser/geolocation/location_api_adapter_android.cc
diff --git a/content/browser/geolocation/location_api_adapter_android.cc b/content/browser/geolocation/location_api_adapter_android.cc
index 3ab693b33d16b2c1c4c9f2fdaec0ee5475feafa2..84cfd101fd335bc9acc8e09e034c75b5986d1e9a 100644
--- a/content/browser/geolocation/location_api_adapter_android.cc
+++ b/content/browser/geolocation/location_api_adapter_android.cc
@@ -9,7 +9,7 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "content/browser/geolocation/location_provider_android.h"
-#include "jni/LocationProvider_jni.h"
+#include "jni/LocationProviderAdapter_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
@@ -65,7 +65,7 @@ bool AndroidLocationApiAdapter::Start(
   CHECK(!java_location_provider_android_object_.is_null());
   // We'll start receiving notifications from java in the main thread looper
   // until Stop() is called.
-  return Java_LocationProvider_start(env,
+  return Java_LocationProviderAdapter_start(env,
       java_location_provider_android_object_.obj(), high_accuracy);
 }
 
@@ -84,7 +84,8 @@ void AndroidLocationApiAdapter::Stop() {
   location_provider_ = NULL;
 
   JNIEnv* env = AttachCurrentThread();
-  Java_LocationProvider_stop(env, java_location_provider_android_object_.obj());
+  Java_LocationProviderAdapter_stop(
+      env, java_location_provider_android_object_.obj());
   java_location_provider_android_object_.Reset();
 }
 
@@ -143,7 +144,7 @@ bool AndroidLocationApiAdapter::RegisterGeolocationService(JNIEnv* env) {
 void AndroidLocationApiAdapter::CreateJavaObject(JNIEnv* env) {
   // Create the Java AndroidLocationProvider object.
   java_location_provider_android_object_.Reset(
-      Java_LocationProvider_create(env,
+      Java_LocationProviderAdapter_create(env,
           base::android::GetApplicationContext()));
   CHECK(!java_location_provider_android_object_.is_null());
 }