Upstream Geolocation timestamp fix.

content/browser/geolocation/location_api_adapter_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_ANDROID_LOCATION_API_ADAPTER_H_
 #define CONTENT_BROWSER_GEOLOCATION_ANDROID_LOCATION_API_ADAPTER_H_
 #pragma once
 
 #include "base/android/scoped_java_ref.h"
 #include "base/synchronization/lock.h"
@@ skipping 31 matching lines @@
 
   // Returns our singleton.
   static AndroidLocationApiAdapter* GetInstance();
 
   // Called when initializing chrome_view to obtain a pointer to the java class.
   static bool RegisterGeolocationService(JNIEnv* env);
 
   // Called by JNI on main thread looper.
   static void OnNewLocationAvailable(double latitude,
                                      double longitude,
-                                     long time_stamp,
+                                     double time_stamp,
                                      bool has_altitude, double altitude,
                                      bool has_accuracy, double accuracy,
                                      bool has_heading, double heading,
                                      bool has_speed, double speed);
   static void OnNewErrorAvailable(JNIEnv* env, jstring message);
 
  private:
   friend struct DefaultSingletonTraits<AndroidLocationApiAdapter>;
   AndroidLocationApiAdapter();
   ~AndroidLocationApiAdapter();
@@ skipping 11 matching lines @@
       java_location_provider_android_object_;
   LocationProviderAndroid* location_provider_;
 
   // Guards against the following member which is accessed on Geolocation
   // thread and the JNI main thread looper.
   base::Lock lock_;
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 };
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_ANDROID_LOCATION_API_ADAPTER_H_