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

chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/system_monitor/system_monitor.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/common/extensions/api/webrtc_audio_private.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_context.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
-#include "media/audio/audio_device_name.h"
+#include "media/audio/audio_device_description.h"
 
 namespace extensions {
 
 // Listens for device changes and forwards as an extension event.
 class WebrtcAudioPrivateEventService
     : public BrowserContextKeyedAPI,
       public base::SystemMonitor::DevicesChangedObserver {
  public:
   explicit WebrtcAudioPrivateEventService(content::BrowserContext* context);
   ~WebrtcAudioPrivateEventService() override;
@@ skipping 16 matching lines @@
 };
 
 // Common base for WebrtcAudioPrivate functions, that provides a
 // couple of optionally-used common implementations.
 class WebrtcAudioPrivateFunction : public ChromeAsyncExtensionFunction {
  protected:
   WebrtcAudioPrivateFunction();
   ~WebrtcAudioPrivateFunction() override;
 
  protected:
-  // Retrieves the list of output device names on the appropriate
+  // Retrieves the list of output device descriptions on the appropriate
   // thread. Call from UI thread, callback will occur on IO thread.
-  void GetOutputDeviceNames();
+  void GetOutputDeviceDescriptions();
 
-  // Must override this if you call GetOutputDeviceNames. Called on IO thread.
-  virtual void OnOutputDeviceNames(
-      std::unique_ptr<media::AudioDeviceNames> device_names);
+  // Must override this if you call GetOutputDeviceDescriptions. Called on IO
+  // thread.
+  virtual void OnOutputDeviceDescriptions(
+      std::unique_ptr<media::AudioDeviceDescriptions> device_descriptions);
 
   // Retrieve the list of AudioOutputController objects. Calls back
   // via OnControllerList.
   //
   // Returns false on error, in which case it has set |error_| and the
   // entire function should fail.
   //
   // Call from any thread. Callback will occur on originating thread.
   bool GetControllerList(const api::webrtc_audio_private::RequestInfo& request);
 
@@ skipping 38 matching lines @@
 
  private:
   DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getSinks",
                              WEBRTC_AUDIO_PRIVATE_GET_SINKS);
 
   // Sequence of events is that we query the list of sinks on the
   // AudioManager's thread, then calculate HMACs on the IO thread,
   // then finish on the UI thread.
   bool RunAsync() override;
   void DoQuery();
-  void OnOutputDeviceNames(
-      std::unique_ptr<media::AudioDeviceNames> raw_ids) override;
+  void OnOutputDeviceDescriptions(
+      std::unique_ptr<media::AudioDeviceDescriptions> raw_ids) override;
   void DoneOnUIThread();
 };
 
 class WebrtcAudioPrivateGetActiveSinkFunction
     : public WebrtcAudioPrivateFunction {
  protected:
   ~WebrtcAudioPrivateGetActiveSinkFunction() override {}
 
  private:
   DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.getActiveSink",
@@ skipping 15 matching lines @@
   ~WebrtcAudioPrivateSetActiveSinkFunction() override;
 
  private:
   DECLARE_EXTENSION_FUNCTION("webrtcAudioPrivate.setActiveSink",
                              WEBRTC_AUDIO_PRIVATE_SET_ACTIVE_SINK);
 
   bool RunAsync() override;
   void OnControllerList(
       const content::RenderProcessHost::AudioOutputControllerList& controllers)
       override;
-  void OnOutputDeviceNames(
-      std::unique_ptr<media::AudioDeviceNames> device_names) override;
+  void OnOutputDeviceDescriptions(
+      std::unique_ptr<media::AudioDeviceDescriptions> device_descriptions)
+      override;
   void SwitchDone();
   void DoneOnUIThread();
 
   api::webrtc_audio_private::RequestInfo request_info_;
   std::string sink_id_;
 
   // Filled in by OnControllerList.
   content::RenderProcessHost::AudioOutputControllerList controllers_;
 
   // Number of sink IDs we are still waiting for. Can become greater
@@ skipping 26 matching lines @@
   // 2. Given a source ID for an origin and that security origin, find
   //    the raw source ID. This needs to happen on the IO thread since
   //    we will be using the ResourceContext.
   // 3. Given a raw source ID, get the raw associated sink ID on the
   //    device thread.
   // 4. Given the raw associated sink ID, get its HMAC on the IO thread.
   // 5. Respond with the HMAC of the associated sink ID on the UI thread.
 
   // Fills in |source_devices_|. Note that these are input devices,
   // not output devices, so don't use
-  // |WebrtcAudioPrivateFunction::GetOutputDeviceNames|.
+  // |WebrtcAudioPrivateFunction::GetOutputDeviceDescriptions|.
   void GetDevicesOnDeviceThread();
 
   // Takes the parameters of the function, retrieves the raw source
   // device ID, or the empty string if none.
   void GetRawSourceIDOnIOThread();
 
   // Gets the raw sink ID for a raw source ID. Sends it to |CalculateHMAC|.
   void GetAssociatedSinkOnDeviceThread(const std::string& raw_source_id);
 
   // Receives the associated sink ID after its HMAC is calculated.
   void OnHMACCalculated(const std::string& hmac) override;
 
   // Accessed from UI thread and device thread, but only on one at a
   // time, no locking needed.
   std::unique_ptr<api::webrtc_audio_private::GetAssociatedSink::Params> params_;
 
   // Audio sources (input devices). Filled in by DoWorkOnDeviceThread.
-  media::AudioDeviceNames source_devices_;
+  media::AudioDeviceDescriptions source_devices_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEBRTC_AUDIO_PRIVATE_WEBRTC_AUDIO_PRIVATE_API_H_