Revert "GTTF: Remove message loop hooks from TestLauncherDelegate"

chrome/test/base/chrome_test_launcher.cc

Index: chrome/test/base/chrome_test_launcher.cc
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index e1a8af9bd55c3e6bfa412430651d150f548c6a31..d1a25e0891e778250e3f21c16c34f75b56d2be0a 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -59,12 +59,6 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
   }
 
   virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
-    content::AddPreRunMessageLoopHook(base::Bind(
-        &ChromeTestLauncherDelegate::PreRunMessageLoop,
-        base::Unretained(this)));
-    content::AddPostRunMessageLoopHook(base::Bind(
-        &ChromeTestLauncherDelegate::PostRunMessageLoop,
-        base::Unretained(this)));
     return ChromeTestSuite(argc, argv).Run();
   }
 
@@ -90,9 +84,7 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
     return true;
   }
 
-  void PreRunMessageLoop(base::RunLoop* run_loop) {
-    // TODO(phajdan.jr): Remove message loop hooks after switch to Aura.
-    // This includes removing content::Add{Pre,Post}RunMessageLoopHook.
+  virtual void PreRunMessageLoop(base::RunLoop* run_loop) OVERRIDE {
 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
     if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
       linked_ptr<views::AcceleratorHandler> handler(
@@ -103,9 +95,7 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
 #endif
   }
 
-  void PostRunMessageLoop(base::RunLoop* run_loop) {
-    // TODO(phajdan.jr): Remove message loop hooks after switch to Aura.
-    // This includes removing content::Add{Pre,Post}RunMessageLoopHook.
+  virtual void PostRunMessageLoop() OVERRIDE {
 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
     if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
       DCHECK_EQ(handlers_.empty(), false);
@@ -114,7 +104,6 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
 #endif
   }
 
-
  protected:
   virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
 #if defined(OS_WIN) || defined (OS_LINUX)