Remove remaining calls to deprecated MessageLoop methods.

remoting/protocol/channel_multiplexer_unittest.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 "remoting/protocol/channel_multiplexer.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 81 matching lines @@
                      std::unique_ptr<P2PStreamSocket>* host_socket,
                      std::unique_ptr<P2PStreamSocket>* client_socket) {
     int counter = 2;
     host_mux_->CreateChannel(name, base::Bind(
         &ChannelMultiplexerTest::OnChannelConnected, base::Unretained(this),
         host_socket, &counter));
     client_mux_->CreateChannel(name, base::Bind(
         &ChannelMultiplexerTest::OnChannelConnected, base::Unretained(this),
         client_socket, &counter));
 
-    message_loop_.Run();
+    base::RunLoop().Run();
 
     EXPECT_TRUE(host_socket->get());
     EXPECT_TRUE(client_socket->get());
   }
 
   void OnChannelConnected(std::unique_ptr<P2PStreamSocket>* storage,
                           int* counter,
                           std::unique_ptr<P2PStreamSocket> socket) {
     *storage = std::move(socket);
     --(*counter);
     EXPECT_GE(*counter, 0);
     if (*counter == 0)
       QuitCurrentThread();
   }
 
   scoped_refptr<net::IOBufferWithSize> CreateTestBuffer(int size) {
     scoped_refptr<net::IOBufferWithSize> result =
         new net::IOBufferWithSize(size);
     for (int i = 0; i< size; ++i) {
       result->data()[i] = rand() % 256;
     }
     return result;
   }
 
+ private:
+  // Must be instantiated before the FakeStreamChannelFactories below.
   base::MessageLoop message_loop_;
 
+ protected:
   FakeStreamChannelFactory host_channel_factory_;
   FakeStreamChannelFactory client_channel_factory_;
 
   std::unique_ptr<ChannelMultiplexer> host_mux_;
   std::unique_ptr<ChannelMultiplexer> client_mux_;
 
   std::unique_ptr<P2PStreamSocket> host_socket1_;
   std::unique_ptr<P2PStreamSocket> client_socket1_;
   std::unique_ptr<P2PStreamSocket> host_socket2_;
   std::unique_ptr<P2PStreamSocket> client_socket2_;
 };
 
 
 TEST_F(ChannelMultiplexerTest, OneChannel) {
   std::unique_ptr<P2PStreamSocket> host_socket;
   std::unique_ptr<P2PStreamSocket> client_socket;
   ASSERT_NO_FATAL_FAILURE(
       CreateChannel(kTestChannelName, &host_socket, &client_socket));
 
   StreamConnectionTester tester(host_socket.get(), client_socket.get(),
                                 kMessageSize, kMessages);
   tester.Start();
-  message_loop_.Run();
+  base::RunLoop().Run();
   tester.CheckResults();
 }
 
 TEST_F(ChannelMultiplexerTest, TwoChannels) {
   std::unique_ptr<P2PStreamSocket> host_socket1_;
   std::unique_ptr<P2PStreamSocket> client_socket1_;
   ASSERT_NO_FATAL_FAILURE(
       CreateChannel(kTestChannelName, &host_socket1_, &client_socket1_));
 
   std::unique_ptr<P2PStreamSocket> host_socket2_;
   std::unique_ptr<P2PStreamSocket> client_socket2_;
   ASSERT_NO_FATAL_FAILURE(
       CreateChannel(kTestChannelName2, &host_socket2_, &client_socket2_));
 
   StreamConnectionTester tester1(host_socket1_.get(), client_socket1_.get(),
                                 kMessageSize, kMessages);
   StreamConnectionTester tester2(host_socket2_.get(), client_socket2_.get(),
                                  kMessageSize, kMessages);
   tester1.Start();
   tester2.Start();
   while (!tester1.done() || !tester2.done()) {
-    message_loop_.Run();
+    base::RunLoop().Run();
   }
   tester1.CheckResults();
   tester2.CheckResults();
 }
 
 // Four channels, two in each direction
 TEST_F(ChannelMultiplexerTest, FourChannels) {
   std::unique_ptr<P2PStreamSocket> host_socket1_;
   std::unique_ptr<P2PStreamSocket> client_socket1_;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 21 matching lines @@
   StreamConnectionTester tester3(client_socket3.get(), host_socket3.get(),
                                  kMessageSize, kMessages);
   StreamConnectionTester tester4(client_socket4.get(), host_socket4.get(),
                                  kMessageSize, kMessages);
   tester1.Start();
   tester2.Start();
   tester3.Start();
   tester4.Start();
   while (!tester1.done() || !tester2.done() ||
          !tester3.done() || !tester4.done()) {
-    message_loop_.Run();
+    base::RunLoop().Run();
   }
   tester1.CheckResults();
   tester2.CheckResults();
   tester3.CheckResults();
   tester4.CheckResults();
 }
 
 TEST_F(ChannelMultiplexerTest, WriteFailSync) {
   std::unique_ptr<P2PStreamSocket> host_socket1_;
   std::unique_ptr<P2PStreamSocket> client_socket1_;
@@ skipping 121 matching lines @@
       .WillOnce(InvokeWithoutArgs(
           this, &ChannelMultiplexerTest::DeleteAfterSessionFail));
   EXPECT_CALL(cb2, OnConnectedPtr(_))
       .Times(0);
 
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace protocol
 }  // namespace remoting