chrome/browser/extensions/api/content_settings/content_settings_apitest.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/browser/extensions/api/content_settings/content_settings_apitest.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

« no previous file with comments | « chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_apitest.cc ('k') | chrome/browser/extensions/api/dns/dns_apitest.cc » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

index a7fae5e44773fcfbc6769ba49179c139c1569727..acafd99f20a6e05f9253418a0b2c095fbcf51468 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -53,14 +53,14 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

g_browser_process->AddRefModule();

}

- virtual void CleanUpOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() OVERRIDE {

// ReleaseBrowserProcessModule() needs to be called in a message loop, so we

// post a task to do it, then run the message loop.

base::MessageLoop::current()->PostTask(

FROM_HERE, base::Bind(&ReleaseBrowserProcessModule));

content::RunAllPendingInMessageLoop();

- ExtensionApiTest::CleanUpOnMainThread();

+ ExtensionApiTest::TearDownOnMainThread();

}

protected: