Replace AudioManager::GetAudio*DeviceNames with AudioManager::GetAudio*DeviceDescriptions

media/audio/android/audio_android_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 <stdint.h>
 
 #include <memory>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 75 matching lines @@
 }
 
 double ExpectedTimeBetweenCallbacks(AudioParameters params) {
   return (base::TimeDelta::FromMicroseconds(
               params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
               static_cast<double>(params.sample_rate()))).InMillisecondsF();
 }
 
 // Helper method which verifies that the device list starts with a valid
 // default device name followed by non-default device names.
-void CheckDeviceNames(const AudioDeviceNames& device_names) {
-  DVLOG(2) << "Got " << device_names.size() << " audio devices.";
-  if (device_names.empty()) {
+void CheckDeviceDescriptions(
+    const AudioDeviceDescriptions& device_descriptions) {
+  DVLOG(2) << "Got " << device_descriptions.size() << " audio devices.";
+  if (device_descriptions.empty()) {
     // 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";
     return;
   }
 
-  AudioDeviceNames::const_iterator it = device_names.begin();
+  AudioDeviceDescriptions::const_iterator it = device_descriptions.begin();
 
   // The first device in the list should always be the default device.
   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()) {
+  while (it != device_descriptions.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_FALSE(it->group_id.empty());
+    DVLOG(2) << "Device ID(" << it->unique_id << "), label: " << it->device_name
+             << " group: " << it->group_id;
     EXPECT_NE(AudioDeviceDescription::GetDefaultDeviceName(), it->device_name);
     EXPECT_NE(std::string(AudioDeviceDescription::kDefaultDeviceId),
               it->unique_id);
     ++it;
   }
 }
 
 // We clear the data bus to ensure that the test does not cause noise.
 int RealOnMoreData(base::TimeDelta /* delay */,
                    base::TimeTicks /* delay_timestamp */,
@@ skipping 601 matching lines @@
   DVLOG(1) << audio_input_parameters();
 }
 
 // Get the default audio output parameters and log the result.
 TEST_F(AudioAndroidOutputTest, GetDefaultOutputStreamParameters) {
   GetDefaultOutputStreamParametersOnAudioThread();
   DVLOG(1) << audio_output_parameters();
 }
 
 // Verify input device enumeration.
-TEST_F(AudioAndroidInputTest, GetAudioInputDeviceNames) {
+TEST_F(AudioAndroidInputTest, GetAudioInputDeviceDescriptions) {
   ABORT_AUDIO_TEST_IF_NOT(audio_manager()->HasAudioInputDevices());
-  AudioDeviceNames devices;
-  RunOnAudioThread(
-      base::Bind(&AudioManager::GetAudioInputDeviceNames,
-                 base::Unretained(audio_manager()),
-                 &devices));
-  CheckDeviceNames(devices);
+  AudioDeviceDescriptions devices;
+  RunOnAudioThread(base::Bind(&AudioManager::GetAudioInputDeviceDescriptions,
+                              base::Unretained(audio_manager()), &devices));
+  CheckDeviceDescriptions(devices);
 }
 
 // Verify output device enumeration.
-TEST_F(AudioAndroidOutputTest, GetAudioOutputDeviceNames) {
+TEST_F(AudioAndroidOutputTest, GetAudioOutputDeviceDescriptions) {
   ABORT_AUDIO_TEST_IF_NOT(audio_manager()->HasAudioOutputDevices());
-  AudioDeviceNames devices;
-  RunOnAudioThread(
-      base::Bind(&AudioManager::GetAudioOutputDeviceNames,
-                 base::Unretained(audio_manager()),
-                 &devices));
-  CheckDeviceNames(devices);
+  AudioDeviceDescriptions devices;
+  RunOnAudioThread(base::Bind(&AudioManager::GetAudioOutputDeviceDescriptions,
+                              base::Unretained(audio_manager()), &devices));
+  CheckDeviceDescriptions(devices);
 }
 
 // Ensure that a default input stream can be created and closed.
 TEST_P(AudioAndroidInputTest, CreateAndCloseInputStream) {
   AudioParameters params = GetInputStreamParameters();
   MakeAudioInputStreamOnAudioThread(params);
   RunOnAudioThread(
       base::Bind(&AudioInputStream::Close,
                  base::Unretained(audio_input_stream_)));
 }
@@ skipping 194 matching lines @@
   printf("\n");
   StopAndCloseAudioOutputStreamOnAudioThread();
   StopAndCloseAudioInputStreamOnAudioThread();
 }
 
 INSTANTIATE_TEST_CASE_P(AudioAndroidInputTest,
                         AudioAndroidInputTest,
                         testing::Bool());
 
 }  // namespace media