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

chromeos/cryptohome/mock_homedir_methods.h

Index: chromeos/cryptohome/mock_homedir_methods.h
diff --git a/chromeos/cryptohome/mock_homedir_methods.h b/chromeos/cryptohome/mock_homedir_methods.h
index 693d3f46a2fed96db072e42fb24a68219ac8fa50..43ea898e5dcb28097d25817438248ec48f3c12e9 100644
--- a/chromeos/cryptohome/mock_homedir_methods.h
+++ b/chromeos/cryptohome/mock_homedir_methods.h
@@ -16,8 +16,8 @@ namespace cryptohome {
 
 class CHROMEOS_EXPORT MockHomedirMethods : public HomedirMethods {
  public:
-  MockHomedirMethods();
-  virtual ~MockHomedirMethods();
+  MockHomedirMethods() = default;

[achuithb, 2016/12/01 21:02:31]

This doesn't work. I think these need to be in the cc file as before

[Alexander Semashko, 2016/12/01 22:20:14]

Done.

+  ~MockHomedirMethods() override = default;
 
   void SetUp(bool success, MountError return_code);
 
@@ -59,13 +59,24 @@ class CHROMEOS_EXPORT MockHomedirMethods : public HomedirMethods {
                void(const Identification& id,
                     const GetAccountDiskUsageCallback& callback));
 
+  void set_mount_callback(const base::Closure& callback) {
+    on_mount_called_ = callback;
+  }
+  void set_add_key_callback(const base::Closure& callback) {
+    on_add_key_called_ = callback;
+  }
+
  private:
-  bool success_;
-  MountError return_code_;
-
   void DoCallback(const Callback& callback);
   void DoGetDataCallback(const GetKeyDataCallback& callback);
   void DoMountCallback(const MountCallback& callback);
+  void DoAddKeyCallback(const Callback& callback);
+
+  bool success_ = false;
+  MountError return_code_ = MOUNT_ERROR_NONE;
+
+  base::Closure on_mount_called_;
+  base::Closure on_add_key_called_;
 
   DISALLOW_COPY_AND_ASSIGN(MockHomedirMethods);
 };