Add support for base::Closure in the MessageLoop.

chrome/browser/jankometer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits>
 
 #include "chrome/browser/jankometer.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 194 matching lines @@
     events_till_measurement_ = discard_count_;
   return measure_current_message_;
 }
 
 // static
 int JankObserverHelper::discard_count_ = 99;  // Measure only 1 in 100.
 
 //------------------------------------------------------------------------------
 class IOJankObserver : public base::RefCountedThreadSafe<IOJankObserver>,
                        public MessageLoopForIO::IOObserver,
-                       public MessageLoop::TaskObserver {
+                       public MessageLoop::ClosureObserver {
  public:
   IOJankObserver(const char* thread_name,
                  TimeDelta excessive_duration,
                  bool watchdog_enable)
       : helper_(thread_name, excessive_duration, watchdog_enable) {}
 
   ~IOJankObserver() {}
 
   // Attaches the observer to the current thread's message loop. You can only
   // attach to the current thread, so this function can be invoked on another
   // thread to attach it.
   void AttachToCurrentThread() {
-    MessageLoop::current()->AddTaskObserver(this);
+    MessageLoop::current()->AddClosureObserver(this);
     MessageLoopForIO::current()->AddIOObserver(this);
   }
 
   // Detaches the observer to the current thread's message loop.
   void DetachFromCurrentThread() {
     MessageLoopForIO::current()->RemoveIOObserver(this);
-    MessageLoop::current()->RemoveTaskObserver(this);
+    MessageLoop::current()->RemoveClosureObserver(this);
   }
 
-  virtual void WillProcessIOEvent() {
+  virtual void WillProcessIOEvent() OVERRIDE {
     if (!helper_.MessageWillBeMeasured())
       return;
     helper_.StartProcessingTimers(base::TimeDelta());
   }
 
-  virtual void DidProcessIOEvent() {
+  virtual void DidProcessIOEvent() OVERRIDE {
     helper_.EndProcessingTimers();
   }
 
-  virtual void WillProcessTask(const Task* task) {
+  virtual void WillProcessClosure(base::TimeTicks time_posted) OVERRIDE {
     if (!helper_.MessageWillBeMeasured())
       return;
     base::TimeTicks now = base::TimeTicks::Now();
-    const base::TimeDelta queueing_time = now - task->tracked_birth_time();
+    const base::TimeDelta queueing_time = now - time_posted;
     helper_.StartProcessingTimers(queueing_time);
   }
 
-  virtual void DidProcessTask(const Task* task) {
+  virtual void DidProcessClosure(base::TimeTicks time_posted) OVERRIDE {
     helper_.EndProcessingTimers();
   }
 
  private:
   friend class base::RefCountedThreadSafe<IOJankObserver>;
 
   JankObserverHelper helper_;
 
   DISALLOW_COPY_AND_ASSIGN(IOJankObserver);
 };
 
 //------------------------------------------------------------------------------
 class UIJankObserver : public base::RefCountedThreadSafe<UIJankObserver>,
-                       public MessageLoop::TaskObserver,
+                       public MessageLoop::ClosureObserver,
                        public MessageLoopForUI::Observer {
  public:
   UIJankObserver(const char* thread_name,
                  TimeDelta excessive_duration,
                  bool watchdog_enable)
       : helper_(thread_name, excessive_duration, watchdog_enable) {}
 
   // Attaches the observer to the current thread's message loop. You can only
   // attach to the current thread, so this function can be invoked on another
   // thread to attach it.
   void AttachToCurrentThread() {
     DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
     MessageLoopForUI::current()->AddObserver(this);
-    MessageLoop::current()->AddTaskObserver(this);
+    MessageLoop::current()->AddClosureObserver(this);
   }
 
   // Detaches the observer to the current thread's message loop.
   void DetachFromCurrentThread() {
     DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
-    MessageLoop::current()->RemoveTaskObserver(this);
+    MessageLoop::current()->RemoveClosureObserver(this);
     MessageLoopForUI::current()->RemoveObserver(this);
   }
 
-  virtual void WillProcessTask(const Task* task) {
+  virtual void WillProcessClosure(base::TimeTicks time_posted) OVERRIDE {
     if (!helper_.MessageWillBeMeasured())
       return;
     base::TimeTicks now = base::TimeTicks::Now();
-    const base::TimeDelta queueing_time = now - task->tracked_birth_time();
+    const base::TimeDelta queueing_time = now - time_posted;
     helper_.StartProcessingTimers(queueing_time);
   }
 
-  virtual void DidProcessTask(const Task* task) {
+  virtual void DidProcessClosure(base::TimeTicks time_posted) OVERRIDE {
     helper_.EndProcessingTimers();
   }
 
 #if defined(OS_WIN)
   virtual void WillProcessMessage(const MSG& msg) {
     if (!helper_.MessageWillBeMeasured())
       return;
     // GetMessageTime returns a LONG (signed 32-bit) and GetTickCount returns
     // a DWORD (unsigned 32-bit). They both wrap around when the time is longer
     // than they can hold. I'm not sure if GetMessageTime wraps around to 0,
@@ skipping 95 matching lines @@
     delete ui_observer;
     ui_observer = NULL;
   }
   if (io_observer) {
     // IO thread can't be running when we remove observers.
     DCHECK((!g_browser_process) || !(g_browser_process->io_thread()));
     delete io_observer;
     io_observer = NULL;
   }
 }