chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc - Issue 419523003: Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc

Issue 419523003: Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« chrome/browser/sessions/session_restore_browsertest_chromeos.cc ('K') | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/web_ui_browser_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc

diff --git a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc

index c58eace1c18d3cc18defca0b0a55691dd94af2a4..4449b3f160970dd54d515707bb88787c91d59f4a 100644

--- a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc

+++ b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc

@@ -52,7 +52,7 @@ class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest {

GURL(kChromeTestChromeWebUIControllerFactory).host(), &mock_provider_);

}

- virtual void CleanUpOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() OVERRIDE {

test_factory_->RemoveFactoryOverride(

GURL(kChromeTestChromeWebUIControllerFactory).host());

content::WebUIControllerFactory::UnregisterFactoryForTesting(