Reland: Pass task runners to AudioManager constructor.

content/browser/browser_main_loop.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 CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 
 #include <memory>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "content/browser/browser_process_sub_thread.h"
 #include "content/public/browser/browser_main_runner.h"
+#include "media/audio/audio_manager.h"
 
 #if defined(USE_AURA)
 namespace aura {
 class Env;
 }
 #endif
 
 namespace base {
 class CommandLine;
 class FilePath;
 class HighResolutionTimerManager;
 class MessageLoop;
 class PowerMonitor;
 class SystemMonitor;
 class MemoryPressureMonitor;
 namespace trace_event {
 class TraceEventSystemStatsMonitor;
 }  // namespace trace_event
 }  // namespace base
 
 namespace IPC {
 class ScopedIPCSupport;
 }
 
 namespace media {
-class AudioManager;
 #if defined(OS_WIN)
 class SystemMessageWindowWin;
 #elif defined(OS_LINUX) && defined(USE_UDEV)
 class DeviceMonitorLinux;
 #endif
 class UserInputMonitor;
 #if defined(OS_MACOSX)
 class DeviceMonitorMac;
 #endif
 namespace midi {
@@ skipping 109 matching lines @@
 
   int PreMainMessageLoopRun();
 
   void MainMessageLoopRun();
 
   base::FilePath GetStartupTraceFileName(
       const base::CommandLine& command_line) const;
   void InitStartupTracingForDuration(const base::CommandLine& command_line);
   void EndStartupTracing();
 
+  void CreateAudioManager();
   bool UsingInProcessGpu() const;
 
   // Quick reference for initialization order:
   // Constructor
   // Init()
   // EarlyInitialization()
   // InitializeToolkit()
   // PreMainMessageLoopStart()
   // MainMessageLoopStart()
   //   InitializeMainThread()
@@ skipping 71 matching lines @@
   std::unique_ptr<BrowserProcessSubThread> cache_thread_;
   std::unique_ptr<BrowserProcessSubThread> io_thread_;
 
   // Members initialized in |BrowserThreadsStarted()| --------------------------
   std::unique_ptr<base::Thread> indexed_db_thread_;
   std::unique_ptr<MojoShellContext> mojo_shell_context_;
   std::unique_ptr<IPC::ScopedIPCSupport> mojo_ipc_support_;
 
   // |user_input_monitor_| has to outlive |audio_manager_|, so declared first.
   std::unique_ptr<media::UserInputMonitor> user_input_monitor_;
-  std::unique_ptr<media::AudioManager> audio_manager_;
+  // AudioThread needs to outlive |audio_manager_|.
+  std::unique_ptr<base::Thread> audio_thread_;
+  media::ScopedAudioManagerPtr audio_manager_;
 
   std::unique_ptr<media::midi::MidiManager> midi_manager_;
 
 #if defined(OS_WIN)
   std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
 #elif defined(OS_LINUX) && defined(USE_UDEV)
   std::unique_ptr<media::DeviceMonitorLinux> device_monitor_linux_;
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   std::unique_ptr<media::DeviceMonitorMac> device_monitor_mac_;
 #endif
 #if defined(USE_OZONE)
   std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
 #endif
 
   std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
   std::unique_ptr<MediaStreamManager> media_stream_manager_;
   std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
   std::unique_ptr<TimeZoneMonitor> time_zone_monitor_;
 
   // DO NOT add members here. Add them to the right categories above.
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_