Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

media/audio/cras/cras_input_unittest.cc

Index: media/audio/cras/cras_input_unittest.cc
diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc
index 9062bbda09118d6b41c7807044e5e335fc4b74f5..e4c1e0a3f5e6176548d1caa7d264f2711573d8ba 100644
--- a/media/audio/cras/cras_input_unittest.cc
+++ b/media/audio/cras/cras_input_unittest.cc
@@ -14,6 +14,7 @@
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/cras/audio_manager_cras.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -76,7 +77,7 @@ class CrasInputStreamTest : public testing::Test {
   CrasInputStream* CreateStream(ChannelLayout layout,
                                 int32_t samples_per_packet) {
     return CreateStream(layout, samples_per_packet,
-                        AudioManagerBase::kDefaultDeviceId);
+                        AudioDeviceDescription::kDefaultDeviceId);
   }
 
   CrasInputStream* CreateStream(ChannelLayout layout,
@@ -93,7 +94,7 @@ class CrasInputStreamTest : public testing::Test {
   void CaptureSomeFrames(const AudioParameters &params,
                          unsigned int duration_ms) {
     CrasInputStream* test_stream = new CrasInputStream(
-        params, mock_manager_.get(), AudioManagerBase::kDefaultDeviceId);
+        params, mock_manager_.get(), AudioDeviceDescription::kDefaultDeviceId);
 
     ASSERT_TRUE(test_stream->Open());
 
@@ -157,8 +158,9 @@ TEST_F(CrasInputStreamTest, BadBitsPerSample) {
                                  kTestSampleRate,
                                  kTestBitsPerSample - 1,
                                  kTestFramesPerPacket);
-  CrasInputStream* test_stream = new CrasInputStream(
-      bad_bps_params, mock_manager_.get(), AudioManagerBase::kDefaultDeviceId);
+  CrasInputStream* test_stream =
+      new CrasInputStream(bad_bps_params, mock_manager_.get(),
+                          AudioDeviceDescription::kDefaultDeviceId);
   EXPECT_FALSE(test_stream->Open());
   test_stream->Close();
 }
@@ -169,8 +171,9 @@ TEST_F(CrasInputStreamTest, BadSampleRate) {
                                   0,
                                   kTestBitsPerSample,
                                   kTestFramesPerPacket);
-  CrasInputStream* test_stream = new CrasInputStream(
-      bad_rate_params, mock_manager_.get(), AudioManagerBase::kDefaultDeviceId);
+  CrasInputStream* test_stream =
+      new CrasInputStream(bad_rate_params, mock_manager_.get(),
+                          AudioDeviceDescription::kDefaultDeviceId);
   EXPECT_FALSE(test_stream->Open());
   test_stream->Close();
 }
@@ -218,10 +221,9 @@ TEST_F(CrasInputStreamTest, CaptureFrames) {
 }
 
 TEST_F(CrasInputStreamTest, CaptureLoopback) {
-  CrasInputStream* test_stream = CreateStream(
-      CHANNEL_LAYOUT_STEREO,
-      kTestFramesPerPacket,
-      AudioManagerBase::kLoopbackInputDeviceId);
+  CrasInputStream* test_stream =
+      CreateStream(CHANNEL_LAYOUT_STEREO, kTestFramesPerPacket,
+                   AudioDeviceDescription::kLoopbackInputDeviceId);
   EXPECT_TRUE(test_stream->Open());
   test_stream->Close();
 }