Removing public access to AudioManager device info interface.

media/audio/android/audio_android_unittest.cc

 // Copyright 2013 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 <stdint.h>
 
 #include <memory>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "media/audio/android/audio_manager_android.h"
 #include "media/audio/audio_device_description.h"
+#include "media/audio/audio_device_info_accessor_for_tests.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_unittest_util.h"
 #include "media/audio/mock_audio_source_callback.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/seekable_buffer.h"
 #include "media/base/test_data_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
@@ skipping 381 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(FullDuplexAudioSinkSource);
 };
 
 // Test fixture class for tests which only exercise the output path.
 class AudioAndroidOutputTest : public testing::Test {
  public:
   AudioAndroidOutputTest()
       : loop_(new base::MessageLoopForUI()),
         audio_manager_(AudioManager::CreateForTesting(loop_->task_runner())),
+        audio_manager_device_info_(audio_manager_.get()),
         audio_output_stream_(NULL) {
     // Flush the message loop to ensure that AudioManager is fully initialized.
     base::RunLoop().RunUntilIdle();
   }
 
   ~AudioAndroidOutputTest() override {
     audio_manager_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
  protected:
   AudioManager* audio_manager() { return audio_manager_.get(); }
+  AudioDeviceInfoAccessorForTests* audio_manager_device_info() {
+    return &audio_manager_device_info_;
+  }
   const AudioParameters& audio_output_parameters() {
     return audio_output_parameters_;
   }
 
   // Synchronously runs the provided callback/closure on the audio thread.
   void RunOnAudioThread(const base::Closure& closure) {
     if (!audio_manager()->GetTaskRunner()->BelongsToCurrentThread()) {
       base::WaitableEvent event(
           base::WaitableEvent::ResetPolicy::AUTOMATIC,
           base::WaitableEvent::InitialState::NOT_SIGNALED);
@@ skipping 90 matching lines @@
              << average_time_between_callbacks_ms << " ms";
     EXPECT_GE(average_time_between_callbacks_ms,
               0.70 * expected_time_between_callbacks_ms);
     EXPECT_LE(average_time_between_callbacks_ms,
               1.50 * expected_time_between_callbacks_ms);
   }
 
   void GetDefaultOutputStreamParameters() {
     DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
     audio_output_parameters_ =
-        audio_manager()->GetDefaultOutputStreamParameters();
+        audio_manager_device_info()->GetDefaultOutputStreamParameters();
     EXPECT_TRUE(audio_output_parameters_.IsValid());
   }
 
   void MakeOutputStream(const AudioParameters& params) {
     DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
     audio_output_stream_ = audio_manager()->MakeAudioOutputStream(
         params, std::string(), AudioManager::LogCallback());
     EXPECT_TRUE(audio_output_stream_);
   }
 
@@ skipping 12 matching lines @@
 
   void StopAndClose() {
     DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
     audio_output_stream_->Stop();
     audio_output_stream_->Close();
     audio_output_stream_ = NULL;
   }
 
   std::unique_ptr<base::MessageLoopForUI> loop_;
   ScopedAudioManagerPtr audio_manager_;
+  AudioDeviceInfoAccessorForTests audio_manager_device_info_;
   AudioParameters audio_output_parameters_;
   AudioOutputStream* audio_output_stream_;
   base::TimeTicks start_time_;
   base::TimeTicks end_time_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioAndroidOutputTest);
 };
 
 // Test fixture class for tests which exercise the input path, or both input and
@@ skipping 88 matching lines @@
     DVLOG(0) << "average time between callbacks: "
              << average_time_between_callbacks_ms << " ms";
     EXPECT_GE(average_time_between_callbacks_ms,
               0.70 * expected_time_between_callbacks_ms);
     EXPECT_LE(average_time_between_callbacks_ms,
               1.30 * expected_time_between_callbacks_ms);
   }
 
   void GetDefaultInputStreamParameters() {
     DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
-    audio_input_parameters_ = audio_manager()->GetInputStreamParameters(
-        AudioDeviceDescription::kDefaultDeviceId);
+    audio_input_parameters_ =
+        audio_manager_device_info()->GetInputStreamParameters(
+            AudioDeviceDescription::kDefaultDeviceId);
   }
 
   void MakeInputStream(const AudioParameters& params) {
     DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
     audio_input_stream_ = audio_manager()->MakeAudioInputStream(
         params, AudioDeviceDescription::kDefaultDeviceId,
         AudioManager::LogCallback());
     EXPECT_TRUE(audio_input_stream_);
   }
 
@@ skipping 34 matching lines @@
 }
 
 // Get the default audio output parameters and log the result.
 TEST_F(AudioAndroidOutputTest, GetDefaultOutputStreamParameters) {
   GetDefaultOutputStreamParametersOnAudioThread();
   DVLOG(1) << audio_output_parameters();
 }
 
 // Verify input device enumeration.
 TEST_F(AudioAndroidInputTest, GetAudioInputDeviceDescriptions) {
-  ABORT_AUDIO_TEST_IF_NOT(audio_manager()->HasAudioInputDevices());
+  ABORT_AUDIO_TEST_IF_NOT(audio_manager_device_info()->HasAudioInputDevices());
   AudioDeviceDescriptions devices;
-  RunOnAudioThread(base::Bind(&AudioManager::GetAudioInputDeviceDescriptions,
-                              base::Unretained(audio_manager()), &devices));
+  RunOnAudioThread(base::Bind(
+      &AudioDeviceInfoAccessorForTests::GetAudioInputDeviceDescriptions,
+      base::Unretained(audio_manager_device_info()), &devices));
   CheckDeviceDescriptions(devices);
 }
 
 // Verify output device enumeration.
 TEST_F(AudioAndroidOutputTest, GetAudioOutputDeviceDescriptions) {
-  ABORT_AUDIO_TEST_IF_NOT(audio_manager()->HasAudioOutputDevices());
+  ABORT_AUDIO_TEST_IF_NOT(audio_manager_device_info()->HasAudioOutputDevices());
   AudioDeviceDescriptions devices;
-  RunOnAudioThread(base::Bind(&AudioManager::GetAudioOutputDeviceDescriptions,
-                              base::Unretained(audio_manager()), &devices));
+  RunOnAudioThread(base::Bind(
+      &AudioDeviceInfoAccessorForTests::GetAudioOutputDeviceDescriptions,
+      base::Unretained(audio_manager_device_info()), &devices));
   CheckDeviceDescriptions(devices);
 }
 
 // Ensure that a default input stream can be created and closed.
 TEST_P(AudioAndroidInputTest, CreateAndCloseInputStream) {
   AudioParameters params = GetInputStreamParameters();
   MakeAudioInputStreamOnAudioThread(params);
   RunOnAudioThread(
       base::Bind(&AudioInputStream::Close,
                  base::Unretained(audio_input_stream_)));
@@ skipping 195 matching lines @@
   printf("\n");
   StopAndCloseAudioOutputStreamOnAudioThread();
   StopAndCloseAudioInputStreamOnAudioThread();
 }
 
 INSTANTIATE_TEST_CASE_P(AudioAndroidInputTest,
                         AudioAndroidInputTest,
                         testing::Bool());
 
 }  // namespace media