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

Unified Diff: media/blink/key_system_config_selector.cc

Issue 2382973002: Convert WebSecurityOrigin -> GURL without re-parsing the url (Closed)
Patch Set: rebase on #427122 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: media/blink/key_system_config_selector.cc
diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc
index dea69d9051e95be5e0010aff212cba7749daf27e..06e308ca21e6eeb2edc007121908576bbeeb411f 100644
--- a/media/blink/key_system_config_selector.cc
+++ b/media/blink/key_system_config_selector.cc
@@ -22,6 +22,7 @@
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "url/gurl.h"
+#include "url/origin.h"
namespace media {
@@ -899,8 +900,7 @@ void KeySystemConfigSelector::SelectConfigInternal(
{
// Note: the GURL must not be constructed inline because
// base::Passed(&request) sets |request| to null.
- GURL security_origin(
- blink::WebStringToGURL(request->security_origin.toString()));
+ GURL security_origin(url::Origin(request->security_origin).GetURL());
media_permission_->RequestPermission(
MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin,
base::Bind(&KeySystemConfigSelector::OnPermissionResult,
« no previous file with comments | « content/renderer/shared_worker/embedded_shared_worker_stub.cc ('k') | media/blink/webcontentdecryptionmodule_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698