Remove the AudioManager singleton.

content/test/webrtc_audio_device_test.h

 // Copyright (c) 2011 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 CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_
 #define CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/synchronization/waitable_event.h"
 #include "content/browser/renderer_host/media/mock_media_observer.h"
 #include "content/renderer/mock_content_renderer_client.h"
 #include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/common_types.h"
 
 class AudioInputRendererHost;
+class AudioManager;
 class AudioRendererHost;
 class RenderThreadImpl;
 class WebRTCMockRenderProcess;
 
 namespace base {
 namespace win {
 class ScopedCOMInitializer;
 }
 }
 
@@ skipping 78 matching lines @@
   virtual double GetAudioInputHardwareSampleRate() = 0;
 };
 
 // Implemented and defined in the cc file.
 class ReplaceContentClientRenderer;
 
 class WebRTCAudioDeviceTest
     : public ::testing::Test,
       public IPC::Channel::Listener {
  public:
-  class SetupTask : public base::RefCountedThreadSafe<SetupTask> {
-   public:
-    explicit SetupTask(WebRTCAudioDeviceTest* test) : test_(test) {
-      DCHECK(test);  // Catch this early since we dereference much later.
-    }
-    void InitializeIOThread(const char* thread_name) {
-      test_->InitializeIOThread(thread_name);
-    }
-    void UninitializeIOThread() { test_->UninitializeIOThread(); }
-   protected:
-    WebRTCAudioDeviceTest* test_;
-  };
-
   WebRTCAudioDeviceTest();
   virtual ~WebRTCAudioDeviceTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // Sends an IPC message to the IO thread channel.
   bool Send(IPC::Message* message);
 
   void SetAudioUtilCallback(AudioUtilInterface* callback);
 
  protected:
   void InitializeIOThread(const char* thread_name);
   void UninitializeIOThread();
-  void CreateChannel(const char* name,
-                     content::ResourceContext* resource_context);
+  void CreateChannel(const char* name);
   void DestroyChannel();
 
   void OnGetHardwareSampleRate(double* sample_rate);
   void OnGetHardwareInputSampleRate(double* sample_rate);
 
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Posts a final task to the IO message loop and waits for completion.
   void WaitForIOThreadCompletion();
+  void WaitForAudioManagerCompletion();
+  void WaitForMessageLoopCompletion(MessageLoop* loop);
 
   // Convenience getter for gmock.
   MockMediaObserver& media_observer() const {
     return *media_observer_.get();
   }
 
   std::string GetTestDataPath(const FilePath::StringType& file_name);
 
   scoped_ptr<ReplaceContentClientRenderer> saved_content_renderer_;
   MessageLoopForUI message_loop_;
   content::MockContentRendererClient mock_content_renderer_client_;
   RenderThreadImpl* render_thread_;  // Owned by mock_process_.
   scoped_ptr<WebRTCMockRenderProcess> mock_process_;
-  base::WaitableEvent event_;
   scoped_ptr<MockMediaObserver> media_observer_;
   scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
+  scoped_refptr<AudioManager> audio_manager_;
   scoped_ptr<content::ResourceContext> resource_context_;
   scoped_refptr<net::URLRequestContext> test_request_context_;
   scoped_ptr<IPC::Channel> channel_;
   scoped_refptr<AudioRendererHost> audio_render_host_;
   scoped_refptr<AudioInputRendererHost> audio_input_renderer_host_;
 
   AudioUtilInterface* audio_util_callback_;  // Weak reference.
 
   // Initialized on the main test thread that we mark as the UI thread.
   scoped_ptr<content::TestBrowserThread> ui_thread_;
@@ skipping 12 matching lines @@
   virtual ~WebRTCTransportImpl();
 
   virtual int SendPacket(int channel, const void* data, int len) OVERRIDE;
   virtual int SendRTCPPacket(int channel, const void* data, int len) OVERRIDE;
 
  private:
   webrtc::VoENetwork* network_;
 };
 
 #endif  // CONTENT_TEST_WEBRTC_AUDIO_DEVICE_TEST_H_