Revert of Pass task runners to AudioManager constructor.

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 57 matching lines @@
 #include "content/common/mojo/mojo_shell_connection_impl.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/tracing_controller.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "device/battery/battery_status_service.h"
 #include "ipc/mojo/scoped_ipc_support.h"
+#include "media/audio/audio_manager.h"
 #include "media/base/media.h"
 #include "media/base/user_input_monitor.h"
 #include "media/midi/midi_manager.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "net/base/network_change_notifier.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/ssl/ssl_config_service.h"
 #include "skia/ext/event_tracer_impl.h"
 #include "skia/ext/skia_memory_dump_provider.h"
 #include "sql/sql_memory_dump_provider.h"
@@ skipping 1130 matching lines @@
       BrowserGpuMemoryBufferManager::current(), "BrowserGpuMemoryBufferManager",
       io_thread_->task_runner());
 #if defined(OS_ANDROID)
   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
       tracing::GraphicsMemoryDumpProvider::GetInstance(), "AndroidGraphics",
       nullptr);
 #endif
 
   {
     TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan");
-    CreateAudioManager();
+    audio_manager_.reset(media::AudioManager::CreateWithHangTimer(
+        MediaInternals::GetInstance(), io_thread_->task_runner()));
   }
 
   {
     TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager");
     midi_manager_.reset(media::midi::MidiManager::Create());
   }
 
 #if defined(OS_WIN)
   system_message_window_.reset(new media::SystemMessageWindowWin);
 #elif defined(OS_LINUX) && defined(USE_UDEV)
@@ skipping 207 matching lines @@
 void BrowserMainLoop::EndStartupTracing() {
   DCHECK(is_tracing_startup_for_duration_);
 
   is_tracing_startup_for_duration_ = false;
   TracingController::GetInstance()->StopTracing(
       TracingController::CreateFileSink(
           startup_trace_file_,
           base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
 }
 
-void BrowserMainLoop::CreateAudioManager() {
-  DCHECK(!audio_thread_);
-  DCHECK(!audio_manager_);
-  // TODO(alokp): Allow content embedders to override the default
-  // task runners by defining ContentBrowserClient::GetAudioTaskRunner.
-  scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner;
-  scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner;
-  scoped_refptr<base::SingleThreadTaskRunner> monitor_task_runner;
-  audio_thread_.reset(new base::Thread("AudioThread"));
-#if defined(OS_WIN)
-  audio_thread_->init_com_with_mta(true);
-#endif  // defined(OS_WIN)
-  CHECK(audio_thread_->Start());
-#if defined(OS_MACOSX)
-  // On Mac audio task runner must belong to the main thread.
-  // See http://crbug.com/158170.
-  // Since the audio thread is the UI thread, a hang monitor is not
-  // necessary or recommended.
-  audio_task_runner = base::ThreadTaskRunnerHandle::Get();
-  worker_task_runner = audio_thread_->task_runner();
-#else
-  audio_task_runner = audio_thread_->task_runner();
-  worker_task_runner = audio_thread_->task_runner();
-  monitor_task_runner = io_thread_->task_runner();
-#endif  // defined(OS_MACOSX)
-  audio_manager_ = media::AudioManager::Create(
-      std::move(audio_task_runner), std::move(worker_task_runner),
-      std::move(monitor_task_runner), MediaInternals::GetInstance());
-}
-
 }  // namespace content