Revert "[getUserMedia] Introduce timeout for video format queries."

This reverts commit 9be2d95a.

Reason for revert: Does not fix the issue. The actual timeout detection should be elsewhere.

Original change's description:
> [getUserMedia] Introduce timeout for video format queries.
> 
> This CL causes getUserMedia() to fail if requesting video formats
> exceeds a timeout.
> This is suspect of causing getUserMedia() hangs in some environments
> such as virtual machines.
> 
> Drive-by: Add some comments, a thread check, and some extra WebRTC
> logging.
> 
> Bug: 1044974
> Change-Id: I87f7687c491b4a502f4dba57d2c57bc53cb81390
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015249
> Reviewed-by: Armando Miraglia <armax@chromium.org>
> Commit-Queue: Guido Urdaneta <guidou@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#734493}

TBR=guidou@chromium.org,armax@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1044974
Change-Id: I21c0ba8ab734b2e4b132f7f6409631e81660d375
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062969Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Armando Miraglia <armax@chromium.org>
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742552}

third_party/blink/renderer/modules/mediastream/user_media_processor.cc

@@ -15,7 +15,6 @@
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/time/time.h"
 #include "media/base/audio_parameters.h"
 #include "media/capture/video_capture_types.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
@@ -46,7 +45,6 @@
 #include "third_party/blink/renderer/platform/mediastream/media_constraints.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_audio_source.h"
 #include "third_party/blink/renderer/platform/mediastream/webrtc_uma_histograms.h"
-#include "third_party/blink/renderer/platform/scheduler/public/post_cancellable_task.h"
 #include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h"
 #include "third_party/blink/renderer/platform/video_capture/local_video_capturer_source.h"
 #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
@@ -152,14 +150,12 @@ std::string GetTrackSourceLogString(blink::MediaStreamAudioSource* source) {
 }
 
 std::string GetOnTrackStartedLogString(
-    int request_id,
     blink::WebPlatformMediaStreamSource* source,
     MediaStreamRequestResult result) {
   const MediaStreamDevice& device = source->device();
-  String str = String::Format(
-      "OnTrackStarted({request_id=%d}, {session_id=%s}, {result=%s})",
-      request_id, device.session_id().ToString().c_str(),
-      MediaStreamRequestResultToString(result));
+  String str = String::Format("OnTrackStarted({session_id=%s}, {result=%s})",
+                              device.session_id().ToString().c_str(),
+                              MediaStreamRequestResultToString(result));
   return str.Utf8();
 }
 
@@ -318,11 +314,6 @@ Vector<blink::VideoInputDeviceCapabilities> ToVideoInputDeviceCapabilities(
 
 }  // namespace
 
-// This timeout must be long enough to eliminate the possibility
-// of false-positive timeouts.
-const static base::TimeDelta kVideoInputFormatsTimeout =
-    base::TimeDelta::FromSeconds(45);
-
 UserMediaRequestInfo::UserMediaRequestInfo(
     int request_id,
     const blink::WebUserMediaRequest& web_request,
@@ -434,19 +425,6 @@ class UserMediaProcessor::RequestInfo final
     return request_->is_processing_user_gesture;
   }
 
-  bool all_video_input_formats_received() const {
-    return all_video_input_formats_received_;
-  }
-
-  void set_all_video_input_formats_timeout_task_handle(TaskHandle task_handle) {
-    all_video_input_formats_timeout_task_handle_ = std::move(task_handle);
-  }
-
-  void CancelAllVideoInputFormatsTimeout() {
-    all_video_input_formats_received_ = true;
-    all_video_input_formats_timeout_task_handle_.Cancel();
-  }
-
   void Trace(Visitor* visitor) {}
 
  private:
@@ -468,8 +446,6 @@ class UserMediaProcessor::RequestInfo final
   blink::WebMediaStream web_stream_;
   StreamControls stream_controls_;
   ResourcesReady ready_callback_;
-  bool all_video_input_formats_received_ = false;
-  TaskHandle all_video_input_formats_timeout_task_handle_;
   MediaStreamRequestResult request_result_ = MediaStreamRequestResult::OK;
   String request_result_name_;
   // Sources used in this request.
@@ -546,7 +522,7 @@ void UserMediaProcessor::RequestInfo::OnTrackStarted(
     blink::WebPlatformMediaStreamSource* source,
     MediaStreamRequestResult result,
     const blink::WebString& result_name) {
-  SendLogMessage(GetOnTrackStartedLogString(request_id(), source, result));
+  SendLogMessage(GetOnTrackStartedLogString(source, result));
   auto** it = std::find(sources_waiting_for_callback_.begin(),
                         sources_waiting_for_callback_.end(), source);
   DCHECK(it != sources_waiting_for_callback_.end());
@@ -1016,23 +992,13 @@ void UserMediaProcessor::OnStreamGenerated(
     GetMediaDevicesDispatcher()->GetAllVideoInputDeviceFormats(
         video_device_id,
         WTF::Bind(&UserMediaProcessor::GotAllVideoInputFormatsForDevice,
-                  WrapWeakPersistent(this), /*success=*/true,
+                  WrapWeakPersistent(this),
                   current_request_info_->web_request(), label,
                   video_device_id));
-    TaskHandle timeout_task_handle = PostDelayedCancellableTask(
-        *task_runner_, FROM_HERE,
-        WTF::Bind(&UserMediaProcessor::GotAllVideoInputFormatsForDevice,
-                  WrapWeakPersistent(this), /*success=*/false,
-                  current_request_info_->web_request(), label, video_device_id,
-                  Vector<media::VideoCaptureFormat>()),
-        kVideoInputFormatsTimeout);
-    current_request_info_->set_all_video_input_formats_timeout_task_handle(
-        std::move(timeout_task_handle));
   }
 }
 
 void UserMediaProcessor::GotAllVideoInputFormatsForDevice(
-    bool success,
     const blink::WebUserMediaRequest& web_request,
     const String& label,
     const String& device_id,
@@ -1044,24 +1010,11 @@ void UserMediaProcessor::GotAllVideoInputFormatsForDevice(
   if (!IsCurrentRequestInfo(web_request))
     return;
 
-  SendLogMessage(base::StringPrintf(
-      "GotAllVideoInputFormatsForDevice({request_id=%d}, "
-      "{label=%s}, {device=[id: %s]}, {success=%d})",
-      current_request_info_->request_id(), label.Utf8().c_str(),
-      device_id.Utf8().c_str(), success));
-  if (!success) {
-    if (!current_request_info_->all_video_input_formats_received()) {
-      // Fail, since the request for video input formats timed out.
-      GetUserMediaRequestFailed(
-          MediaStreamRequestResult::TRACK_START_FAILURE_VIDEO);
-      DeleteWebRequest(current_request_info_->web_request());
-    }
-    // If input formats were successfully received already, there is nothing
-    // left to do.
-    return;
-  }
-
-  current_request_info_->CancelAllVideoInputFormatsTimeout();
+  SendLogMessage(
+      base::StringPrintf("GotAllVideoInputFormatsForDevice({request_id=%d}, "
+                         "{label=%s}, {device=[id: %s]})",
+                         current_request_info_->request_id(),
+                         label.Utf8().c_str(), device_id.Utf8().c_str()));
   current_request_info_->AddNativeVideoFormats(device_id, formats);
   if (current_request_info_->CanStartTracks())
     StartTracks(label);
@@ -1140,7 +1093,6 @@ void UserMediaProcessor::NotifyCurrentRequestInfoOfAudioSourceStarted(
     blink::WebPlatformMediaStreamSource* source,
     MediaStreamRequestResult result,
     const String& result_name) {
-  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   // The only request possibly being processed is |current_request_info_|.
   if (current_request_info_)
     current_request_info_->OnAudioSourceStarted(source, result, result_name);

third_party/blink/renderer/modules/mediastream/user_media_processor.h

@@ -146,7 +146,6 @@ class MODULES_EXPORT UserMediaProcessor
                          const Vector<blink::MediaStreamDevice>& video_devices);
 
   void GotAllVideoInputFormatsForDevice(
-      bool success,
       const blink::WebUserMediaRequest& web_request,
       const String& label,
       const String& device_id,
@@ -294,9 +293,6 @@ class MODULES_EXPORT UserMediaProcessor
   // contains the request currently being processed.
   Member<RequestInfo> current_request_info_;
   MediaDevicesDispatcherCallback media_devices_dispatcher_cb_;
-
-  // |request_completed_cb_| is invoked when the processing of
-  // |current_request_info_| is completed.
   base::OnceClosure request_completed_cb_;
 
   Member<LocalFrame> frame_;