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

chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 146 matching lines @@
 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
                        PRE_PRE_CreateAndCancelSupervisedUser) {
   PrepareUsers();
 }
 
 IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
                        PRE_CreateAndCancelSupervisedUser) {
   StartFlowLoginAsManager();
   FillNewUserData(kTestSupervisedUserDisplayName);
 
+  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("$('supervised-user-creation-next-button').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(kTestSupervisedUserDisplayName));
 
   std::string user_id = registration_utility_stub_->supervised_user_id();
 
   // Make sure user is already in list.
   ASSERT_EQ(3UL, user_manager::UserManager::Get()->GetUsers().size());
 
   // We wait for token now. Press cancel button at this point.
   JSEvalOrExitBrowser("$('supervised-user-creation').cancel()");
+
+  // TODO(achuith): There should probably be a wait for a specific event.
+  content::RunAllPendingInMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_(
     SupervisedUserTransactionCleanupTest,
     CreateAndCancelSupervisedUser,
     SupervisedUserTransactionCleanupTest2,
     testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) {
   // Make sure there is no supervised user in list.
   ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size());
 }
 
 }  // namespace chromeos