summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-28 00:57:00 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-28 00:57:00 +0000
commit26b99739600d03d3f9489d6258794ddab5a5982a (patch)
treef56fd70ce7a5c245af131a45330ee4c392add3b6 /chrome/browser
parent1a30dd3972674b1dd27aa956c7846a1fa5ea5909 (diff)
downloadchromium_src-26b99739600d03d3f9489d6258794ddab5a5982a.zip
chromium_src-26b99739600d03d3f9489d6258794ddab5a5982a.tar.gz
chromium_src-26b99739600d03d3f9489d6258794ddab5a5982a.tar.bz2
Convert use of int ms to TimeDelta in files owned by jar.
R=jar@chromium.org BUG=108171 TEST= Review URL: http://codereview.chromium.org/9190027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/net/network_stats.cc5
-rw-r--r--chrome/browser/net/predictor.cc7
-rw-r--r--chrome/browser/net/predictor_unittest.cc8
-rw-r--r--chrome/browser/net/sdch_dictionary_fetcher.cc6
4 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc
index 1cb0c6b..36a9d70 100644
--- a/chrome/browser/net/network_stats.cc
+++ b/chrome/browser/net/network_stats.cc
@@ -197,11 +197,10 @@ void NetworkStats::OnReadComplete(int result) {
// of 1ms so that the time-out will fire before we have time to really hog
// the CPU too extensively (waiting for the time-out) in case of an infinite
// loop.
- const int kReadDataDelayMs = 1;
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&NetworkStats::ReadData, weak_factory_.GetWeakPtr()),
- kReadDataDelayMs);
+ base::TimeDelta::FromMilliseconds(1));
}
}
@@ -280,7 +279,7 @@ void NetworkStats::StartReadDataTimer(int milliseconds) {
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&NetworkStats::OnReadDataTimeout, weak_factory_.GetWeakPtr()),
- milliseconds);
+ base::TimeDelta::FromMilliseconds(milliseconds));
}
void NetworkStats::OnReadDataTimeout() {
diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
index 5ffcc4a..f30e4ae 100644
--- a/chrome/browser/net/predictor.cc
+++ b/chrome/browser/net/predictor.cc
@@ -1063,14 +1063,13 @@ void Predictor::LoadUrlsForTrimming() {
void Predictor::PostIncrementalTrimTask() {
if (urls_being_trimmed_.empty())
return;
- const int64 kDurationBetweenTrimmingIncrementsMilliseconds =
- TimeDelta::FromSeconds(kDurationBetweenTrimmingIncrementsSeconds)
- .InMilliseconds();
+ const TimeDelta kDurationBetweenTrimmingIncrements =
+ TimeDelta::FromSeconds(kDurationBetweenTrimmingIncrementsSeconds);
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&Predictor::IncrementalTrimReferrers,
weak_factory_->GetWeakPtr(), false),
- kDurationBetweenTrimmingIncrementsMilliseconds);
+ kDurationBetweenTrimmingIncrements);
}
void Predictor::IncrementalTrimReferrers(bool trim_all_now) {
diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc
index e9758f1..ebdd1b38 100644
--- a/chrome/browser/net/predictor_unittest.cc
+++ b/chrome/browser/net/predictor_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -127,8 +127,10 @@ TEST_F(PredictorTest, ShutdownWhenResolutionIsPendingTest) {
testing_master.ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
- MessageLoop::current()->PostDelayedTask(FROM_HERE,
- MessageLoop::QuitClosure(), 500);
+ MessageLoop::current()->PostDelayedTask(
+ FROM_HERE,
+ MessageLoop::QuitClosure(),
+ base::TimeDelta::FromMilliseconds(500));
MessageLoop::current()->Run();
EXPECT_FALSE(testing_master.WasFound(localhost));
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.cc b/chrome/browser/net/sdch_dictionary_fetcher.cc
index 24bdf93..9a0d374 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.cc
+++ b/chrome/browser/net/sdch_dictionary_fetcher.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -52,8 +52,8 @@ void SdchDictionaryFetcher::ScheduleDelayedRun() {
return;
MessageLoop::current()->PostDelayedTask(FROM_HERE,
base::Bind(&SdchDictionaryFetcher::StartFetching,
- weak_factory_.GetWeakPtr()),
- kMsDelayFromRequestTillDownload);
+ weak_factory_.GetWeakPtr()),
+ base::TimeDelta::FromMilliseconds(kMsDelayFromRequestTillDownload));
task_is_pending_ = true;
}