chrome/browser/chromeos/policy/login_screen_default_policy_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/browser/chromeos/policy/login_screen_default_policy_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

« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | chrome/browser/chromeos/policy/power_policy_browsertest.cc » ('j') | chrome/browser/sessions/session_restore_browsertest_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

index cf7b4ca3a81a12f5be961b263e40a184da630e19..3142f4e3ae9160c3dfba36501757b45482588d90 100644

--- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

+++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

@@ -105,7 +105,7 @@ class LoginScreenDefaultPolicyLoginScreenBrowsertest

// LoginScreenDefaultPolicyBrowsertestBase:

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;

virtual void SetUpOnMainThread() OVERRIDE;

- virtual void CleanUpOnMainThread() OVERRIDE;

+ virtual void TearDownOnMainThread() OVERRIDE;

void VerifyPrefFollowsRecommendation(const char* pref_name,

const base::Value& recommended_value);

@@ -189,11 +189,11 @@ void LoginScreenDefaultPolicyLoginScreenBrowsertest::SetUpOnMainThread() {

chromeos::ProfileHelper::GetSigninProfile());

}

-void LoginScreenDefaultPolicyLoginScreenBrowsertest::CleanUpOnMainThread() {

+void LoginScreenDefaultPolicyLoginScreenBrowsertest::TearDownOnMainThread() {

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

base::Bind(&chrome::AttemptExit));

base::RunLoop().RunUntilIdle();

- LoginScreenDefaultPolicyBrowsertestBase::CleanUpOnMainThread();

+ LoginScreenDefaultPolicyBrowsertestBase::TearDownOnMainThread();

}

void LoginScreenDefaultPolicyLoginScreenBrowsertest::