Don't defer quitting in ExecuteScript and other helpers that use DOMMessageQueue.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
@@ skipping 317 matching lines @@
   JSSetTextField("#supervised-user-creation-password-confirm",
                  kTestSupervisedUserPassword);
 
   JSEval("$('supervised-user-creation').updateNextButtonForUser_()");
   JSExpect("!$('supervised-user-creation-next-button').disabled");
 }
 
 void SupervisedUserTestBase::StartUserCreation(
     const std::string& button_id,
     const std::string& expected_display_name) {
+  base::RunLoop mount_wait_loop, add_key_wait_loop;
+  mock_homedir_methods_->set_mount_callback(mount_wait_loop.QuitClosure());
+  mock_homedir_methods_->set_add_key_callback(add_key_wait_loop.QuitClosure());
   EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
   EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1);
 
   JSEval(std::string("$('").append(button_id).append("').click()"));
 
+  mount_wait_loop.Run();
+  add_key_wait_loop.Run();
   ::testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
+  mock_homedir_methods_->set_mount_callback(base::Closure());
+  mock_homedir_methods_->set_add_key_callback(base::Closure());
 
   EXPECT_TRUE(registration_utility_stub_->register_was_called());
-  EXPECT_EQ(registration_utility_stub_->display_name(),
-            base::UTF8ToUTF16(expected_display_name));
+  EXPECT_EQ(base::UTF8ToUTF16(expected_display_name),
+            registration_utility_stub_->display_name());
 
   registration_utility_stub_->RunSuccessCallback("token");
 
   // Token writing moves control to BlockingPool and back.
   content::RunAllBlockingPoolTasksUntilIdle();
 
   JSExpect(StringPrintf("%s == 'created'", kCurrentPage));
   JSEvalOrExitBrowser("$('supervised-user-creation-gotit-button').click()");
+
+  // TODO(achuith): There should probably be a wait for a specific event.
+  content::RunAllPendingInMessageLoop();
 }
 
 void SupervisedUserTestBase::SigninAsSupervisedUser(
     bool check_homedir_calls,
     int user_index,
     const std::string& expected_display_name) {
   if (check_homedir_calls)
     EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
 
   // Log in as supervised user, make sure that everything works.
@@ skipping 74 matching lines @@
   JSEval(StringPrintf(
       "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()",
       user_index));
 
   // Make sure there is no supervised user in list.
   ASSERT_EQ(original_user_count - 1,
             user_manager::UserManager::Get()->GetUsers().size());
 }
 
 }  // namespace chromeos