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

chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.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 <stddef.h>
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/media_device_id.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_manager.h"
-#include "media/audio/audio_manager_base.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::JSONWriter;
 using content::RenderProcessHost;
 using content::WebContents;
 using media::AudioDeviceNames;
 using media::AudioManager;
 
 namespace extensions {
@@ skipping 147 matching lines @@
   size_t ix = 0;
   AudioDeviceNames::const_iterator it = devices.begin();
   for (; ix < sink_list->GetSize() && it != devices.end();
        ++ix, ++it) {
     base::DictionaryValue* dict = NULL;
     sink_list->GetDictionary(ix, &dict);
     std::string sink_id;
     dict->GetString("sinkId", &sink_id);
 
     std::string expected_id;
-    if (it->unique_id.empty() ||
-        it->unique_id == media::AudioManagerBase::kDefaultDeviceId) {
-      expected_id = media::AudioManagerBase::kDefaultDeviceId;
+    if (media::AudioDeviceDescription::IsDefaultDevice(it->unique_id)) {
+      expected_id = media::AudioDeviceDescription::kDefaultDeviceId;
     } else {
       GetIDInOrigin(profile()->GetResourceContext(),
                     source_url_.GetOrigin(),
                     it->unique_id,
                     &expected_id);
     }
 
     EXPECT_EQ(expected_id, sink_id);
     std::string sink_label;
     dict->GetString("sinkLabel", &sink_label);
@@ skipping 213 matching lines @@
   title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("failure"));
   base::string16 result = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(base::ASCIIToUTF16("success"), result);
 
   g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting(
       NULL);
 }
 #endif  // defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
 
 }  // namespace extensions