Upstream Geolocation timestamp fix.

content/browser/geolocation/location_api_adapter_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/geolocation/location_api_adapter_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "content/browser/geolocation/location_provider_android.h"
 #include "jni/location_provider_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ClearException;
 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,
                                  jboolean has_speed, jdouble speed) {
   AndroidLocationApiAdapter::OnNewLocationAvailable(latitude, longitude,
       time_stamp, has_altitude, altitude, has_accuracy, accuracy,
       has_heading, heading, has_speed, speed);
 }
 
 static void NewErrorAvailable(JNIEnv* env, jclass, jstring message) {
@@ skipping 58 matching lines @@
     const content::Geoposition& geoposition) {
   // Called on the geolocation thread, safe to access location_provider_ here.
   if (GetInstance()->location_provider_) {
     CHECK(GetInstance()->message_loop_->BelongsToCurrentThread());
     GetInstance()->location_provider_->NotifyNewGeoposition(geoposition);
   }
 }
 
 // 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,
     bool has_speed, double speed) {
   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)
     position.accuracy = accuracy;
   if (has_heading)
     position.heading = heading;
   if (has_speed)
     position.speed = speed;
   GetInstance()->OnNewGeopositionInternal(position);
 }
@@ skipping 31 matching lines @@
     const content::Geoposition& geoposition) {
   base::AutoLock lock(lock_);
   if (!message_loop_)
     return;
   message_loop_->PostTask(
       FROM_HERE,
       base::Bind(
           &AndroidLocationApiAdapter::NotifyProviderNewGeoposition,
           geoposition));
 }