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

chromeos/cryptohome/mock_homedir_methods.h

 // 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.
 
 #ifndef CHROMEOS_CRYPTOHOME_MOCK_HOMEDIR_METHODS_H_
 #define CHROMEOS_CRYPTOHOME_MOCK_HOMEDIR_METHODS_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 41 matching lines @@
                     const std::string& signature,
                     const Callback& callback));
   MOCK_METHOD3(RenameCryptohome,
                void(const Identification& id_from,
                     const Identification& id_to,
                     const Callback& callback));
   MOCK_METHOD2(GetAccountDiskUsage,
                void(const Identification& id,
                     const GetAccountDiskUsageCallback& callback));
 
+  void set_mount_callback(base::Closure callback) {

[achuithb, 2016/11/30 22:39:52]

pass by const reference? Will save an unnecessary copy

[Alexander Semashko, 2016/12/01 12:24:59]

Done.

+    on_mount_called_ = callback;
+  }
+  void set_add_key_callback(base::Closure callback) {

[achuithb, 2016/11/30 22:39:52]

ditto

[Alexander Semashko, 2016/12/01 12:24:59]

Done.

+    on_add_key_called_ = callback;
+  }
+
  private:
+  void DoCallback(const Callback& callback);
+  void DoGetDataCallback(const GetKeyDataCallback& callback);
+  void DoMountCallback(const MountCallback& callback);
+  void DoAddKeyCallback(const Callback& callback);
+
   bool success_;
   MountError return_code_;
 
-  void DoCallback(const Callback& callback);
-  void DoGetDataCallback(const GetKeyDataCallback& callback);
-  void DoMountCallback(const MountCallback& callback);
+  base::Closure on_mount_called_;
+  base::Closure on_add_key_called_;
 
   DISALLOW_COPY_AND_ASSIGN(MockHomedirMethods);
 };
 
 }  // namespace cryptohome
 
 #endif  // CHROMEOS_CRYPTOHOME_MOCK_HOMEDIR_METHODS_H_