Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/test/base/in_process_browser_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
@@ skipping 48 matching lines @@
 // setting up the environment for running the browser.
 // . SetUpUserDataDirectory()
 // . SetUpCommandLine()
 // . SetUpInProcessBrowserTestFixture()
 //
 // SetUpOnMainThread() is called just after creating the default browser object
 // and before executing the real test code. It's mainly for setting up things
 // related to the browser object and associated window, like opening a new Tab
 // with a testing page loaded.
 //
-// CleanUpOnMainThread() is called just after executing the real test code to
+// TearDownOnMainThread() is called just after executing the real test code to
 // do necessary cleanup before the browser is torn down.
 //
 // TearDownInProcessBrowserTestFixture() is called after BrowserMain() exits to
 // cleanup things setup for running the browser.
 //
 // By default InProcessBrowserTest creates a single Browser (as returned from
 // the CreateBrowser method). You can obviously create more as needed.
 
 // InProcessBrowserTest disables the sandbox when running.
 //
@@ skipping 35 matching lines @@
   void AddTabAtIndex(int index, const GURL& url,
                      content::PageTransition transition);
 
   // Initializes the contents of the user data directory. Called by SetUp()
   // after creating the user data directory, but before any browser is launched.
   // If a test wishes to set up some initial non-empty state in the user data
   // directory before the browser starts up, it can do so here. Returns true if
   // successful.
   virtual bool SetUpUserDataDirectory() WARN_UNUSED_RESULT;
 
-  // Override this to add any custom cleanup code that needs to be done on the
-  // main thread before the browser is torn down.
-  virtual void CleanUpOnMainThread() {}
-
   // BrowserTestBase:
   virtual void RunTestOnMainThreadLoop() OVERRIDE;
 
   // Creates a browser with a single tab (about:blank), waits for the tab to
   // finish loading and shows the browser.
   //
   // This is invoked from Setup.
   Browser* CreateBrowser(Profile* profile);
 
   // Similar to |CreateBrowser|, but creates an incognito browser.
@@ skipping 73 matching lines @@
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)
   scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
 #endif
 };
 
 #endif  // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_