summaryrefslogtreecommitdiffstats
path: root/net/disk_cache
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 18:23:02 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 18:23:02 +0000
commitd323a176fa8c2ef474ce41dd8a1cddacb4fc67ff (patch)
tree5a6b91bcea70978cbf9b63000ed5f798d532f9b7 /net/disk_cache
parentb1bb86d4d58f736fb980b8611ccf43d79e7b5b2b (diff)
downloadchromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.zip
chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.gz
chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.bz2
Update base/timer.h code to pass through Location from call sites. (reland) original CL w/LGTMs: http://codereview.chromium.org/7812036/
Review URL: http://codereview.chromium.org/7824041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
-rw-r--r--net/disk_cache/backend_impl.cc2
-rw-r--r--net/disk_cache/disk_cache_test_util.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index ed69dcd..3b2a4ca 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -472,7 +472,7 @@ int BackendImpl::SyncInit() {
trace_object_ = TraceObject::GetTraceObject();
// Create a recurrent timer of 30 secs.
int timer_delay = unit_test_ ? 1000 : 30000;
- timer_.Start(TimeDelta::FromMilliseconds(timer_delay), this,
+ timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(timer_delay), this,
&BackendImpl::OnStatsTimer);
}
diff --git a/net/disk_cache/disk_cache_test_util.cc b/net/disk_cache/disk_cache_test_util.cc
index 054a41e..b68e3eb 100644
--- a/net/disk_cache/disk_cache_test_util.cc
+++ b/net/disk_cache/disk_cache_test_util.cc
@@ -141,7 +141,7 @@ bool MessageLoopHelper::WaitUntilCacheIoFinished(int num_callbacks) {
ExpectCallbacks(num_callbacks);
// Create a recurrent timer of 50 mS.
if (!timer_.IsRunning())
- timer_.Start(TimeDelta::FromMilliseconds(50), this,
+ timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(50), this,
&MessageLoopHelper::TimerExpired);
MessageLoop::current()->Run();
return completed_;