Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4115)

Unified Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()));
}

Powered by Google App Engine
This is Rietveld 408576698