summaryrefslogtreecommitdiffstats
path: root/content/browser/geolocation
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-17 15:24:53 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-17 15:24:53 +0000
commita9a37e062d73ea5acb53d7ed1e7204d488e67211 (patch)
treed394ced52c2131913f0fefba4d5677b5c8b94924 /content/browser/geolocation
parent4984c9ffb4f6b7c3f9bb4c02dbdf1d6fcf09884c (diff)
downloadchromium_src-a9a37e062d73ea5acb53d7ed1e7204d488e67211.zip
chromium_src-a9a37e062d73ea5acb53d7ed1e7204d488e67211.tar.gz
chromium_src-a9a37e062d73ea5acb53d7ed1e7204d488e67211.tar.bz2
Revert r117895 "Convert use of int ms to TimeDelta in files owned by bulach."
This broke compilation on Windows debug. R=bulach@chromium.org BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/9242010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/geolocation')
-rw-r--r--content/browser/geolocation/device_data_provider_unittest.cc6
-rw-r--r--content/browser/geolocation/gps_location_provider_linux.cc4
-rw-r--r--content/browser/geolocation/network_location_provider.cc6
-rw-r--r--content/browser/geolocation/wifi_data_provider_common.cc4
4 files changed, 10 insertions, 10 deletions
diff --git a/content/browser/geolocation/device_data_provider_unittest.cc b/content/browser/geolocation/device_data_provider_unittest.cc
index 640a8fc..3fb5cc4 100644
--- a/content/browser/geolocation/device_data_provider_unittest.cc
+++ b/content/browser/geolocation/device_data_provider_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -27,12 +27,12 @@ TEST(GeolocationDeviceDataProviderWifiData, CreateDestroy) {
for (int i = 0; i < 10; i++) {
DeviceDataProvider<WifiData>::Register(&listener);
for (int j = 0; j < 10; j++) {
- base::PlatformThread::Sleep(base::TimeDelta());
+ base::PlatformThread::Sleep(0);
main_message_loop.RunAllPending(); // See comment above
}
DeviceDataProvider<WifiData>::Unregister(&listener);
for (int j = 0; j < 10; j++) {
- base::PlatformThread::Sleep(base::TimeDelta());
+ base::PlatformThread::Sleep(0);
main_message_loop.RunAllPending(); // See comment above
}
}
diff --git a/content/browser/geolocation/gps_location_provider_linux.cc b/content/browser/geolocation/gps_location_provider_linux.cc
index 1c00d69..9b53999 100644
--- a/content/browser/geolocation/gps_location_provider_linux.cc
+++ b/content/browser/geolocation/gps_location_provider_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -125,7 +125,7 @@ void GpsLocationProviderLinux::ScheduleNextGpsPoll(int interval) {
FROM_HERE,
base::Bind(&GpsLocationProviderLinux::DoGpsPollTask,
weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(interval));
+ interval);
}
LocationProviderBase* NewSystemLocationProvider() {
diff --git a/content/browser/geolocation/network_location_provider.cc b/content/browser/geolocation/network_location_provider.cc
index aebbf08..d4c83fe 100644
--- a/content/browser/geolocation/network_location_provider.cc
+++ b/content/browser/geolocation/network_location_provider.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -14,7 +14,7 @@ using content::AccessTokenStore;
namespace {
// The maximum period of time we'll wait for a complete set of device data
// before sending the request.
-const int kDataCompleteWaitSeconds = 2;
+const int kDataCompleteWaitPeriod = 1000 * 2; // 2 seconds
} // namespace
// static
@@ -213,7 +213,7 @@ bool NetworkLocationProvider::StartProvider(bool high_accuracy) {
FROM_HERE,
base::Bind(&NetworkLocationProvider::RequestPosition,
weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromSeconds(kDataCompleteWaitSeconds));
+ kDataCompleteWaitPeriod);
// Get the device data.
is_radio_data_complete_ = radio_data_provider_->GetData(&radio_data_);
is_wifi_data_complete_ = wifi_data_provider_->GetData(&wifi_data_);
diff --git a/content/browser/geolocation/wifi_data_provider_common.cc b/content/browser/geolocation/wifi_data_provider_common.cc
index 7156d12..16c11df 100644
--- a/content/browser/geolocation/wifi_data_provider_common.cc
+++ b/content/browser/geolocation/wifi_data_provider_common.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -105,5 +105,5 @@ void WifiDataProviderCommon::ScheduleNextScan(int interval) {
FROM_HERE,
base::Bind(&WifiDataProviderCommon::DoWifiScanTask,
weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(interval));
+ interval);
}