Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/extensions/active_script_controller_browsertest.cc

 // Copyright 2014 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 "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 55 matching lines @@
   return content::ExecuteScript(web_contents, "1 == 1;");
 }
 
 }  // namespace
 
 class ActiveScriptControllerBrowserTest : public ExtensionBrowserTest {
  public:
   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,
   // one will be created.
   // This could potentially return NULL if LoadExtension() fails.
   const Extension* CreateExtension(HostType host_type,
                                    InjectionType injection_type);
 
  private:
   ScopedVector<TestExtensionDir> test_extension_dirs_;
   std::vector<const Extension*> extensions_;
 };
 
 void ActiveScriptControllerBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   // We append the actual switch to the commandline because it needs to be
   // passed over to the renderer, which a FeatureSwitch::ScopedOverride will
   // not do.
   command_line->AppendSwitch(switches::kEnableScriptsRequireAction);
 }
 
-void ActiveScriptControllerBrowserTest::CleanUpOnMainThread() {
+void ActiveScriptControllerBrowserTest::TearDownOnMainThread() {
   test_extension_dirs_.clear();
 }
 
 const Extension* ActiveScriptControllerBrowserTest::CreateExtension(
     HostType host_type, InjectionType injection_type) {
   std::string name =
       base::StringPrintf(
           "%s %s",
           injection_type == CONTENT_SCRIPT ?
               "content_script" : "execute_script",
@@ skipping 342 matching lines @@
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));
 
   for (size_t i = 0u; i < arraysize(testers); ++i)
     EXPECT_TRUE(testers[i].Verify()) << kExtensionNames[i];
 }
 
 }  // namespace extensions