chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc - Issue 366813007: 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/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

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

Patch Set: More merge to ToT. 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/chromeos/login/managed/managed_user_test_base.cc ('K') | « chrome/browser/extensions/api/dns/dns_apitest.cc ('k') | chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc » ('j') | chrome/browser/password_manager/password_manager_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

index 5d8c59aff53cdb0fe5ea96417e82653275a800be..68448230ebbcca5b004ddaeeb94af90c6313d317 100644

--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

@@ -156,7 +156,7 @@ class EnterprisePlatformKeysTest : public ExtensionApiTest {

SetPolicy();

}

- virtual void CleanUpOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() OVERRIDE {

base::RunLoop loop;

content::BrowserThread::PostTask(

content::BrowserThread::IO,

@@ -165,7 +165,7 @@ class EnterprisePlatformKeysTest : public ExtensionApiTest {

base::Unretained(this),

&loop));

loop.Run();

- ExtensionApiTest::CleanUpOnMainThread();

+ ExtensionApiTest::TearDownOnMainThread();

}

private: