Rename content's UserMediaRequest to UserMediaRequestInfo

... so it does not collide with blink's conamed class, when
these files get Onion soup'ed.

BUG=704136
R=guidou@chromium.org

Change-Id: I93961b646cb79ff29d54a10f5114bb4866e029f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1731450
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Auto-Submit: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683236}

content/renderer/media/stream/user_media_client_impl.cc

@@ -51,7 +51,8 @@ void UpdateAPICount(blink::WebUserMediaRequest::MediaType media_type) {
 
 }  // namespace
 
-UserMediaClientImpl::Request::Request(std::unique_ptr<UserMediaRequest> request)
+UserMediaClientImpl::Request::Request(
+    std::unique_ptr<UserMediaRequestInfo> request)
     : user_media_request_(std::move(request)) {
   DCHECK(user_media_request_);
   DCHECK(apply_constraints_request_.IsNull());
@@ -95,7 +96,7 @@ UserMediaClientImpl::Request& UserMediaClientImpl::Request::operator=(
     Request&& other) = default;
 UserMediaClientImpl::Request::~Request() = default;
 
-std::unique_ptr<UserMediaRequest>
+std::unique_ptr<UserMediaRequestInfo>
 UserMediaClientImpl::Request::MoveUserMediaRequest() {
   return std::move(user_media_request_);
 }
@@ -171,8 +172,9 @@ void UserMediaClientImpl::RequestUserMedia(
       web_request.OwnerDocument().IsNull()
           ? nullptr
           : web_request.OwnerDocument().GetFrame());
-  std::unique_ptr<UserMediaRequest> request_info =
-      std::make_unique<UserMediaRequest>(request_id, web_request, user_gesture);
+  std::unique_ptr<UserMediaRequestInfo> request_info =
+      std::make_unique<UserMediaRequestInfo>(request_id, web_request,
+                                             user_gesture);
   pending_request_infos_.push_back(Request(std::move(request_info)));
   if (!is_processing_request_)
     MaybeProcessNextRequestInfo();
@@ -252,7 +254,7 @@ void UserMediaClientImpl::CancelUserMediaRequest(
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   {
     // TODO(guidou): Remove this conditional logging. https://crbug.com/764293
-    UserMediaRequest* request = user_media_processor_->CurrentRequest();
+    UserMediaRequestInfo* request = user_media_processor_->CurrentRequest();
     if (request && request->web_request == web_request) {
       blink::WebRtcLogMessage(base::StringPrintf(
           "UMCI::CancelUserMediaRequest. request_id=%d", request->request_id));

content/renderer/media/stream/user_media_client_impl.h

@@ -69,16 +69,16 @@ class CONTENT_EXPORT UserMediaClientImpl : public RenderFrameObserver,
  private:
   class Request {
    public:
-    explicit Request(std::unique_ptr<UserMediaRequest> request);
+    explicit Request(std::unique_ptr<UserMediaRequestInfo> request);
     explicit Request(const blink::WebApplyConstraintsRequest& request);
     explicit Request(const blink::WebMediaStreamTrack& request);
     Request(Request&& other);
     Request& operator=(Request&& other);
     ~Request();
 
-    std::unique_ptr<UserMediaRequest> MoveUserMediaRequest();
+    std::unique_ptr<UserMediaRequestInfo> MoveUserMediaRequest();
 
-    UserMediaRequest* user_media_request() const {
+    UserMediaRequestInfo* user_media_request() const {
       return user_media_request_.get();
     }
     const blink::WebApplyConstraintsRequest& apply_constraints_request() const {
@@ -95,7 +95,7 @@ class CONTENT_EXPORT UserMediaClientImpl : public RenderFrameObserver,
     bool IsStopTrack() const { return !web_track_to_stop_.IsNull(); }
 
    private:
-    std::unique_ptr<UserMediaRequest> user_media_request_;
+    std::unique_ptr<UserMediaRequestInfo> user_media_request_;
     blink::WebApplyConstraintsRequest apply_constraints_request_;
     blink::WebMediaStreamTrack web_track_to_stop_;
   };

content/renderer/media/stream/user_media_processor.cc

@@ -209,7 +209,7 @@ std::vector<blink::VideoInputDeviceCapabilities> ToVideoInputDeviceCapabilities(
 
 }  // namespace
 
-UserMediaRequest::UserMediaRequest(
+UserMediaRequestInfo::UserMediaRequestInfo(
     int request_id,
     const blink::WebUserMediaRequest& web_request,
     bool is_processing_user_gesture)
@@ -231,7 +231,7 @@ class UserMediaProcessor::RequestInfo
     GENERATED,
   };
 
-  explicit RequestInfo(std::unique_ptr<UserMediaRequest> request);
+  explicit RequestInfo(std::unique_ptr<UserMediaRequestInfo> request);
 
   void StartAudioTrack(const blink::WebMediaStreamTrack& track,
                        bool is_pending);
@@ -247,7 +247,7 @@ class UserMediaProcessor::RequestInfo
                             MediaStreamRequestResult result,
                             const blink::WebString& result_name);
 
-  UserMediaRequest* request() { return request_.get(); }
+  UserMediaRequestInfo* request() { return request_.get(); }
   int request_id() const { return request_->request_id; }
 
   State state() const { return state_; }
@@ -328,7 +328,7 @@ class UserMediaProcessor::RequestInfo
   // that |this| might be deleted when the function returns.
   void CheckAllTracksStarted();
 
-  std::unique_ptr<UserMediaRequest> request_;
+  std::unique_ptr<UserMediaRequestInfo> request_;
   State state_ = State::NOT_SENT_FOR_GENERATION;
   blink::AudioCaptureSettings audio_capture_settings_;
   bool is_audio_content_capture_ = false;
@@ -352,7 +352,7 @@ class UserMediaProcessor::RequestInfo
 // TODO(guidou): Initialize request_result_name_ as a null blink::WebString.
 // https://crbug.com/764293
 UserMediaProcessor::RequestInfo::RequestInfo(
-    std::unique_ptr<UserMediaRequest> request)
+    std::unique_ptr<UserMediaRequestInfo> request)
     : request_(std::move(request)),
       security_origin_(url::Origin(request_->web_request.GetSecurityOrigin())),
       request_result_name_("") {}
@@ -464,12 +464,12 @@ UserMediaProcessor::~UserMediaProcessor() {
   StopAllProcessing();
 }
 
-UserMediaRequest* UserMediaProcessor::CurrentRequest() {
+UserMediaRequestInfo* UserMediaProcessor::CurrentRequest() {
   return current_request_info_ ? current_request_info_->request() : nullptr;
 }
 
 void UserMediaProcessor::ProcessRequest(
-    std::unique_ptr<UserMediaRequest> request,
+    std::unique_ptr<UserMediaRequestInfo> request,
     base::OnceClosure callback) {
   DCHECK(!request_completed_cb_);
   DCHECK(!current_request_info_);

content/renderer/media/stream/user_media_processor.h

@@ -45,10 +45,10 @@ class RenderFrameImpl;
 
 // TODO(guidou): Add |request_id| and |is_processing_user_gesture| to
 // blink::WebUserMediaRequest and remove this struct.
-struct UserMediaRequest {
-  UserMediaRequest(int request_id,
-                   const blink::WebUserMediaRequest& web_request,
-                   bool is_processing_user_gesture);
+struct UserMediaRequestInfo {
+  UserMediaRequestInfo(int request_id,
+                       const blink::WebUserMediaRequest& web_request,
+                       bool is_processing_user_gesture);
   const int request_id;
   const blink::WebUserMediaRequest web_request;
   const bool is_processing_user_gesture;
@@ -78,13 +78,13 @@ class CONTENT_EXPORT UserMediaProcessor
   // during the execution of a task on the main thread unless ProcessRequest or
   // DeleteWebRequest are invoked.
   // TODO(guidou): Remove this method. https://crbug.com/764293
-  UserMediaRequest* CurrentRequest();
+  UserMediaRequestInfo* CurrentRequest();
 
   // Starts processing |request| in order to create a new MediaStream. When
   // processing of |request| is complete, it notifies by invoking |callback|.
   // This method must be called only if there is no request currently being
   // processed.
-  void ProcessRequest(std::unique_ptr<UserMediaRequest> request,
+  void ProcessRequest(std::unique_ptr<UserMediaRequestInfo> request,
                       base::OnceClosure callback);
 
   // If |web_request| is the request currently being processed, stops processing