Index: content/renderer/media/android/webmediaplayer_android.cc |
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc |
index 629f9852ce59d2089133becc222e47693996196d..f72fd61a925edfbbe8517b2abf97c91c8bc39a84 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.cc |
+++ b/content/renderer/media/android/webmediaplayer_android.cc |
@@ -20,6 +20,7 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "cc/blink/web_layer_impl.h" |
#include "cc/layers/video_layer.h" |
+#include "content/public/child/url_conversion.h" |
#include "content/public/common/content_client.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/common/renderer_preferences.h" |
@@ -306,8 +307,9 @@ void WebMediaPlayerAndroid::DoLoad(LoadType load_type, |
CORSMode cors_mode) { |
DCHECK(main_thread_checker_.CalledOnValidThread()); |
- media::ReportMetrics(load_type, GURL(url), |
- GURL(frame_->document().securityOrigin().toString())); |
+ media::ReportMetrics( |
+ load_type, GURL(url), |
+ WebStringToGURL(frame_->document().securityOrigin().toString())); |
switch (load_type) { |
case LoadTypeURL: |
@@ -1611,7 +1613,8 @@ WebMediaPlayerAndroid::GenerateKeyRequestInternal( |
base::Bind(&WebMediaPlayerAndroid::OnKeyMessage, |
weak_factory_.GetWeakPtr()))); |
- GURL security_origin(frame_->document().securityOrigin().toString()); |
+ GURL security_origin( |
+ WebStringToGURL(frame_->document().securityOrigin().toString())); |
proxy_decryptor_->CreateCdm( |
cdm_factory_, key_system, security_origin, |
base::Bind(&WebMediaPlayerAndroid::OnCdmContextReady, |
@@ -1959,7 +1962,7 @@ void WebMediaPlayerAndroid::ReportHLSMetrics() const { |
UMA_HISTOGRAM_BOOLEAN("Media.Android.IsHttpLiveStreamingMedia", is_hls); |
if (is_hls) { |
media::RecordOriginOfHLSPlayback( |
- GURL(frame_->document().securityOrigin().toString())); |
+ WebStringToGURL(frame_->document().securityOrigin().toString())); |
} |
// Assuming that |is_hls| is the ground truth, test predictions. |