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

content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc

 // Copyright (c) 2015 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 "content/browser/renderer_host/media/audio_output_device_enumerator.h"
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/public/test/test_browser_thread_bundle.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/fake_audio_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace content {
 
 namespace {
 
 class MockAudioManager : public media::FakeAudioManager {
  public:
   MockAudioManager(size_t num_devices)
       : FakeAudioManager(base::ThreadTaskRunnerHandle::Get(),
                          base::ThreadTaskRunnerHandle::Get(),
                          &fake_audio_log_factory_),
         num_devices_(num_devices) {}
   MockAudioManager() : MockAudioManager(0) {}
   ~MockAudioManager() override {}
 
   MOCK_METHOD1(MockGetAudioOutputDeviceNames, void(media::AudioDeviceNames*));
 
   void GetAudioOutputDeviceNames(
       media::AudioDeviceNames* device_names) override {
     DCHECK(device_names->empty());
     MockGetAudioOutputDeviceNames(device_names);
     if (num_devices_ > 0) {
-      device_names->push_back(
-          media::AudioDeviceName(AudioManager::GetDefaultDeviceName(),
-                                 AudioManagerBase::kDefaultDeviceId));
+      device_names->push_back(media::AudioDeviceName::CreateDefault());
       for (size_t i = 0; i < num_devices_; i++) {
         device_names->push_back(
             media::AudioDeviceName("FakeDeviceName_" + base::IntToString(i),
                                    "FakeDeviceId_" + base::IntToString(i)));
       }
     }
   }
 
  private:
   media::FakeAudioLogFactory fake_audio_log_factory_;
   size_t num_devices_;
   DISALLOW_COPY_AND_ASSIGN(MockAudioManager);
 };
 
 // Fake audio manager that exposes only the default device
 class OnlyDefaultDeviceAudioManager : public MockAudioManager {
  public:
   OnlyDefaultDeviceAudioManager() {}
   ~OnlyDefaultDeviceAudioManager() override {}
   void GetAudioOutputDeviceNames(
       media::AudioDeviceNames* device_names) override {
     DCHECK(device_names->empty());
     MockGetAudioOutputDeviceNames(device_names);
-    device_names->push_front(
-        media::AudioDeviceName(AudioManager::GetDefaultDeviceName(),
-                               AudioManagerBase::kDefaultDeviceId));
+    device_names->push_front(media::AudioDeviceName::CreateDefault());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OnlyDefaultDeviceAudioManager);
 };
 
 }  // namespace
 
 class AudioOutputDeviceEnumeratorTest : public ::testing::Test {
  public:
@@ skipping 116 matching lines @@
   AudioOutputDeviceEnumerator enumerator(
       audio_manager_.get(),
       AudioOutputDeviceEnumerator::CACHE_POLICY_NO_CACHING);
   enumerator.Enumerate(
       base::Bind(&AudioOutputDeviceEnumeratorTest::EnumerateCountCallback,
                  base::Unretained(this), num_devices + 1, true));
   run_loop_.Run();
 }
 
 }  // namespace content