chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc - Issue 409743003: Use content::RunBlockingPoolTask() in tests.

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/login/supervised/supervised_user_test_base.cc

Issue 409743003: Use content::RunBlockingPoolTask() in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased + reverted changes to content/browser/media/webrtc_identity_store_unittest.cc. Created 6 years, 4 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/supervised/supervised_user_test_base.h ('K') | « chrome/browser/chromeos/login/supervised/supervised_user_test_base.h ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

index 0074e2fbf44b6a4ec9b4d267486ba328463200ad..541969400487786ef020678df86b9137c94ad87a 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

@@ -341,9 +341,7 @@ void SupervisedUserTestBase::StartUserCreation(

registration_utility_stub_->RunSuccessCallback("token");

// Token writing moves control to BlockingPool and back.

- base::RunLoop().RunUntilIdle();

- content::BrowserThread::GetBlockingPool()->FlushForTesting();

- base::RunLoop().RunUntilIdle();

+ content::RunAllBlockingPoolTasksUntilIdle();

JSExpect(StringPrintf("%s == 'created'", kCurrentPage));

JSEval("$('supervised-user-creation-gotit-button').click()");

@@ -390,7 +388,7 @@ void SupervisedUserTestBase::SigninAsManager(int user_index) {

}

void SupervisedUserTestBase::RemoveSupervisedUser(

- unsigned long original_user_count,

+ uint32 original_user_count,

int user_index,

const std::string& expected_display_name) {

// Remove supervised user.