Add support for base::Closure in the MessageLoop, and reimplement the whole sucker on top of base::Closure. After this, all Task objects that are posted will be wrapped in a closure prior to dispatch.

BUG=35223
TEST=unittests.

Review URL: http://codereview.chromium.org/6463013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82300 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 12 deletions

diff --git a/content/gpu/gpu_watchdog_thread.cc b/content/gpu/gpu_watchdog_thread.cc
index 0fda5b1..3f77207 100644
--- a/content/gpu/gpu_watchdog_thread.cc
+++ b/content/gpu/gpu_watchdog_thread.cc
@@ -83,26 +83,23 @@ void GpuWatchdogThread::CleanUp() {
 
 GpuWatchdogThread::GpuWatchdogTaskObserver::GpuWatchdogTaskObserver(
     GpuWatchdogThread* watchdog)
-  : watchdog_(watchdog) {
+    : watchdog_(watchdog) {
 }
 
 GpuWatchdogThread::GpuWatchdogTaskObserver::~GpuWatchdogTaskObserver() {
 }
 
 void GpuWatchdogThread::GpuWatchdogTaskObserver::WillProcessTask(
-    const Task* task)
-{
+    base::TimeTicks time_posted) {
   watchdog_->CheckArmed();
 }
 
 void GpuWatchdogThread::GpuWatchdogTaskObserver::DidProcessTask(
-    const Task* task)
-{
+    base::TimeTicks time_posted) {
   watchdog_->CheckArmed();
 }
 
-void GpuWatchdogThread::CheckArmed()
-{
+void GpuWatchdogThread::CheckArmed() {
   // Acknowledge the watchdog if it has armed itself. The watchdog will not
   // change its armed state until it is acknowledged.
   if (armed()) {
diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h
index df4a471..08e4612 100644
--- a/content/gpu/gpu_watchdog_thread.h
+++ b/content/gpu/gpu_watchdog_thread.h
@@ -43,8 +43,8 @@ class GpuWatchdogThread : public base::Thread,
     virtual ~GpuWatchdogTaskObserver();
 
     // Implements MessageLoop::TaskObserver.
-    virtual void WillProcessTask(const Task* task);
-    virtual void DidProcessTask(const Task* task);
+    virtual void WillProcessTask(base::TimeTicks time_posted) OVERRIDE;
+    virtual void DidProcessTask(base::TimeTicks time_posted) OVERRIDE;
 
    private:
     GpuWatchdogThread* watchdog_;
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 4412d38..dbb0e34 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -112,12 +112,12 @@ class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
             1, 3600000, 50, base::Histogram::kUmaTargetedHistogramFlag)) {}
   virtual ~RendererMessageLoopObserver() {}
 
-  virtual void WillProcessTask(const Task* task) {
+  virtual void WillProcessTask(base::TimeTicks time_posted) {
     begin_process_message_ = base::TimeTicks::Now();
   }
 
-  virtual void DidProcessTask(const Task* task) {
-    if (begin_process_message_ != base::TimeTicks())
+  virtual void DidProcessTask(base::TimeTicks time_posted) {
+    if (!begin_process_message_.is_null())
       process_times_->AddTime(base::TimeTicks::Now() - begin_process_message_);
   }