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 /chrome/browser/safe_browsing/protocol_manager.cc | |
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 'chrome/browser/safe_browsing/protocol_manager.cc')
-rw-r--r-- | chrome/browser/safe_browsing/protocol_manager.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index 78c1bab..f412b04 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -502,8 +502,8 @@ void SafeBrowsingProtocolManager::ForceScheduleNextUpdate( DCHECK_GE(next_update_msec, 0); // Unschedule any current timer. update_timer_.Stop(); - update_timer_.Start(TimeDelta::FromMilliseconds(next_update_msec), this, - &SafeBrowsingProtocolManager::GetNextUpdate); + update_timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(next_update_msec), + this, &SafeBrowsingProtocolManager::GetNextUpdate); } // According to section 5 of the SafeBrowsing protocol specification, we must @@ -620,7 +620,8 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete( request_->Start(); // Begin the update request timeout. - update_timer_.Start(TimeDelta::FromSeconds(kSbMaxUpdateWaitSec), this, + update_timer_.Start(FROM_HERE, TimeDelta::FromSeconds(kSbMaxUpdateWaitSec), + this, &SafeBrowsingProtocolManager::UpdateResponseTimeout); } |