Use url::Origin to represent security origins in MediaStream-related code.

content/renderer/media/user_media_client_impl.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 <utility>
 #include <vector>
@@ skipping 187 matching lines @@
   UpdateWebRTCMethodCount(WEBKIT_GET_USER_MEDIA);
   DCHECK(CalledOnValidThread());
 
   if (RenderThreadImpl::current()) {
     RenderThreadImpl::current()->peer_connection_tracker()->TrackGetUserMedia(
         user_media_request);
   }
 
   int request_id = g_next_request_id++;
   StreamControls controls;
-  GURL security_origin;
+  url::Origin security_origin;
   bool enable_automatic_output_device_selection = false;
 
   // |user_media_request| can't be mocked. So in order to test at all we check
   // if it isNull.
   if (user_media_request.isNull()) {
     // We are in a test.
     controls.audio.requested = true;
     controls.video.requested = true;
   } else {
     if (user_media_request.audio()) {
       controls.audio.requested = true;
       // Check if this input device should be used to select a matching output
       // device for audio rendering.
       enable_automatic_output_device_selection = true;  // On by default.
       GetConstraintValueAsBoolean(
           user_media_request.audioConstraints(),
           &blink::WebMediaTrackConstraintSet::renderToAssociatedSink,
           &enable_automatic_output_device_selection);
     }
     if (user_media_request.video()) {
       controls.video.requested = true;
     }
     CopyBlinkRequestToStreamControls(user_media_request, &controls);
-    security_origin = blink::WebStringToGURL(
-        user_media_request.getSecurityOrigin().toString());
+    security_origin = user_media_request.getSecurityOrigin();
     // ownerDocument may be null if we are in a test.
     // In that case, it's OK to not check frame().
     DCHECK(user_media_request.ownerDocument().isNull() ||
            render_frame()->GetWebFrame() ==
                static_cast<blink::WebFrame*>(
                    user_media_request.ownerDocument().frame()));
   }
 
   DVLOG(1) << "UserMediaClientImpl::requestUserMedia(" << request_id << ", [ "
            << "audio=" << (controls.audio.requested)
            << " select associated sink: "
            << enable_automatic_output_device_selection
            << ", video=" << (controls.video.requested) << " ], "
-           << security_origin.spec() << ")";
+           << security_origin << ")";
 
   std::string audio_device_id;
   if (!user_media_request.isNull() && user_media_request.audio()) {
     GetConstraintValueAsString(user_media_request.audioConstraints(),
                                &blink::WebMediaTrackConstraintSet::deviceId,
                                &audio_device_id);
   }
 
   std::string video_device_id;
   if (!user_media_request.isNull() && user_media_request.video()) {
@@ skipping 34 matching lines @@
   UpdateWebRTCMethodCount(WEBKIT_GET_MEDIA_DEVICES);
   DCHECK(CalledOnValidThread());
 
   int audio_input_request_id = g_next_request_id++;
   int video_input_request_id = g_next_request_id++;
   int audio_output_request_id = g_next_request_id++;
 
   // |media_devices_request| can't be mocked, so in tests it will be empty (the
   // underlying pointer is null). In order to use this function in a test we
   // need to check if it isNull.
-  GURL security_origin;
-  if (!media_devices_request.isNull()) {
-    security_origin = blink::WebStringToGURL(
-        media_devices_request.getSecurityOrigin().toString());
-  }
+  url::Origin security_origin;
+  if (!media_devices_request.isNull())
+    security_origin = media_devices_request.getSecurityOrigin();
 
   DVLOG(1) << "UserMediaClientImpl::requestMediaDevices("
-           << audio_input_request_id
-           << ", " << video_input_request_id << ", " << audio_output_request_id
-           << ", " << security_origin.spec() << ")";
+           << audio_input_request_id << ", " << video_input_request_id << ", "
+           << audio_output_request_id << ", " << security_origin << ")";
 
   media_devices_requests_.push_back(new MediaDevicesRequestInfo(
       media_devices_request,
       audio_input_request_id,
       video_input_request_id,
       audio_output_request_id));
 
   media_stream_dispatcher_->EnumerateDevices(
       audio_input_request_id,
       weak_factory_.GetWeakPtr(),
@@ skipping 28 matching lines @@
   // We don't call UpdateWebRTCMethodCount() here to track the API count in UMA
   // stats. This is instead counted in MediaStreamTrack::getSources in blink.
   DCHECK(CalledOnValidThread());
 
   int audio_input_request_id = g_next_request_id++;
   int video_input_request_id = g_next_request_id++;
 
   // |sources_request| can't be mocked, so in tests it will be empty (the
   // underlying pointer is null). In order to use this function in a test we
   // need to check if it isNull.
-  GURL security_origin;
+  url::Origin security_origin;
   if (!sources_request.isNull())
-    security_origin = GURL(sources_request.origin().utf8());
+    security_origin = sources_request.origin();
 
-  DVLOG(1) << "UserMediaClientImpl::requestSources("
-           << audio_input_request_id
-           << ", " << video_input_request_id
-           << ", " << security_origin.spec() << ")";
+  DVLOG(1) << "UserMediaClientImpl::requestSources(" << audio_input_request_id
+           << ", " << video_input_request_id << ", " << security_origin << ")";
 
   media_devices_requests_.push_back(new MediaDevicesRequestInfo(
       sources_request,
       audio_input_request_id,
       video_input_request_id));
 
   media_stream_dispatcher_->EnumerateDevices(
       audio_input_request_id,
       weak_factory_.GetWeakPtr(),
       MEDIA_DEVICE_AUDIO_CAPTURE,
@@ skipping 779 matching lines @@
       return;
     }
   }
 }
 
 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const {
   return !sources_waiting_for_callback_.empty();
 }
 
 }  // namespace content