Removing public access to AudioManager device info interface.

media/audio/audio_low_latency_input_output_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.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/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/fake_audio_log_factory.h"
 #include "media/base/seekable_buffer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_PULSEAUDIO)
 #include "media/audio/pulse/audio_manager_pulse.h"
 #elif defined(USE_ALSA)
@@ skipping 245 matching lines @@
   size_t output_elements_to_write_;
   base::TimeTicks previous_write_time_;
 };
 
 class AudioInputStreamTraits {
  public:
   typedef AudioInputStream StreamType;
 
   static AudioParameters GetDefaultAudioStreamParameters(
       AudioManager* audio_manager) {
-    return audio_manager->GetInputStreamParameters(
-        AudioDeviceDescription::kDefaultDeviceId);
+    return AudioDeviceInfoAccessorForTests(audio_manager)
+        .GetInputStreamParameters(AudioDeviceDescription::kDefaultDeviceId);
   }
 
   static StreamType* CreateStream(AudioManager* audio_manager,
       const AudioParameters& params) {
     return audio_manager->MakeAudioInputStream(
         params, AudioDeviceDescription::kDefaultDeviceId,
         base::Bind(&OnLogMessage));
   }
 };
 
 class AudioOutputStreamTraits {
  public:
   typedef AudioOutputStream StreamType;
 
   static AudioParameters GetDefaultAudioStreamParameters(
       AudioManager* audio_manager) {
-    return audio_manager->GetDefaultOutputStreamParameters();
+    return AudioDeviceInfoAccessorForTests(audio_manager)
+        .GetDefaultOutputStreamParameters();
   }
 
   static StreamType* CreateStream(AudioManager* audio_manager,
       const AudioParameters& params) {
     return audio_manager->MakeAudioOutputStream(params, std::string(),
                                                 base::Bind(&OnLogMessage));
   }
 };
 
 // Traits template holding a trait of StreamType. It encapsulates
@@ skipping 65 matching lines @@
 // MATLAB example:
 //   D=load('audio_delay_values_ms.txt');
 //   x=cumsum(D(:,1));
 //   plot(x, D(:,2), x, D(:,3), x, D(:,4), x, D(:,2)+D(:,3)+D(:,4));
 //   axis([0, max(x), 0, max(D(:,2)+D(:,3)+D(:,4))+10]);
 //   legend('buffer delay','input delay','output delay','total delay');
 //   xlabel('time [msec]')
 //   ylabel('delay [msec]')
 //   title('Full-duplex audio delay measurement');
 TEST_F(AudioLowLatencyInputOutputTest, DISABLED_FullDuplexDelayMeasurement) {
-  ABORT_AUDIO_TEST_IF_NOT(audio_manager()->HasAudioInputDevices() &&
-                          audio_manager()->HasAudioOutputDevices());
+  AudioDeviceInfoAccessorForTests device_info_accessor(audio_manager());
+  ABORT_AUDIO_TEST_IF_NOT(device_info_accessor.HasAudioInputDevices() &&
+                          device_info_accessor.HasAudioOutputDevices());
 
   AudioInputStreamWrapper aisw(audio_manager());
   AudioInputStream* ais = aisw.Create();
   EXPECT_TRUE(ais);
 
   AudioOutputStreamWrapper aosw(audio_manager());
   AudioOutputStream* aos = aosw.Create();
   EXPECT_TRUE(aos);
 
   // This test only supports identical parameters in both directions.
@@ skipping 38 matching lines @@
 
   // All Close() operations that run on the mocked audio thread,
   // should be synchronous and not post additional close tasks to
   // mocked the audio thread. Hence, there is no need to call
   // message_loop()->RunUntilIdle() after the Close() methods.
   aos->Close();
   ais->Close();
 }
 
 }  // namespace media