Remove calls to MessageLoop::Run/RunUntilIdle.

chrome/utility/importer/firefox_importer_unittest_utils_mac.cc

Index: chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
diff --git a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
index e29f37b0142b156a47e9db20507f79f5bf7a9908..e938d9d7089a1c2d647e3b080c1fbb404ec0db0f 100644
--- a/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
+++ b/chrome/utility/importer/firefox_importer_unittest_utils_mac.cc
@@ -179,48 +179,26 @@ FFUnitTestDecryptorProxy::~FFUnitTestDecryptorProxy() {
   }
 }
 
-// A message_loop task that quits the message loop when invoked, setting cancel
-// causes the task to do nothing when invoked.
-class CancellableQuitMsgLoop : public base::RefCounted<CancellableQuitMsgLoop> {
- public:
-  CancellableQuitMsgLoop() : cancelled_(false) {}
-  void QuitNow() {
-    if (!cancelled_)
-      base::MessageLoop::current()->QuitWhenIdle();
-  }
-  bool cancelled_;
-
- private:
-  friend class base::RefCounted<CancellableQuitMsgLoop>;
-  ~CancellableQuitMsgLoop() {}
-};
-
 // Spin until either a client response arrives or a timeout occurs.
 bool FFUnitTestDecryptorProxy::WaitForClientResponse() {
   // What we're trying to do here is to wait for an RPC message to go over the
   // wire and the client to reply.  If the client does not reply by a given
   // timeout we kill the message loop.
-  // The way we do this is to post a CancellableQuitMsgLoop for 3 seconds in
-  // the future and cancel it if an RPC message comes back earlier.
   // This relies on the IPC listener class to quit the message loop itself when
   // a message comes in.
-  scoped_refptr<CancellableQuitMsgLoop> quit_task(
-      new CancellableQuitMsgLoop());
+  base::RunLoop run_loop;
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, base::Bind(&CancellableQuitMsgLoop::QuitNow, quit_task.get()),
+      FROM_HERE, run_loop.QuitWhenIdleClosure(),
       TestTimeouts::action_max_timeout());
-
-  message_loop_->Run();
-  bool ret = !quit_task->cancelled_;
-  quit_task->cancelled_ = false;
-  return ret;
+  run_loop.Run();
+  return true;

[jochen (gone - plz use gerrit), 2016/09/26 15:11:32]

just make the method void()

[fdoray, 2016/09/26 17:26:00]

Done.

 }
 
 bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path,
                                              const base::FilePath& db_path) {
   channel_->Send(new Msg_Decryptor_Init(dll_path, db_path));
-  bool ok = WaitForClientResponse();
-  if (ok && listener_->got_result) {
+  WaitForClientResponse();
+  if (listener_->got_result) {
     listener_->got_result = false;
     return listener_->result_bool;
   }
@@ -229,8 +207,8 @@ bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path,
 
 base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
   channel_->Send(new Msg_Decrypt(crypt));
-  bool ok = WaitForClientResponse();
-  if (ok && listener_->got_result) {
+  WaitForClientResponse();
+  if (listener_->got_result) {
     listener_->got_result = false;
     return listener_->result_string;
   }
@@ -240,8 +218,8 @@ base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
 std::vector<autofill::PasswordForm> FFUnitTestDecryptorProxy::ParseSignons(
     const base::FilePath& signons_path) {
   channel_->Send(new Msg_ParseSignons(signons_path));
-  bool ok = WaitForClientResponse();
-  if (ok && listener_->got_result) {
+  WaitForClientResponse();
+  if (listener_->got_result) {
     listener_->got_result = false;
     return listener_->result_vector;
   }