Upstream Geolocation timestamp fix.

content/public/android/java/org/chromium/content/browser/LocationProvider.java

Index: content/public/android/java/org/chromium/content/browser/LocationProvider.java
diff --git a/content/public/android/java/org/chromium/content/browser/LocationProvider.java b/content/public/android/java/org/chromium/content/browser/LocationProvider.java
index 6a89eef65e642a8b341938849e9e12418b15eac6..75be3ddb625b3792c7f49878279ca4a49edb5863 100644
--- a/content/public/android/java/org/chromium/content/browser/LocationProvider.java
+++ b/content/public/android/java/org/chromium/content/browser/LocationProvider.java
@@ -102,7 +102,8 @@ class LocationProvider {
             // native object will no longer exist.
             if (mIsRunning) {
                 nativeNewLocationAvailable(location.getLatitude(), location.getLongitude(),
-                        location.getTime(), location.hasAltitude(), location.getAltitude(),
+                        location.getTime() / 1000.0,
+                        location.hasAltitude(), location.getAltitude(),
                         location.hasAccuracy(), location.getAccuracy(),
                         location.hasBearing(), location.getBearing(),
                         location.hasSpeed(), location.getSpeed());
@@ -223,7 +224,7 @@ class LocationProvider {
 
     // Native functions
     public static native void nativeNewLocationAvailable(
-            double latitude, double longitude, long timeStamp,
+            double latitude, double longitude, double timeStamp,
             boolean hasAltitude, double altitude,
             boolean hasAccuracy, double accuracy,
             boolean hasHeading, double heading,