Cherry-pick WebKit change 52103 - Add a client based Geolocation provider

This is required to ease the process of upstreaming the Geolocation maximumAge handling code.

Note that changes to WebCoreFrameBridge.cpp and WebCoreJniOnLoad.cpp were required as a result of this.

Change-Id: Icd8524da9050acda3b991051877c3b5cf262b2b3

2 files changed, 14 insertions, 3 deletions

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 150c428..d6570d0 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -871,7 +871,13 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss
     WebCore::DragClient*        dragC = new DragClientAndroid;
     InspectorClientAndroid* inspectorC = new InspectorClientAndroid;
     // Create a new page
-    WebCore::Page* page = new WebCore::Page(chromeC, contextMenuC, editorC, dragC, inspectorC, 0);
+    WebCore::Page* page = new WebCore::Page(chromeC,
+                                            contextMenuC,
+                                            editorC,
+                                            dragC,
+                                            inspectorC,
+                                            0, // PluginHalterClient
+                                            0); // GeolocationControllerClient
     // css files without explicit MIMETYPE is treated as generic text files in
     // the Java side. So we can't enforce CSS MIMETYPE.
     page->settings()->setEnforceCSSMIMETypeInStrictMode(false);
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp
index d69177e..2716a7e 100644
--- a/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -189,8 +189,13 @@ EXPORT void benchmark(const char* url, int reloadCount, int width, int height) {
     // Create the page with all the various clients
     ChromeClientAndroid* chrome = new ChromeClientAndroid;
     EditorClientAndroid* editor = new EditorClientAndroid;
-    Page* page = new Page(chrome, new ContextMenuClientAndroid, editor,
-            new DragClientAndroid, new InspectorClientAndroid, NULL);
+    Page* page = new Page(chrome,
+                          new ContextMenuClientAndroid,
+                          editor,
+                          new DragClientAndroid,
+                          new InspectorClientAndroid,
+                          0, // PluginHalterClient
+                          0); // GeolocationControllerClient
     editor->setPage(page);
 
     // Create MyWebFrame that intercepts network requests