summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 14:35:36 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 14:35:36 +0000
commit94324a0b8044263ba961e4212a90d5b95c09d77d (patch)
treed25315565aaf1dbc68f07425fd344724374afc46 /chrome
parent5286b1691ba7f15f7b993702efab4e63f61c5703 (diff)
downloadchromium_src-94324a0b8044263ba961e4212a90d5b95c09d77d.zip
chromium_src-94324a0b8044263ba961e4212a90d5b95c09d77d.tar.gz
chromium_src-94324a0b8044263ba961e4212a90d5b95c09d77d.tar.bz2
Fix more uses of TimeDelta in safe browsing code.
R=bryner@chromium.org BUG=108171 Review URL: http://codereview.chromium.org/9689051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/safe_browsing/download_protection_service.cc3
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_blocking_page.cc2
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc2
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_test.cc4
4 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc
index c725e20..83b1356 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -401,7 +401,8 @@ class DownloadProtectionService::CheckClientDownloadRequest
FROM_HERE,
base::Bind(&CheckClientDownloadRequest::Cancel,
timeout_weakptr_factory_.GetWeakPtr()),
- service_->download_request_timeout_ms());
+ base::TimeDelta::FromMilliseconds(
+ service_->download_request_timeout_ms()));
}
// Canceling a request will cause us to always report the result as SAFE
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 46a5a09..dd3c3b2 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -687,7 +687,7 @@ void SafeBrowsingBlockingPage::FinishMalwareDetails(int64 delay_ms) {
BrowserThread::PostDelayedTask(
BrowserThread::IO, FROM_HERE,
base::Bind(&MalwareDetails::FinishCollection, malware_details_.get()),
- delay_ms);
+ base::TimeDelta::FromMilliseconds(delay_ms));
}
}
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index fa1bf9a..3340b21 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -221,7 +221,7 @@ class TestProtocolManager : public SafeBrowsingProtocolManager {
BrowserThread::IO, FROM_HERE,
base::Bind(&SafeBrowsingService::HandleGetHashResults,
sb_service_, check, full_hashes_, cancache),
- delay_ms_);
+ base::TimeDelta::FromMilliseconds(delay_ms_));
}
// Prepare the GetFullHash results for the next request.
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 27076713..9e41405 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -458,7 +458,7 @@ class SafeBrowsingServiceTestHelper
FROM_HERE,
base::Bind(&SafeBrowsingServiceTestHelper::CheckStatusOnIOThread,
this),
- wait_time_msec);
+ base::TimeDelta::FromMilliseconds(wait_time_msec));
// Will continue after OnWaitForStatusUpdateDone().
ui_test_utils::RunMessageLoop();
}
@@ -475,7 +475,7 @@ class SafeBrowsingServiceTestHelper
// Wait and try again if last fetch was failed. The loop will hit the
// timeout in OutOfProcTestRunner if the fetch can not get success
// response.
- base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms());
+ base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
}
}