Cleanup AudioDeviceThread to avoid accidental misuse.

content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc

 // Copyright 2016 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.
 
 // Unit tests for AudioOutputAuthorizationHandler.
 
 #include "content/browser/renderer_host/media/audio_output_authorization_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
-#include "content/browser/audio_device_thread.h"
+#include "content/browser/audio_manager_thread.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "media/audio/audio_device_description.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/fake_audio_manager.h"
 #include "media/base/media_switches.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 41 matching lines @@
 
 class AudioOutputAuthorizationHandlerTest : public testing::Test {
  public:
   AudioOutputAuthorizationHandlerTest() {
     // Not threadsafe, thus set before threads are started:
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFakeDeviceForMediaStream);
 
     thread_bundle_ = base::MakeUnique<TestBrowserThreadBundle>(
         TestBrowserThreadBundle::Options::REAL_IO_THREAD);
-    audio_thread_ = base::MakeUnique<AudioDeviceThread>();
+    audio_thread_ = base::MakeUnique<AudioManagerThread>();
     audio_manager_.reset(new media::FakeAudioManager(
-        audio_thread_->GetTaskRunner(), audio_thread_->worker_task_runner(),
+        audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
         &log_factory_));
     media_stream_manager_ =
         base::MakeUnique<MediaStreamManager>(audio_manager_.get());
     // Make sure everything is done initializing:
     SyncWithAllThreads();
   }
 
   ~AudioOutputAuthorizationHandlerTest() override { SyncWithAllThreads(); }
 
  protected:
@@ skipping 52 matching lines @@
               *out = result[MediaDeviceType::MEDIA_DEVICE_TYPE_AUDIO_OUTPUT][1]
                          .device_id;
             },
             base::Unretained(out)));
   }
 
   // media_stream_manager must die after threads since it's a
   // DestructionObserver.
   std::unique_ptr<MediaStreamManager> media_stream_manager_;
   std::unique_ptr<TestBrowserThreadBundle> thread_bundle_;
-  std::unique_ptr<AudioDeviceThread> audio_thread_;
+  std::unique_ptr<AudioManagerThread> audio_thread_;
   media::FakeAudioLogFactory log_factory_;
   media::ScopedAudioManagerPtr audio_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputAuthorizationHandlerTest);
 };
 
 TEST_F(AudioOutputAuthorizationHandlerTest, AuthorizeDefaultDevice_Ok) {
   MockListener listener;
   EXPECT_CALL(listener,
               MockAuthorizationCallback(media::OUTPUT_DEVICE_STATUS_OK, false,
@@ skipping 180 matching lines @@
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, kSessionId,
                   std::string(), BadSecurityOrigin(), listener.GetCallback())));
 
   SyncWithAllThreads();
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
 }
 
 }  // namespace content