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

media/audio/audio_manager_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 "media/audio/audio_manager.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_message_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_device_description.h"
+#include "media/audio/audio_manager.h"
 #include "media/audio/audio_output_proxy.h"
 #include "media/audio/audio_unittest_util.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/fake_audio_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_ALSA)
 #include "media/audio/alsa/audio_manager_alsa.h"
 #endif  // defined(USE_ALSA)
 
@@ skipping 54 matching lines @@
     AudioOutputStream* stream =
         audio_manager_->MakeAudioOutputStreamProxy(params, "");
     ASSERT_TRUE(stream);
     AudioOutputDispatcher* dispatcher1 =
         reinterpret_cast<AudioOutputProxy*>(stream)
             ->get_dispatcher_for_testing();
 
     // Closing this stream will put it up for reuse.
     stream->Close();
     stream = audio_manager_->MakeAudioOutputStreamProxy(
-        params, AudioManagerBase::kDefaultDeviceId);
+        params, AudioDeviceDescription::kDefaultDeviceId);
 
     // Verify both streams are created with the same dispatcher (which is unique
     // per device).
     ASSERT_EQ(dispatcher1, reinterpret_cast<AudioOutputProxy*>(stream)
                                ->get_dispatcher_for_testing());
     stream->Close();
 
     // Create a non-default device and ensure it gets a different dispatcher.
     stream = audio_manager_->MakeAudioOutputStreamProxy(params, "123456");
     ASSERT_NE(dispatcher1, reinterpret_cast<AudioOutputProxy*>(stream)
@@ skipping 47 matching lines @@
 #endif
 
   // Helper method which verifies that the device list starts with a valid
   // default record followed by non-default device names.
   static void CheckDeviceNames(const AudioDeviceNames& device_names) {
     DVLOG(2) << "Got " << device_names.size() << " audio devices.";
     if (!device_names.empty()) {
       AudioDeviceNames::const_iterator it = device_names.begin();
 
       // The first device in the list should always be the default device.
-      EXPECT_EQ(AudioManager::GetDefaultDeviceName(), it->device_name);
-      EXPECT_EQ(std::string(AudioManagerBase::kDefaultDeviceId), it->unique_id);
+      EXPECT_EQ(AudioDeviceDescription::GetDefaultDeviceName(),
+                it->device_name);
+      EXPECT_EQ(std::string(AudioDeviceDescription::kDefaultDeviceId),
+                it->unique_id);
       ++it;
 
       // Other devices should have non-empty name and id and should not contain
       // default name or id.
       while (it != device_names.end()) {
         EXPECT_FALSE(it->device_name.empty());
         EXPECT_FALSE(it->unique_id.empty());
         DVLOG(2) << "Device ID(" << it->unique_id
                  << "), label: " << it->device_name;
-        EXPECT_NE(AudioManager::GetDefaultDeviceName(), it->device_name);
-        EXPECT_NE(std::string(AudioManagerBase::kDefaultDeviceId),
+        EXPECT_NE(AudioDeviceDescription::GetDefaultDeviceName(),
+                  it->device_name);
+        EXPECT_NE(std::string(AudioDeviceDescription::kDefaultDeviceId),
                   it->unique_id);
         ++it;
       }
     } else {
       // Log a warning so we can see the status on the build bots.  No need to
       // break the test though since this does successfully test the code and
       // some failure cases.
       LOG(WARNING) << "No input devices detected";
     }
   }
@@ skipping 239 matching lines @@
       DVLOG(2) << it->unique_id << " matches with " << output_device_id;
       found_an_associated_device = true;
     }
   }
 
   EXPECT_TRUE(found_an_associated_device);
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 }
 
 }  // namespace media