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

media/audio/audio_input_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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/test/test_message_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_io.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_manager.h"
 #include "media/audio/audio_unittest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 // This class allows to find out if the callbacks are occurring as
 // expected and if any error has been reported.
 class TestInputCallback : public AudioInputStream::AudioInputCallback {
  public:
   explicit TestInputCallback()
@@ skipping 73 matching lines @@
 
   void StopAndCloseAudioInputStreamOnAudioThread() {
     RunOnAudioThread(
         base::Bind(&AudioInputTest::StopAndClose,
                    base::Unretained(this)));
   }
 
   void MakeAudioInputStream() {
     DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
     AudioParameters params = audio_manager_->GetInputStreamParameters(
-        AudioManagerBase::kDefaultDeviceId);
-    audio_input_stream_ = audio_manager_->MakeAudioInputStream(params,
-        AudioManagerBase::kDefaultDeviceId);
+        AudioDeviceDescription::kDefaultDeviceId);
+    audio_input_stream_ = audio_manager_->MakeAudioInputStream(
+        params, AudioDeviceDescription::kDefaultDeviceId);
     EXPECT_TRUE(audio_input_stream_);
   }
 
   void OpenAndClose() {
     DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
     EXPECT_TRUE(audio_input_stream_->Open());
     audio_input_stream_->Close();
     audio_input_stream_ = NULL;
   }
 
@@ skipping 86 matching lines @@
       FROM_HERE, run_loop.QuitClosure(),
       base::TimeDelta::FromMilliseconds(500));
   run_loop.Run();
   EXPECT_GE(test_callback.callback_count(), 2);
   EXPECT_FALSE(test_callback.had_error());
 
   StopAndCloseAudioInputStreamOnAudioThread();
 }
 
 }  // namespace media