Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/extensions/active_script_controller_browsertest.cc

Index: chrome/browser/extensions/active_script_controller_browsertest.cc
diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc
index aa7bab34ecd03318448cc96d3f72cff6cccc5bf5..1bb934c3895b8538f6987d0ea65902d253dc18cf 100644
--- a/chrome/browser/extensions/active_script_controller_browsertest.cc
+++ b/chrome/browser/extensions/active_script_controller_browsertest.cc
@@ -73,7 +73,7 @@ class ActiveScriptControllerBrowserTest : public ExtensionBrowserTest {
   ActiveScriptControllerBrowserTest() {}
 
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   // Returns an extension with the given |host_type| and |injection_type|. If
   // one already exists, the existing extension will be returned. Othewrwise,
@@ -96,7 +96,7 @@ void ActiveScriptControllerBrowserTest::SetUpCommandLine(
   command_line->AppendSwitch(switches::kEnableScriptsRequireAction);
 }
 
-void ActiveScriptControllerBrowserTest::CleanUpOnMainThread() {
+void ActiveScriptControllerBrowserTest::TearDownOnMainThread() {
   test_extension_dirs_.clear();
 }