Serialize processing of getUserMedia() requests.

content/renderer/media/user_media_client_impl_unittest.cc

 // 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.
 
 #include "content/renderer/media/user_media_client_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 290 matching lines @@
 
   MockMediaStreamVideoCapturerSource* last_created_video_source() const {
     return video_source_;
   }
 
   RequestState request_state() const { return state_; }
   content::MediaStreamRequestResult error_reason() const { return result_; }
   blink::WebString error_name() const { return result_name_; }
 
   // Access to the request queue for testing.
-  bool UserMediaRequestHasAutomaticDeviceSelection(int request_id) {
-    auto* request = FindUserMediaRequestInfo(request_id);
-    EXPECT_TRUE(request != nullptr);
-    return request && request->enable_automatic_output_device_selection;
-  }
-
-  void DeleteRequest(int request_id) {
-    auto* request = FindUserMediaRequestInfo(request_id);
-    DeleteUserMediaRequestInfo(request);
+  bool UserMediaRequestHasAutomaticDeviceSelection() {
+    base::Optional<bool> enabled =
+        AutomaticOutputDeviceSelectionEnabledForCurrentRequest();
+    EXPECT_TRUE(enabled);
+    return *enabled;
   }
 
  private:
   blink::WebMediaStream last_generated_stream_;
   RequestState state_;
   content::MediaStreamRequestResult result_;
   blink::WebString result_name_;
   blink::WebVector<blink::WebMediaDeviceInfo> last_devices_;
   PeerConnectionDependencyFactory* factory_;
   bool create_source_that_fails_;
@@ skipping 85 matching lines @@
   }
 
   bool AudioRequestHasAutomaticDeviceSelection(
       const blink::WebMediaConstraints& audio_constraints) {
     blink::WebMediaConstraints null_constraints;
     blink::WebUserMediaRequest request =
         blink::WebUserMediaRequest::createForTesting(audio_constraints,
                                                      null_constraints);
     user_media_client_impl_->RequestUserMediaForTest(request);
     bool result =
-        user_media_client_impl_->UserMediaRequestHasAutomaticDeviceSelection(
-            ms_dispatcher_->audio_input_request_id());
-    user_media_client_impl_->DeleteRequest(
-        ms_dispatcher_->audio_input_request_id());
+        user_media_client_impl_->UserMediaRequestHasAutomaticDeviceSelection();
+    user_media_client_impl_->cancelUserMediaRequest(request);
     return result;
   }
 
   void TestValidRequestWithConstraints(
       const blink::WebMediaConstraints& audio_constraints,
       const blink::WebMediaConstraints& video_constraints,
       const std::string& expected_audio_device_id,
       const std::string& expected_video_device_id) {
     DCHECK(!audio_constraints.isNull());
     DCHECK(!video_constraints.isNull());
@@ skipping 306 matching lines @@
   EXPECT_FALSE(device->groupId().isEmpty());
 
   // Verfify group IDs.
   EXPECT_TRUE(user_media_client_impl_->last_devices()[0].groupId().equals(
       user_media_client_impl_->last_devices()[4].groupId()));
   EXPECT_FALSE(user_media_client_impl_->last_devices()[1].groupId().equals(
       user_media_client_impl_->last_devices()[4].groupId()));
 }
 
 TEST_F(UserMediaClientImplTest, RenderToAssociatedSinkConstraint) {
-  // For a null UserMediaRequest (no audio requested), we expect false.
-  user_media_client_impl_->RequestUserMediaForTest();
+  // For a UserMediaRequest without audio, we expect false.
+  blink::WebUserMediaRequest request =
+      blink::WebUserMediaRequest::createForTesting(blink::WebMediaConstraints(),
+                                                   CreateDefaultConstraints());
+  user_media_client_impl_->RequestUserMediaForTest(request);
   EXPECT_FALSE(
-      user_media_client_impl_->UserMediaRequestHasAutomaticDeviceSelection(
-          ms_dispatcher_->audio_input_request_id()));
-  user_media_client_impl_->DeleteRequest(
-      ms_dispatcher_->audio_input_request_id());
+      user_media_client_impl_->UserMediaRequestHasAutomaticDeviceSelection());
+  user_media_client_impl_->cancelUserMediaRequest(request);
 
   // If audio is requested, but no constraint, it should be true.
   // Currently we expect it to be false due to a suspected bug in the
   // device-matching code causing issues with some sound adapters.
   // See crbug.com/604523
   MockConstraintFactory factory;
   blink::WebMediaConstraints audio_constraints =
       factory.CreateWebMediaConstraints();
   EXPECT_FALSE(AudioRequestHasAutomaticDeviceSelection(
       factory.CreateWebMediaConstraints()));
@@ skipping 158 matching lines @@
       CreateDeviceConstraints(kFakeAudioInputDeviceId1);
   blink::WebMediaConstraints video_constraints =
       CreateFacingModeConstraints("environment");
   // kFakeVideoInputDeviceId2 has environment facing mode.
   TestValidRequestWithConstraints(audio_constraints, video_constraints,
                                   kFakeAudioInputDeviceId1,
                                   kFakeVideoInputDeviceId2);
 }
 
 }  // namespace content