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

content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc

Index: content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc b/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
index 4e340998ddec9d0bdd1b2870e6144a1c71042e1d..f82855a909692e61de7d35ffa19e158e8b3c6d8a 100644
--- a/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
+++ b/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
@@ -18,7 +18,6 @@
 #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"
@@ -67,7 +66,6 @@
     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:
@@ -81,7 +79,7 @@
     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
@@ -142,7 +140,6 @@
   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);
 };
@@ -154,7 +151,7 @@
       .Times(1);
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), kRenderProcessId, kSalt);
+          GetAudioManager(), GetMediaStreamManager(), kRenderProcessId, kSalt);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ -175,7 +172,7 @@
       .Times(1);
   std::unique_ptr<AudioOutputAuthorizationHandler> handler =
       base::MakeUnique<AudioOutputAuthorizationHandler>(
-          GetAudioSystem(), GetMediaStreamManager(), kRenderProcessId, kSalt);
+          GetAudioManager(), GetMediaStreamManager(), kRenderProcessId, kSalt);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ -197,7 +194,7 @@
   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(
@@ -228,7 +225,7 @@
   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(
@@ -258,7 +255,7 @@
   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,
@@ -293,7 +290,7 @@
   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);
@@ -317,7 +314,7 @@
   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))