Remove remaining calls to deprecated MessageLoop methods on Mac.

remoting/client/client_status_logger_unittest.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 "remoting/client/client_status_logger.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "remoting/protocol/performance_tracker.h"
 #include "remoting/signaling/mock_signal_strategy.h"
 #include "remoting/signaling/server_log_entry_unittest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 using buzz::XmlElement;
 using buzz::QName;
 using remoting::protocol::ConnectionToHost;
 using testing::_;
 using testing::DeleteArg;
 using testing::InSequence;
 using testing::Return;
 
 namespace remoting {
 
 namespace {
 
-ACTION_P(QuitMainMessageLoop, message_loop) {
-  message_loop->PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
+ACTION_P(QuitRunLoop, run_loop) {
+  run_loop->QuitWhenIdle();
 }
 
 const char kTestBotJid[] = "remotingunittest@bot.talk.google.com";
 const char kClientJid[] = "host@domain.com/1234";
 
 MATCHER_P2(IsStateChange, new_state, error, "") {
   XmlElement* entry = GetSingleLogEntryFromStanza(arg);
   if (!entry) {
     return false;
   }
@@ skipping 34 matching lines @@
                                kTestBotJid));
   }
 
  protected:
   base::MessageLoop message_loop_;
   MockSignalStrategy signal_strategy_;
   std::unique_ptr<ClientStatusLogger> client_status_logger_;
 };
 
 TEST_F(ClientStatusLoggerTest, LogStateChange) {
+  base::RunLoop run_loop;
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
         .WillRepeatedly(Return(kClientJid));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(
         IsStateChange("connected", std::string())))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
-        .WillOnce(QuitMainMessageLoop(&message_loop_))
+        .WillOnce(QuitRunLoop(&run_loop))
         .RetiresOnSaturation();
   }
   client_status_logger_->LogSessionStateChange(ConnectionToHost::CONNECTED,
                                                protocol::OK);
 
   // Setting the state to CONNECTED causes the log to be sent. Setting the
   // state to DISCONNECTED causes |signal_strategy_| to be cleaned up,
   // which removes the listener and terminates the test.
   client_status_logger_->SetSignalingStateForTest(SignalStrategy::CONNECTED);
   client_status_logger_->SetSignalingStateForTest(SignalStrategy::DISCONNECTED);
-  base::RunLoop().Run();
+  run_loop.Run();
 }
 
 TEST_F(ClientStatusLoggerTest, LogStateChangeError) {
+  base::RunLoop run_loop;
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
         .WillRepeatedly(Return(kClientJid));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(
         IsStateChange("connection-failed", "host-is-offline")))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
-        .WillOnce(QuitMainMessageLoop(&message_loop_))
+        .WillOnce(QuitRunLoop(&run_loop))
         .RetiresOnSaturation();
   }
   client_status_logger_->LogSessionStateChange(ConnectionToHost::FAILED,
                                                protocol::PEER_IS_OFFLINE);
 
   client_status_logger_->SetSignalingStateForTest(SignalStrategy::CONNECTED);
   client_status_logger_->SetSignalingStateForTest(SignalStrategy::DISCONNECTED);
-  base::RunLoop().Run();
+  run_loop.Run();
 }
 
 TEST_F(ClientStatusLoggerTest, LogStatistics) {
+  base::RunLoop run_loop;
   {
     InSequence s;
     EXPECT_CALL(signal_strategy_, GetLocalJid())
         .WillRepeatedly(Return(kClientJid));
     EXPECT_CALL(signal_strategy_, AddListener(_));
     EXPECT_CALL(signal_strategy_, GetNextId());
     EXPECT_CALL(signal_strategy_, SendStanzaPtr(
         IsStatisticsLog()))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
     EXPECT_CALL(signal_strategy_, RemoveListener(_))
-        .WillOnce(QuitMainMessageLoop(&message_loop_))
+        .WillOnce(QuitRunLoop(&run_loop))
         .RetiresOnSaturation();
   }
 
   protocol::PerformanceTracker perf_tracker;
   client_status_logger_->LogStatistics(&perf_tracker);
 
   client_status_logger_->SetSignalingStateForTest(SignalStrategy::CONNECTED);
   client_status_logger_->SetSignalingStateForTest(SignalStrategy::DISCONNECTED);
-  base::RunLoop().Run();
+  run_loop.Run();
 }
 
 }  // namespace remoting