Revert "GTTF: Remove message loop hooks from TestLauncherDelegate"

chrome/test/base/chrome_test_launcher.cc

 // Copyright (c) 2012 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 "content/public/test/test_launcher.h"
 
 #include <stack>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 41 matching lines @@
 class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
  public:
   ChromeTestLauncherDelegate() {}
   virtual ~ChromeTestLauncherDelegate() {}
 
   virtual std::string GetEmptyTestName() OVERRIDE {
     return kEmptyTestName;
   }
 
   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();
   }
 
   virtual bool AdjustChildProcessCommandLine(
       CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE {
     CommandLine new_command_line(command_line->GetProgram());
     CommandLine::SwitchMap switches = command_line->GetSwitches();
 
     // Strip out user-data-dir if present.  We will add it back in again later.
     switches.erase(switches::kUserDataDir);
 
     for (CommandLine::SwitchMap::const_iterator iter = switches.begin();
          iter != switches.end(); ++iter) {
       new_command_line.AppendSwitchNative((*iter).first, (*iter).second);
     }
 
     new_command_line.AppendSwitchPath(switches::kUserDataDir, temp_data_dir);
 
     // file:// access for ChromeOS.
     new_command_line.AppendSwitch(switches::kAllowFileAccess);
 
     *command_line = new_command_line;
     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(
           new views::AcceleratorHandler);
       handlers_.push(handler);
       run_loop->set_dispatcher(handler.get());
     }
 #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);
       handlers_.pop();
     }
 #endif
   }
 
-
  protected:
   virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
 #if defined(OS_WIN) || defined (OS_LINUX)
     return new ChromeMainDelegate();
 #else
     // This delegate is only guaranteed to link on linux and windows, so just
     // bail out if we are on any other platform.
     NOTREACHED();
     return NULL;
 #endif
@@ skipping 36 matching lines @@
 #elif defined(USE_AURA)
   // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above.
   ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL));
 #endif
 
 #endif
 
   ChromeTestLauncherDelegate launcher_delegate;
   return content::LaunchTests(&launcher_delegate, argc, argv);
 }