Remove remaining calls to deprecated MessageLoop methods on Mac.

media/audio/audio_input_controller_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 "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "media/audio/audio_device_description.h"
 #include "media/audio/audio_input_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::Exactly;
 using ::testing::InvokeWithoutArgs;
 using ::testing::NotNull;
 
 namespace media {
 
 static const int kSampleRate = AudioParameters::kAudioCDSampleRate;
 static const int kBitsPerSample = 16;
 static const ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO;
 static const int kSamplesPerPacket = kSampleRate / 10;
 
-// Posts base::MessageLoop::QuitWhenIdleClosure() on specified message loop.
-ACTION_P(QuitMessageLoop, loop_or_proxy) {
-  loop_or_proxy->PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
+ACTION_P(QuitRunLoop, run_loop) {
+  run_loop->QuitWhenIdle();
 }
 
 // Posts base::MessageLoop::QuitWhenIdleClosure() on specified message loop
 // after a certain number of calls given by |limit|.
 ACTION_P3(CheckCountAndPostQuitTask, count, limit, loop_or_proxy) {
   if (++*count >= limit) {
     loop_or_proxy->PostTask(FROM_HERE,
                             base::MessageLoop::QuitWhenIdleClosure());
   }
 }
@@ skipping 40 matching lines @@
  protected:
   base::MessageLoop message_loop_;
   ScopedAudioManagerPtr audio_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioInputControllerTest);
 };
 
 // Test AudioInputController for create and close without recording audio.
 TEST_F(AudioInputControllerTest, CreateAndClose) {
+  base::RunLoop run_loop;
+
   MockAudioInputControllerEventHandler event_handler;
 
   // OnCreated() will be posted once.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
-      .WillOnce(QuitMessageLoop(&message_loop_));
+      .WillOnce(QuitRunLoop(&run_loop));
 
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
 
   scoped_refptr<AudioInputController> controller = AudioInputController::Create(
       audio_manager_.get(), &event_handler, params,
       AudioDeviceDescription::kDefaultDeviceId, NULL);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to fire.
-  base::RunLoop().Run();
+  run_loop.Run();
 
   // Close the AudioInputController synchronously.
   CloseAudioController(controller.get());
 }
 
 // Test a normal call sequence of create, record and close.
 TEST_F(AudioInputControllerTest, RecordAndClose) {
   MockAudioInputControllerEventHandler event_handler;
   int count = 0;
 
@@ skipping 29 matching lines @@
   // Close the AudioInputController synchronously.
   CloseAudioController(controller.get());
 }
 
 // Test that the AudioInputController reports an error when the input stream
 // stops. This can happen when the underlying audio layer stops feeding data as
 // a result of a removed microphone device.
 // Disabled due to crbug.com/357569 and crbug.com/357501.
 // TODO(henrika): Remove the test when the timer workaround has been removed.
 TEST_F(AudioInputControllerTest, DISABLED_RecordAndError) {
+  base::RunLoop run_loop;
+
   MockAudioInputControllerEventHandler event_handler;
   int count = 0;
 
   // OnCreated() will be called once.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
       .Times(Exactly(1));
 
   // OnRecording() will be called only once.
   EXPECT_CALL(event_handler, OnRecording(NotNull()))
       .Times(Exactly(1));
 
   // OnData() shall be called ten times.
   EXPECT_CALL(event_handler, OnData(NotNull(), NotNull()))
       .Times(AtLeast(10))
       .WillRepeatedly(CheckCountAndPostQuitTask(
           &count, 10, message_loop_.task_runner()));
 
   // OnError() will be called after the data stream stops while the
   // controller is in a recording state.
-  EXPECT_CALL(event_handler, OnError(NotNull(),
-                                     AudioInputController::NO_DATA_ERROR))
+  EXPECT_CALL(event_handler,
+              OnError(NotNull(), AudioInputController::NO_DATA_ERROR))
       .Times(Exactly(1))
-      .WillOnce(QuitMessageLoop(&message_loop_));
+      .WillOnce(QuitRunLoop(&run_loop));
 
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
 
   // Creating the AudioInputController should render an OnCreated() call.
   scoped_refptr<AudioInputController> controller = AudioInputController::Create(
       audio_manager_.get(), &event_handler, params,
       AudioDeviceDescription::kDefaultDeviceId, NULL);
   ASSERT_TRUE(controller.get());
 
   // Start recording and trigger one OnRecording() call.
   controller->Record();
 
   // Record and wait until ten OnData() callbacks are received.
-  base::RunLoop().Run();
+  run_loop.Run();
 
   // Stop the stream and verify that OnError() is posted.
   AudioInputStream* stream = controller->stream_for_testing();
   stream->Stop();
   base::RunLoop().Run();
 
   // Close the AudioInputController synchronously.
   CloseAudioController(controller.get());
 }
 
@@ skipping 41 matching lines @@
   controller->Record();
 
   controller->Close(base::MessageLoop::QuitWhenIdleClosure());
   base::RunLoop().Run();
 
   controller->Close(base::MessageLoop::QuitWhenIdleClosure());
   base::RunLoop().Run();
 }
 
 }  // namespace media