Don't use base::MessageLoop::{Quit,QuitClosure} in chrome/

chrome/utility/importer/firefox_importer_unittest_utils_mac.cc

 // Copyright (c) 2012 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 "chrome/utility/importer/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 60 matching lines @@
       : got_result(false), sender_(NULL) {}
 
   void SetSender(IPC::Sender* sender) {
     sender_ = sender;
   }
 
   void OnInitDecryptorResponse(bool result) {
     DCHECK(!got_result);
     result_bool = result;
     got_result = true;
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void OnDecryptedTextResponse(const base::string16& decrypted_text) {
     DCHECK(!got_result);
     result_string = decrypted_text;
     got_result = true;
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void OnParseSignonsResponse(
       const std::vector<autofill::PasswordForm>& parsed_vector) {
     DCHECK(!got_result);
     result_vector = parsed_vector;
     got_result = true;
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void QuitClient() {
     if (sender_)
       sender_->Send(new Msg_Decryptor_Quit());
   }
 
   bool OnMessageReceived(const IPC::Message& msg) override {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FFDecryptorServerChannelListener, msg)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_InitReturnCode, OnInitDecryptorResponse)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_Response, OnDecryptedTextResponse)
       IPC_MESSAGE_HANDLER(Msg_ParseSignons_Response, OnParseSignonsResponse)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
     return handled;
   }
 
   // If an error occured, just kill the message Loop.
   void OnChannelError() override {
     got_result = false;
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
   // Results of IPC calls.
   base::string16 result_string;
   std::vector<autofill::PasswordForm> result_vector;
   bool result_bool;
   // True if IPC call succeeded and data in above variables is valid.
   bool got_result;
 
  private:
@@ skipping 28 matching lines @@
   }
 }
 
 // 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()->Quit();
+      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() {
@@ skipping 71 matching lines @@
     base::string16 unencrypted_str = decryptor_.Decrypt(crypt);
     sender_->Send(new Msg_Decryptor_Response(unencrypted_str));
   }
 
   void OnParseSignons(base::FilePath signons_path) {
     std::vector<autofill::PasswordForm> forms;
     decryptor_.ReadAndParseSignons(signons_path, &forms);
     sender_->Send(new Msg_ParseSignons_Response(forms));
   }
 
-  void OnQuitRequest() {
-    base::MessageLoop::current()->Quit();
-  }
+  void OnQuitRequest() { base::MessageLoop::current()->QuitWhenIdle(); }
 
   bool OnMessageReceived(const IPC::Message& msg) override {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FFDecryptorClientChannelListener, msg)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_Init, OnDecryptor_Init)
       IPC_MESSAGE_HANDLER(Msg_Decrypt, OnDecrypt)
       IPC_MESSAGE_HANDLER(Msg_ParseSignons, OnParseSignons)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_Quit, OnQuitRequest)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
     return handled;
   }
 
-  void OnChannelError() override { base::MessageLoop::current()->Quit(); }
+  void OnChannelError() override {
+    base::MessageLoop::current()->QuitWhenIdle();
+  }
 
  private:
   NSSDecryptor decryptor_;
   IPC::Sender* sender_;
 };
 
 // Entry function in child process.
 MULTIPROCESS_IPC_TEST_MAIN(NSSDecrypterChildProcess) {
   base::MessageLoopForIO main_message_loop;
   FFDecryptorClientChannelListener listener;
 
   scoped_ptr<IPC::Channel> channel = IPC::Channel::CreateClient(
       kTestChannelID, &listener);
   CHECK(channel->Connect());
   listener.SetSender(channel.get());
 
   // run message loop
   base::MessageLoop::current()->Run();
 
   return 0;
 }