Adds the ability to configure the mock Geolocation service from DumpRenderTree.

core/java/android/webkit/MockGeolocation.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.webkit;
+
+/**
+ * This class is simply a container for the methods used to configure WebKit's
+ * mock Geolocation service for use in LayoutTests.
+ * @hide Pending API council review.
+ */
+public final class MockGeolocation {
+
+    // Global instance of a MockGeolocation
+    private static MockGeolocation sMockGeolocation;
+
+    /**
+     * Set the position for the mock Geolocation service.
+     */
+    public void setPosition(double latitude, double longitude, double accuracy) {
+        // This should only ever be called on the WebKit thread.
+        nativeSetPosition(latitude, longitude, accuracy);
+    }
+
+    /**
+     * Set the error for the mock Geolocation service.
+     */
+    public void setError(int code, String message) {
+        // This should only ever be called on the WebKit thread.
+        nativeSetError(code, message);
+    }
+
+    /**
+     * Get the global instance of MockGeolocation.
+     * @return The global MockGeolocation instance.
+     */
+    public static MockGeolocation getInstance() {
+      if (sMockGeolocation == null) {
+          sMockGeolocation = new MockGeolocation();
+      }
+      return sMockGeolocation;
+    }
+
+    // Native functions
+    private static native void nativeSetPosition(double latitude, double longitude, double accuracy);
+    private static native void nativeSetError(int code, String message);
+}

tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java

@@ -18,6 +18,7 @@ package com.android.dumprendertree;
 
 import android.os.Handler;
 import android.os.Message;
+import android.webkit.MockGeolocation;
 import android.webkit.WebStorage;
 
 import java.util.HashMap;
@@ -325,7 +326,7 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon
     }
 
     public void setWindowIsKey(boolean b) {
-        obtainMessage(LAYOUT_SET_WINDOW_KEY,b ? 1 : 0, 0).sendToTarget();
+        obtainMessage(LAYOUT_SET_WINDOW_KEY, b ? 1 : 0, 0).sendToTarget();
     }
 
     public void testRepaint() {
@@ -352,4 +353,15 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon
         obtainMessage(LAYOUT_SET_CAN_OPEN_WINDOWS).sendToTarget();
     }
 
+    public void setMockGeolocationPosition(double latitude,
+                                           double longitude,
+                                           double accuracy) {
+        MockGeolocation.getInstance().setPosition(latitude,
+                                                  longitude,
+                                                  accuracy);
+    }
+
+    public void setMockGeolocationError(int code, String message) {
+        MockGeolocation.getInstance().setError(code, message);
+    }
 }