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

3 files changed, 5 insertions, 4 deletions

diff --git a/webkit/glue/resource_fetcher.cc b/webkit/glue/resource_fetcher.cc
index 28885b4..2a36503 100644
--- a/webkit/glue/resource_fetcher.cc
+++ b/webkit/glue/resource_fetcher.cc
@@ -127,7 +127,7 @@ ResourceFetcherWithTimeout::ResourceFetcherWithTimeout(
     const GURL& url, WebFrame* frame, WebURLRequest::TargetType target_type,
     int timeout_secs, Callback* callback)
     : ResourceFetcher(url, frame, target_type, callback) {
-  timeout_timer_.Start(TimeDelta::FromSeconds(timeout_secs), this,
+  timeout_timer_.Start(FROM_HERE, TimeDelta::FromSeconds(timeout_secs), this,
                        &ResourceFetcherWithTimeout::TimeoutFired);
 }
 
diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc
index 9ef0fc6..be878f3 100644
--- a/webkit/glue/resource_fetcher_unittest.cc
+++ b/webkit/glue/resource_fetcher_unittest.cc
@@ -70,7 +70,8 @@ class FetcherDelegate {
   }
 
   void StartTimer() {
-    timer_.Start(base::TimeDelta::FromMilliseconds(kMaxWaitTimeMs),
+    timer_.Start(FROM_HERE,
+                 base::TimeDelta::FromMilliseconds(kMaxWaitTimeMs),
                  this,
                  &FetcherDelegate::TimerFired);
   }
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 792a700a..48e8e6b 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -527,8 +527,8 @@ void WebKitClientImpl::setSharedTimerFireInterval(double interval_seconds) {
     interval = 0;
 
   shared_timer_.Stop();
-  shared_timer_.Start(base::TimeDelta::FromMicroseconds(interval), this,
-                      &WebKitClientImpl::DoTimeout);
+  shared_timer_.Start(FROM_HERE, base::TimeDelta::FromMicroseconds(interval),
+                      this, &WebKitClientImpl::DoTimeout);
 }
 
 void WebKitClientImpl::stopSharedTimer() {