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

chromeos/cryptohome/mock_homedir_methods.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 "chromeos/cryptohome/mock_homedir_methods.h"
 
 #include <vector>
 
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/mock_async_method_caller.h"
 
 using ::testing::Invoke;
 using ::testing::WithArgs;
 using ::testing::_;
 
 namespace cryptohome {
 
-MockHomedirMethods::MockHomedirMethods()
-    : success_(false), return_code_(cryptohome::MOUNT_ERROR_NONE) {}
-
-MockHomedirMethods::~MockHomedirMethods() {}
+MockHomedirMethods::MockHomedirMethods() = default;
+MockHomedirMethods::~MockHomedirMethods() = default;
 
 void MockHomedirMethods::SetUp(bool success, MountError return_code) {
   success_ = success;
   return_code_ = return_code;
   ON_CALL(*this, GetKeyDataEx(_, _, _)).WillByDefault(
       WithArgs<2>(Invoke(this, &MockHomedirMethods::DoGetDataCallback)));
   ON_CALL(*this, CheckKeyEx(_, _, _)).WillByDefault(
       WithArgs<2>(Invoke(this, &MockHomedirMethods::DoCallback)));
   ON_CALL(*this, MountEx(_, _, _, _)).WillByDefault(
       WithArgs<3>(Invoke(this, &MockHomedirMethods::DoMountCallback)));
-  ON_CALL(*this, AddKeyEx(_, _, _, _, _)).WillByDefault(
-      WithArgs<4>(Invoke(this, &MockHomedirMethods::DoCallback)));
+  ON_CALL(*this, AddKeyEx(_, _, _, _, _))
+      .WillByDefault(
+          WithArgs<4>(Invoke(this, &MockHomedirMethods::DoAddKeyCallback)));
   ON_CALL(*this, UpdateKeyEx(_, _, _, _, _)).WillByDefault(
       WithArgs<4>(Invoke(this, &MockHomedirMethods::DoCallback)));
   ON_CALL(*this, RemoveKeyEx(_, _, _, _)).WillByDefault(
       WithArgs<3>(Invoke(this, &MockHomedirMethods::DoCallback)));
 }
 
 void MockHomedirMethods::DoCallback(const Callback& callback) {
   callback.Run(success_, return_code_);
 }
 
 void MockHomedirMethods::DoGetDataCallback(const GetKeyDataCallback& callback) {
   callback.Run(success_, return_code_, std::vector<KeyDefinition>());
 }
 
 void MockHomedirMethods::DoMountCallback(const MountCallback& callback) {
   callback.Run(
       success_, return_code_, MockAsyncMethodCaller::kFakeSanitizedUsername);
+  if (!on_mount_called_.is_null())
+    on_mount_called_.Run();
+}
+
+void MockHomedirMethods::DoAddKeyCallback(const Callback& callback) {
+  callback.Run(success_, return_code_);
+  if (!on_add_key_called_.is_null())
+    on_add_key_called_.Run();
 }
 
 }  // namespace cryptohome