Revert of Switching AudioOutputAuthorizationHandler from using AudioManager interface to AudioSystem one.

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/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/mock_callback.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/audio_system_impl.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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 using ::testing::_;
 
@@ skipping 28 matching lines @@
     // 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<AudioManagerThread>();
     audio_manager_.reset(new media::FakeAudioManager(
         audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
         &log_factory_));
-    audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
     media_stream_manager_ =
         base::MakeUnique<MediaStreamManager>(audio_manager_.get());
     // Make sure everything is done initializing:
     SyncWithAllThreads();
   }
 
   ~AudioOutputAuthorizationHandlerTest() override { SyncWithAllThreads(); }
 
  protected:
   MediaStreamManager* GetMediaStreamManager() {
     return media_stream_manager_.get();
   }
 
-  media::AudioSystem* GetAudioSystem() { return audio_system_.get(); }
+  media::AudioManager* GetAudioManager() { return audio_manager_.get(); }
 
   void SyncWithAllThreads() {
     // New tasks might be posted while we are syncing, but in
     // every iteration at least one task will be run. 20 iterations should be
     // enough for our code.
     for (int i = 0; i < 20; ++i) {
       base::RunLoop().RunUntilIdle();
       SyncWith(BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
       SyncWith(audio_manager_->GetWorkerTaskRunner());
     }
@@ skipping 40 matching lines @@
             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<AudioManagerThread> audio_thread_;
   media::FakeAudioLogFactory log_factory_;
   media::ScopedAudioManagerPtr audio_manager_;
-  std::unique_ptr<media::AudioSystem> audio_system_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputAuthorizationHandlerTest);
 };
 
 TEST_F(AudioOutputAuthorizationHandlerTest, AuthorizeDefaultDevice_Ok) {
   MockAuthorizationCallback listener;
   EXPECT_CALL(listener,
               Run(media::OUTPUT_DEVICE_STATUS_OK, false, _, kDefaultDeviceId))
       .Times(1);
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), kRenderProcessId, kSalt);
+          GetAudioManager(), GetMediaStreamManager(), kRenderProcessId, kSalt);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, 0,
                   kDefaultDeviceId, SecurityOrigin(), listener.Get())));
 
   SyncWithAllThreads();
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
 }
 
 TEST_F(AudioOutputAuthorizationHandlerTest,
        AuthorizeDefaultDeviceByEmptyId_Ok) {
   MockAuthorizationCallback listener;
   EXPECT_CALL(listener,
               Run(media::OUTPUT_DEVICE_STATUS_OK, false, _, kDefaultDeviceId))
       .Times(1);
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), kRenderProcessId, kSalt);
+          GetAudioManager(), GetMediaStreamManager(), kRenderProcessId, kSalt);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, 0,
                   kEmptyDeviceId, SecurityOrigin(), listener.Get())));
 
   SyncWithAllThreads();
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
 }
 
 TEST_F(AudioOutputAuthorizationHandlerTest,
        AuthorizeNondefaultDeviceIdWithoutPermission_NotAuthorized) {
   std::string raw_nondefault_id = GetRawNondefaultId();
   std::string hashed_id = MediaStreamManager::GetHMACForMediaDeviceID(
       kSalt, SecurityOrigin(), raw_nondefault_id);
 
   MockAuthorizationCallback listener;
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), kRenderProcessId, kSalt);
+          GetAudioManager(), GetMediaStreamManager(), kRenderProcessId, kSalt);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &AudioOutputAuthorizationHandler::OverridePermissionsForTesting,
           base::Unretained(handler.get()), false));
   SyncWithAllThreads();
 
   EXPECT_CALL(listener, Run(media::OUTPUT_DEVICE_STATUS_ERROR_NOT_AUTHORIZED,
                             false, _, std::string()))
       .Times(1);
@@ skipping 10 matching lines @@
 }
 
 TEST_F(AudioOutputAuthorizationHandlerTest,
        AuthorizeNondefaultDeviceIdWithPermission_Ok) {
   std::string raw_nondefault_id = GetRawNondefaultId();
   std::string hashed_id = MediaStreamManager::GetHMACForMediaDeviceID(
       kSalt, SecurityOrigin(), raw_nondefault_id);
   MockAuthorizationCallback listener;
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), kRenderProcessId, kSalt);
+          GetAudioManager(), GetMediaStreamManager(), kRenderProcessId, kSalt);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &AudioOutputAuthorizationHandler::OverridePermissionsForTesting,
           base::Unretained(handler.get()), true));
 
   EXPECT_CALL(listener,
               Run(media::OUTPUT_DEVICE_STATUS_OK, false, _, raw_nondefault_id))
       .Times(1);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, 0, hashed_id,
                   SecurityOrigin(), listener.Get())));
 
   SyncWithAllThreads();
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
 }
 
 TEST_F(AudioOutputAuthorizationHandlerTest, AuthorizeInvalidDeviceId_NotFound) {
   std::unique_ptr<TestBrowserContext> context =
       base::MakeUnique<TestBrowserContext>();
   std::unique_ptr<MockRenderProcessHost> RPH =
       base::MakeUnique<MockRenderProcessHost>(context.get());
   MockAuthorizationCallback listener;
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), RPH->GetID(), kSalt);
+          GetAudioManager(), GetMediaStreamManager(), RPH->GetID(), kSalt);
   EXPECT_EQ(RPH->bad_msg_count(), 0);
 
   EXPECT_CALL(listener,
               Run(media::OUTPUT_DEVICE_STATUS_ERROR_NOT_FOUND, _, _, _))
       .Times(1);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, 0,
@@ skipping 14 matching lines @@
   std::string raw_nondefault_id = GetRawNondefaultId();
   std::string hashed_id = MediaStreamManager::GetHMACForMediaDeviceID(
       kSalt, SecurityOrigin(), raw_nondefault_id);
   std::unique_ptr<TestBrowserContext> context =
       base::MakeUnique<TestBrowserContext>();
   std::unique_ptr<MockRenderProcessHost> RPH =
       base::MakeUnique<MockRenderProcessHost>(context.get());
   MockAuthorizationCallback listener;
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), RPH->GetID(), kSalt);
+          GetAudioManager(), GetMediaStreamManager(), RPH->GetID(), kSalt);
 
   EXPECT_EQ(RPH->bad_msg_count(), 0);
   EXPECT_CALL(listener, Run(_, _, _, _)).Times(0);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, 0, hashed_id,
                   BadSecurityOrigin(), listener.Get())));
 
   SyncWithAllThreads();
   EXPECT_EQ(RPH->bad_msg_count(), 1);
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
   RPH.reset();
   context.reset();
 }
 
 TEST_F(AudioOutputAuthorizationHandlerTest,
        AuthorizeWithSessionIdWithoutDevice_GivesDefault) {
   MockAuthorizationCallback listener;
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), kRenderProcessId, kSalt);
+          GetAudioManager(), GetMediaStreamManager(), kRenderProcessId, kSalt);
 
   EXPECT_CALL(listener,
               Run(media::OUTPUT_DEVICE_STATUS_OK, false, _, kDefaultDeviceId))
       .Times(1);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       (base::Bind(&AudioOutputAuthorizationHandler::RequestDeviceAuthorization,
                   base::Unretained(handler.get()), kRenderFrameId, kSessionId,
                   std::string(), BadSecurityOrigin(), listener.Get())));
 
   SyncWithAllThreads();
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, handler.release());
   SyncWithAllThreads();
 }
 
 }  // namespace content