Use the browser UI thread for audio on OSX.

media/audio/audio_output_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/basictypes.h"
 #include "base/bind.h"
-#include "base/environment.h"
 #include "base/logging.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop.h"
+#include "base/message_loop_proxy.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/audio/audio_output_controller.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/audio_bus.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::DoAll;
@@ skipping 193 matching lines @@
           .WillOnce(SignalEvent(&play_event_));
     }
 
     EXPECT_CALL(mock_stream_, Close());
 
     controller_->StopDiverting();
   }
 
   void Close() {
     EXPECT_CALL(mock_sync_reader_, Close());
+    base::WaitableEvent close_event(true, false);
+    base::Closure closed_cb = base::Bind(
+        &base::WaitableEvent::Signal, base::Unretained(&close_event));
 
-    controller_->Close(base::MessageLoop::QuitClosure());
-    base::MessageLoop::current()->Run();
+    audio_manager_->GetMessageLoop()->PostTask(
+        FROM_HERE,
+        base::Bind(&AudioOutputController::Close, controller_, closed_cb));
+    close_event.Wait();
   }
 
   // These help make test sequences more readable.
   void DivertNeverPlaying() { Divert(false, 0); }
   void DivertWillEventuallyBeTwicePlayed() { Divert(false, 2); }
   void DivertWhilePlaying() { Divert(true, 1); }
   void RevertWasNotPlaying() { Revert(false); }
   void RevertWhilePlaying() { Revert(true); }
 
   // These synchronize the main thread with key events taking place on other
   // threads.
   void WaitForCreate() { create_event_.Wait(); }
   void WaitForPlay() { play_event_.Wait(); }
   void WaitForReads() {
     // Note: Arbitrarily chosen, but more iterations causes tests to take
     // significantly more time.
     static const int kNumIterations = 3;
     for (int i = 0; i < kNumIterations; ++i) {
       read_event_.Wait();
     }
   }
   void WaitForPause() { pause_event_.Wait(); }
 
  private:
-  base::MessageLoopForIO message_loop_;
   scoped_ptr<AudioManager> audio_manager_;
   MockAudioOutputControllerEventHandler mock_event_handler_;
   MockAudioOutputControllerSyncReader mock_sync_reader_;
   MockAudioOutputStream mock_stream_;
   base::WaitableEvent create_event_;
   base::WaitableEvent play_event_;
   base::WaitableEvent read_event_;
   base::WaitableEvent pause_event_;
   AudioParameters params_;
   scoped_refptr<AudioOutputController> controller_;
@@ skipping 111 matching lines @@
 
 TEST_F(AudioOutputControllerTest, DivertRevertClose) {
   Create(kSamplesPerPacket);
   WaitForCreate();
   DivertNeverPlaying();
   RevertWasNotPlaying();
   Close();
 }
 
 }  // namespace media