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

2 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index deac866..f24cf5e 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -520,7 +520,7 @@ void InstantController::InstantStatusChanged(InstantLoader* loader) {
     // Status isn't ok, start a timer that when fires shows the result. This
     // delays showing 403 pages and the like.
     show_timer_.Stop();
-    show_timer_.Start(
+    show_timer_.Start(FROM_HERE,
         base::TimeDelta::FromMilliseconds(kShowDelayMS),
         this, &InstantController::ShowTimerFired);
     UpdateDisplayableLoader();
@@ -669,7 +669,8 @@ void InstantController::ScheduleUpdate(const GURL& url) {
   scheduled_url_ = url;
 
   update_timer_.Stop();
-  update_timer_.Start(base::TimeDelta::FromMilliseconds(kUpdateDelayMS),
+  update_timer_.Start(FROM_HERE,
+                      base::TimeDelta::FromMilliseconds(kUpdateDelayMS),
                       this, &InstantController::ProcessScheduledUpdate);
 }
 
@@ -724,7 +725,7 @@ void InstantController::UpdateLoader(const TemplateURL* template_url,
                          user_text, verbatim, suggested_text)) {
     show_timer_.Stop();
     if (!new_loader->http_status_ok()) {
-      show_timer_.Start(
+      show_timer_.Start(FROM_HERE,
           base::TimeDelta::FromMilliseconds(kShowDelayMS),
           this, &InstantController::ShowTimerFired);
     }
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 8b28bc0..cb2d593 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -684,7 +684,7 @@ void InstantLoader::SetOmniboxBounds(const gfx::Rect& bounds) {
     if (omnibox_bounds_.height() > last_omnibox_bounds_.height()) {
       SendBoundsToPage(false);
     } else {
-      update_bounds_timer_.Start(
+      update_bounds_timer_.Start(FROM_HERE,
           base::TimeDelta::FromMilliseconds(kUpdateBoundsDelayMS),
           this, &InstantLoader::ProcessBoundsChange);
     }