Upstream Geolocation timestamp fix.

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 f1c8948439e152ec0c2fc03fa704dfed4c305a8e..9c2356c57c93725da61875d35142cd343270ee65 100644
--- a/content/browser/geolocation/location_api_adapter_android.cc
+++ b/content/browser/geolocation/location_api_adapter_android.cc
@@ -19,7 +19,7 @@ using base::android::GetMethodID;
 static void NewLocationAvailable(JNIEnv* env, jclass,
                                  jdouble latitude,
                                  jdouble longitude,
-                                 jlong time_stamp,
+                                 jdouble time_stamp,
                                  jboolean has_altitude, jdouble altitude,
                                  jboolean has_accuracy, jdouble accuracy,
                                  jboolean has_heading, jdouble heading,
@@ -98,7 +98,7 @@ void AndroidLocationApiAdapter::NotifyProviderNewGeoposition(
 
 // static
 void AndroidLocationApiAdapter::OnNewLocationAvailable(
-    double latitude, double longitude, long time_stamp,
+    double latitude, double longitude, double time_stamp,
     bool has_altitude, double altitude,
     bool has_accuracy, double accuracy,
     bool has_heading, double heading,
@@ -106,7 +106,7 @@ void AndroidLocationApiAdapter::OnNewLocationAvailable(
   content::Geoposition position;
   position.latitude = latitude;
   position.longitude = longitude;
-  position.timestamp = base::Time::FromDoubleT(time_stamp / 1000.0);
+  position.timestamp = base::Time::FromDoubleT(time_stamp);
   if (has_altitude)
     position.altitude = altitude;
   if (has_accuracy)