Remove AudioOutputDeviceEnumerator. Replace usage with MediaDevicesManager.

content/browser/renderer_host/media/audio_renderer_host.h

 // Copyright (c) 2012 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.
 //
 // AudioRendererHost serves audio related requests from AudioRenderer which
 // lives inside the render process and provide access to audio hardware.
 //
 // This class is owned by RenderProcessHostImpl, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread, so we
 // need to be extra careful about the lifetime of this object. AudioManager is a
@@ skipping 36 matching lines @@
 #include <string>
 #include <utility>
 
 #include "base/atomic_ref_count.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "content/browser/renderer_host/media/audio_output_device_enumerator.h"
+#include "content/browser/renderer_host/media/media_devices_manager.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_context.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_logging.h"
 #include "media/audio/audio_output_controller.h"
 #include "media/audio/simple_sources.h"
 #include "url/origin.h"
@@ skipping 44 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AudioRendererHostTest, CreateMockStream);
   FRIEND_TEST_ALL_PREFIXES(AudioRendererHostTest, MockStreamDataConversation);
 
   class AudioEntry;
   typedef std::map<int, AudioEntry*> AudioEntryMap;
 
   // Internal callback type for access requests to output devices.
   // |have_access| is true only if there is permission to access the device.
   typedef base::Callback<void(bool have_access)> OutputDeviceAccessCB;
 
-  // Internal callback type for information requests about an output device.
-  // |success| indicates the operation was successful. If true, |device_info|
-  // contains data about the device.
-  typedef base::Callback<void(bool success,
-                              const AudioOutputDeviceInfo& device_info)>
-      OutputDeviceInfoCB;
-
   // The type of a function that is run on the UI thread to check whether the
   // routing IDs reference a valid RenderFrameHost. The function then runs
   // |callback| on the IO thread with true/false if valid/invalid.
   using ValidateRenderFrameIdFunction =
       void (*)(int render_process_id,
                int render_frame_id,
                const base::Callback<void(bool)>& callback);
 
   ~AudioRendererHost() override;
 
@@ skipping 29 matching lines @@
   void OnPauseStream(int stream_id);
 
   // Close the audio stream referenced by |stream_id|.
   void OnCloseStream(int stream_id);
 
   // Set the volume of the audio stream referenced by |stream_id|.
   void OnSetVolume(int stream_id, double volume);
 
   // Helper methods.
 
-  // Proceed with device authorization after checking permissions.
-  void OnDeviceAuthorized(int stream_id,
-                          const std::string& device_id,
-                          const url::Origin& security_origin,
-                          base::TimeTicks auth_start_time,
-                          bool have_access);
-
-  // Proceed with device authorization after translating device ID.
-  void OnDeviceIDTranslated(int stream_id,
-                            base::TimeTicks auth_start_time,
-                            bool device_found,
-                            const AudioOutputDeviceInfo& device_info);
-
   // Complete the process of creating an audio stream. This will set up the
   // shared memory or shared socket in low latency mode and send the
   // NotifyStreamCreated message to the peer.
   void DoCompleteCreation(int stream_id);
 
   // Called after the |render_frame_id| provided to OnCreateStream() was
   // validated. When |is_valid| is false, this calls ReportErrorAndClose().
   void DidValidateRenderFrame(int stream_id, bool is_valid);
 
   // Send playing/paused status to the renderer.
@@ skipping 16 matching lines @@
   AudioEntry* LookupById(int stream_id);
 
   // A helper method to update the number of playing streams and alert the
   // ResourceScheduler when the renderer starts or stops playing an audiostream.
   void UpdateNumPlayingStreams(AudioEntry* entry, bool is_playing);
 
   // Check if the renderer process has access to the requested output device.
   void CheckOutputDeviceAccess(int render_frame_id,
                                const std::string& device_id,
                                const url::Origin& security_origin,
-                               const OutputDeviceAccessCB& callback);
+                               int stream_id,
+                               base::TimeTicks auth_start_time);
 
-  // Invoke |callback| after permission to use a device has been checked.
+  // Proceed with device authorization after checking permissions.
   void AccessChecked(std::unique_ptr<MediaStreamUIProxy> ui_proxy,
-                     const OutputDeviceAccessCB& callback,
+                     const std::string& device_id,
+                     const url::Origin& security_origin,
+                     int stream_id,
+                     base::TimeTicks auth_start_time,
                      bool have_access);
 
   // Translate the hashed |device_id| to a unique device ID.
   void TranslateDeviceID(const std::string& device_id,
                          const url::Origin& security_origin,
-                         const OutputDeviceInfoCB& callback,
-                         const AudioOutputDeviceEnumeration& enumeration);
+                         int stream_id,
+                         base::TimeTicks auth_start_time,
+                         const MediaDeviceEnumeration& enumeration);
+
+  // Get audio hardware parameters on the device thread.
+  media::AudioParameters GetDeviceParametersOnDeviceThread(
+      const std::string& device_id);
+
+  // Proceed with device authorization after translating device ID and
+  // receiving hardware parameters.
+  void DeviceParametersReceived(int stream_id,
+                                base::TimeTicks auth_start_time,
+                                bool device_found,
+                                const std::string& unique_id,
+                                const media::AudioParameters& output_params);
 
   // Helper method to check if the authorization procedure for stream
   // |stream_id| has started.
   bool IsAuthorizationStarted(int stream_id);
 
   // Called from AudioRendererHostTest to override the function that checks for
   // the existence of the RenderFrameHost at stream creation time.
   void set_render_frame_id_validate_function_for_testing(
       ValidateRenderFrameIdFunction function) {
     validate_render_frame_id_function_ = function;
@@ skipping 33 matching lines @@
   // The maximum number of simultaneous streams during the lifetime of this
   // host. Reported as UMA stat at shutdown.
   size_t max_simultaneous_streams_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_