diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 01:38:59 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 01:38:59 +0000 |
| commit | 400d323d53525a13fbfc47efa8a95c4b13cbccb9 (patch) | |
| tree | f647ecce497271c180d9e62d88a4fcfb73328dc9 /net/disk_cache | |
| parent | 95d9e253aeb47ef0004edc29c9a8c442106b9488 (diff) | |
| download | chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.zip chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.gz chromium_src-400d323d53525a13fbfc47efa8a95c4b13cbccb9.tar.bz2 | |
Currently, base/timer.cc calls PostTask with FROM_HERE as the Location, so the original code that created the delayed callback is lost.
This change adds a tracked_objects::Location parameter to the APIs in base/timer.h so we can trace the PostTask callbacks. The other files are touched to add the FROM_HERE Location parameter.
Review URL: http://codereview.chromium.org/7812036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
| -rw-r--r-- | net/disk_cache/backend_impl.cc | 2 | ||||
| -rw-r--r-- | net/disk_cache/disk_cache_test_util.cc | 2 |
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_; |