Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1688)

Unified Diff: content/browser/renderer_host/media/media_stream_ui_proxy.cc

Issue 2385533002: Replace usage of GURL(origin.Serialize()) with origin.GetURL() (Closed)
Patch Set: sync to #424762 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/media_stream_ui_proxy.cc
diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy.cc b/content/browser/renderer_host/media/media_stream_ui_proxy.cc
index 9997a76e3e93b0cc7a68669276d50c02277ff91e..051a6471268eaaf35840338548e474121157031c 100644
--- a/content/browser/renderer_host/media/media_stream_ui_proxy.cc
+++ b/content/browser/renderer_host/media/media_stream_ui_proxy.cc
@@ -19,14 +19,6 @@
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 =
@@ -213,7 +205,7 @@ void MediaStreamUIProxy::CheckAccess(
BrowserThread::PostTaskAndReplyWithResult(
BrowserThread::UI, FROM_HERE,
base::Bind(&Core::CheckAccess, base::Unretained(core_.get()),
- ConvertToGURL(security_origin), type, render_process_id,
+ security_origin.GetURL(), type, render_process_id,
render_frame_id),
base::Bind(&MediaStreamUIProxy::OnCheckedAccess,
weak_factory_.GetWeakPtr(), callback));
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698