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

content/browser/renderer_host/media/media_stream_ui_proxy.cc

 // Copyright 2013 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/browser/renderer_host/media/media_stream_ui_proxy.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "media/capture/video/fake_video_capture_device.h"
+#include "url/gurl.h"
+#include "url/origin.h"
 
 namespace content {
 
+namespace {
+
+GURL ConvertToGURL(const url::Origin& origin) {
+  return origin.unique() ? GURL() : GURL(origin.Serialize());
+}
+
+}  // namespace
+
 void SetAndCheckAncestorFlag(MediaStreamRequest* request) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* rfh =
       RenderFrameHostImpl::FromID(request->render_process_id,
                                   request->render_frame_id);
 
   if (rfh == NULL) {
     // RenderFrame destroyed before the request is handled?
     return;
   }
@@ skipping 156 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   response_callback_ = response_callback;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&Core::RequestAccess, base::Unretained(core_.get()),
                  base::Passed(&request)));
 }
 
 void MediaStreamUIProxy::CheckAccess(
-    const GURL& security_origin,
+    const url::Origin& security_origin,
     MediaStreamType type,
     int render_process_id,
     int render_frame_id,
     const base::Callback<void(bool)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   BrowserThread::PostTaskAndReplyWithResult(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&Core::CheckAccess,
-                 base::Unretained(core_.get()),
-                 security_origin,
-                 type,
-                 render_process_id,
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&Core::CheckAccess, base::Unretained(core_.get()),
+                 ConvertToGURL(security_origin), type, render_process_id,
                  render_frame_id),
       base::Bind(&MediaStreamUIProxy::OnCheckedAccess,
-                 weak_factory_.GetWeakPtr(),
-                 callback));
+                 weak_factory_.GetWeakPtr(), callback));
 }
 
 void MediaStreamUIProxy::OnStarted(const base::Closure& stop_callback,
                                    const WindowIdCallback& window_id_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   stop_callback_ = stop_callback;
 
   // Owned by the PostTaskAndReply callback.
   gfx::NativeViewId* window_id = new gfx::NativeViewId(0);
@@ skipping 118 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&MediaStreamUIProxy::ProcessAccessRequestResponse,
                  weak_factory_.GetWeakPtr(),
                  devices_to_use,
                  devices_to_use.empty() ?
                      MEDIA_DEVICE_NO_HARDWARE :
                      MEDIA_DEVICE_OK));
 }
 
 void FakeMediaStreamUIProxy::CheckAccess(
-    const GURL& security_origin,
+    const url::Origin& security_origin,
     MediaStreamType type,
     int render_process_id,
     int render_frame_id,
     const base::Callback<void(bool)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
          type == MEDIA_DEVICE_VIDEO_CAPTURE);
 
   bool have_access = false;
   if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 10 matching lines @@
                  callback,
                  have_access));
   return;
 }
 
 void FakeMediaStreamUIProxy::OnStarted(
     const base::Closure& stop_callback,
     const WindowIdCallback& window_id_callback) {}
 
 }  // namespace content