Enable new getUserMedia audio constraints algorithm behind a flag.

content/renderer/media/user_media_client_impl.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.
 
 #ifndef CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
 
 #include <list>
 #include <memory>
 #include <string>
@@ skipping 19 matching lines @@
 #include "third_party/WebKit/public/web/WebMediaDeviceChangeObserver.h"
 #include "third_party/WebKit/public/web/WebMediaDevicesRequest.h"
 #include "third_party/WebKit/public/web/WebUserMediaClient.h"
 #include "third_party/WebKit/public/web/WebUserMediaRequest.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace content {
-class PeerConnectionDependencyFactory;
+class AudioCaptureSettings;
 class MediaStreamAudioSource;
 class MediaStreamDispatcher;
 class MediaStreamVideoSource;
+class PeerConnectionDependencyFactory;
 class VideoCaptureSettings;
 
 // UserMediaClientImpl is a delegate for the Media Stream GetUserMedia API.
 // It ties together WebKit and MediaStreamManager
 // (via MediaStreamDispatcher and MediaStreamDispatcherHost)
 // in the browser process. It must be created, called and destroyed on the
 // render thread.
 class CONTENT_EXPORT UserMediaClientImpl
     : public RenderFrameObserver,
       NON_EXPORTED_BASE(public blink::WebUserMediaClient),
@@ skipping 60 matching lines @@
   virtual MediaStreamAudioSource* CreateAudioSource(
       const StreamDeviceInfo& device,
       const blink::WebMediaConstraints& constraints,
       const MediaStreamSource::ConstraintsCallback& source_ready);
   virtual MediaStreamVideoSource* CreateVideoSource(
       const StreamDeviceInfo& device,
       const MediaStreamSource::SourceStoppedCallback& stop_callback);
 
   // Returns no value if there is no request being processed. Use only for
   // testing.
-  // TODO(guidou): Remove this method once spec-compliant constraints algorithm
-  // for audio is implemented. http://crbug.com/543997
+  // TODO(guidou): Remove this function. http://crbug.com/706408
   base::Optional<bool> AutomaticOutputDeviceSelectionEnabledForCurrentRequest();
 
+  // Intended to be used only for testing.
+  const AudioCaptureSettings& AudioCaptureSettingsForCurrentRequest() const;

[miu, 2017/06/19 21:18:44]

Couple suggestions:

1. naming/style: Test-only methods should have the "XXXForTesting()" naming
pattern. This allows presubmit scripts to warn developers when future code
changes are made.

2. These methods both just call into |current_request_info_|. So, perhaps it'd
be simpler to just provide one accessor here for that:

  UserMediaRequestInfo* current_request_info_for_testing() const {
    return current_request_info_.get();
  }

...and then the helper you have in the test code would:

  auto* const request_info =
user_media_client->current_request_info_for_testing();
  ASSERT_TRUE(request_info);
  return request_info->audio_settings();

[Guido Urdaneta, 2017/06/20 12:18:48]

Did not expose |current_request_info_| because its type is internal to
user_media_client_impl.cc. I see little value in making that type public just
for a unit test.
Instead renamed the methods to XXXForTesting() as per your suggestion #1.

+  const VideoCaptureSettings& VideoCaptureSettingsForCurrentRequest() const;
+
  private:
   class UserMediaRequestInfo;
   typedef std::vector<blink::WebMediaStreamSource> LocalStreamSources;
 
   void MaybeProcessNextRequestInfo();
   bool IsCurrentRequestInfo(int request_id) const;
   bool IsCurrentRequestInfo(const blink::WebUserMediaRequest& request) const;
   bool DeleteRequestInfo(const blink::WebUserMediaRequest& request);
   void DelayedGetUserMediaRequestSucceeded(const blink::WebMediaStream& stream,
                                            blink::WebUserMediaRequest request);
@@ skipping 80 matching lines @@
 
   // Returns true if we do find and remove the |source|.
   // Otherwise returns false.
   bool RemoveLocalSource(const blink::WebMediaStreamSource& source);
 
   void StopLocalSource(const blink::WebMediaStreamSource& source,
                        bool notify_dispatcher);
 
   const ::mojom::MediaDevicesDispatcherHostPtr& GetMediaDevicesDispatcher();
 
-  void SelectAudioInputDevice(
+  // TODO(guidou): Remove these functions. http://crbug.com/706408
+  void LegacySetupAudioInput();
+  void LegacySelectAudioInputDevice(
       const blink::WebUserMediaRequest& user_media_request,
       const EnumerationResult& device_enumeration);
 
+  void SetupAudioInput(const blink::WebUserMediaRequest& user_media_request);
+  void SelectAudioSettings(const blink::WebUserMediaRequest& user_media_request,
+                           std::vector<::mojom::AudioInputDeviceCapabilitiesPtr>
+                               audio_input_capabilities);
+
   void SetupVideoInput(const blink::WebUserMediaRequest& user_media_request);
-
   void SelectVideoDeviceSettings(
       const blink::WebUserMediaRequest& user_media_request,
       std::vector<::mojom::VideoInputDeviceCapabilitiesPtr>
           video_input_capabilities);
-
   void FinalizeSelectVideoDeviceSettings(
       const blink::WebUserMediaRequest& user_media_request,
       const VideoCaptureSettings& settings);
-
   void FinalizeSelectVideoContentSettings(
       const blink::WebUserMediaRequest& user_media_request,
       const VideoCaptureSettings& settings);
 
   void GenerateStreamForCurrentRequestInfo();
 
   // Callback invoked by MediaDevicesEventDispatcher when a device-change
   // notification arrives.
   void DevicesChanged(MediaDeviceType device_type,
                       const MediaDeviceInfoArray& device_infos);
@@ skipping 31 matching lines @@
   // Note: This member must be the last to ensure all outstanding weak pointers
   // are invalidated first.
   base::WeakPtrFactory<UserMediaClientImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_