| 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..300de81e45e3f139dbed4e718b05884fc63e042d 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,
|
| + size_t original_user_count,
|
| int user_index,
|
| const std::string& expected_display_name) {
|
| // Remove supervised user.
|
|
|