Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/.

media/audio/mock_audio_manager.h

 // 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.
 
 #ifndef MEDIA_AUDIO_MOCK_AUDIO_MANAGER_H_
 #define MEDIA_AUDIO_MOCK_AUDIO_MANAGER_H_
 
 #include "media/audio/audio_manager.h"
 
 namespace media {
 
 // This class is a simple mock around AudioManager, used exclusively for tests,
 // which has the following purposes:
 // 1) Avoids to use the actual (system and platform dependent) AudioManager.
 //    Some bots does not have input devices, thus using the actual AudioManager
 //    would causing failures on classes which expect that.
 // 2) Allows the mock audio events to be dispatched on an arbitrary thread,
 //    rather than forcing them on the audio thread, easing their handling in
 //    browser tests (Note: sharing a thread can cause deadlocks on production
 //    classes if WaitableEvents or any other form of lock is used for
 //    synchronization purposes).
 class MockAudioManager : public media::AudioManager {
  public:
-  explicit MockAudioManager(base::MessageLoopProxy* message_loop_proxy);
+  explicit MockAudioManager(
+      const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 
   virtual bool HasAudioOutputDevices() OVERRIDE;
 
   virtual bool HasAudioInputDevices() OVERRIDE;
 
   virtual string16 GetAudioInputDeviceModel() OVERRIDE;
 
   virtual void ShowAudioInputSettings() OVERRIDE;
 
   virtual void GetAudioInputDeviceNames(
       media::AudioDeviceNames* device_names) OVERRIDE;
 
   virtual void GetAudioOutputDeviceNames(
       media::AudioDeviceNames* device_names) OVERRIDE;
 
   virtual media::AudioOutputStream* MakeAudioOutputStream(
       const media::AudioParameters& params,
       const std::string& device_id,
       const std::string& input_device_id) OVERRIDE;
 
   virtual media::AudioOutputStream* MakeAudioOutputStreamProxy(
       const media::AudioParameters& params,
       const std::string& device_id,
       const std::string& input_device_id) OVERRIDE;
 
   virtual media::AudioInputStream* MakeAudioInputStream(
       const media::AudioParameters& params,
       const std::string& device_id) OVERRIDE;
 
-  virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
-  virtual scoped_refptr<base::MessageLoopProxy> GetWorkerLoop() OVERRIDE;
+  virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE;
+  virtual scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner()
+      OVERRIDE;
 
   virtual void AddOutputDeviceChangeListener(
       AudioDeviceListener* listener) OVERRIDE;
   virtual void RemoveOutputDeviceChangeListener(
       AudioDeviceListener* listener) OVERRIDE;
 
   virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE;
   virtual AudioParameters GetOutputStreamParameters(
       const std::string& device_id) OVERRIDE;
   virtual AudioParameters GetInputStreamParameters(
       const std::string& device_id) OVERRIDE;
   virtual std::string GetAssociatedOutputDeviceID(
       const std::string& input_device_id) OVERRIDE;
 
  protected:
   virtual ~MockAudioManager();
 
-  scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAudioManager);
 };
 
 }  // namespace media.
 
 #endif  // MEDIA_AUDIO_MOCK_AUDIO_MANAGER_H_