Merge changes I2de9dfed,I80436e37

* changes:
  Move GeolocationServiceBridge to WebKit/android/jni and extract Listener interface
  GeolocationPermissions cleanup

1 files changed, 2 insertions, 4 deletions

diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index dc4f70c..29f8f1e 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -4768,11 +4768,9 @@ static void Pause(JNIEnv* env, jobject obj, jint nativeClass)
     // browser). The browser can only be killed by the system when it is in the
     // background, so saving the Geolocation permission state now ensures that
     // is maintained when the browser is killed.
-    WebViewCore* viewImpl = reinterpret_cast<WebViewCore*>(nativeClass);
-    ChromeClient* chromeClient = viewImpl->mainFrame()->page()->chrome()->client();
-    ChromeClientAndroid* chromeClientAndroid = static_cast<ChromeClientAndroid*>(chromeClient);
-    chromeClientAndroid->storeGeolocationPermissions();
+    GeolocationPermissions::maybeStorePermanentPermissions();
 
+    WebViewCore* viewImpl = reinterpret_cast<WebViewCore*>(nativeClass);
     Frame* mainFrame = viewImpl->mainFrame();
     for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext()) {
         Geolocation* geolocation = frame->domWindow()->navigator()->optionalGeolocation();