Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/captive_portal/captive_portal_browsertest.cc

Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 67a9e3e80f5e26770d2395789faa74df0967c8b8..11deb82ed58b8694f2578ebb511726925b2a52c3 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -790,7 +790,7 @@ class CaptivePortalBrowserTest : public InProcessBrowserTest {
 
   // InProcessBrowserTest:
   virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   // Sets the captive portal checking preference.  Does not affect the command
   // line flag, which is set in SetUpCommandLine.
@@ -968,7 +968,7 @@ void CaptivePortalBrowserTest::SetUpOnMainThread() {
                             GURL(kMockCaptivePortalTestUrl));
 }
 
-void CaptivePortalBrowserTest::CleanUpOnMainThread() {
+void CaptivePortalBrowserTest::TearDownOnMainThread() {
   // No test should have a captive portal check pending on quit.
   EXPECT_FALSE(CheckPending(browser()));
 }