Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/test/base/in_process_browser_test.h

Index: chrome/test/base/in_process_browser_test.h
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h
index 925846eb03e3ad25a0564aabf048accc4e4dc1a7..b0217d90cd8c61acc1ba389fd784e998ccb3112c 100644
--- a/chrome/test/base/in_process_browser_test.h
+++ b/chrome/test/base/in_process_browser_test.h
@@ -66,7 +66,7 @@ class ContentRendererClient;
 // 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
@@ -122,10 +122,6 @@ class InProcessBrowserTest : public content::BrowserTestBase {
   // 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;