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

Unified Diff: content/renderer/pepper/content_decryptor_delegate.cc

Issue 297703002: Using GURL in place of std::string for destination_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 7 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/renderer/pepper/content_decryptor_delegate.cc
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index a36cf6f353965d041c421e3f538bd81c708c6b0b..38c0293f24cfefbc84c18b80ba4d194be363cbe7 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -591,6 +591,7 @@ void ContentDecryptorDelegate::OnSessionCreated(uint32 session_id,
void ContentDecryptorDelegate::OnSessionMessage(uint32 session_id,
PP_Var message_var,
PP_Var default_url_var) {
+ // TODO(amogh.bihani): Replace all the default_url with destination_url.
if (session_message_cb_.is_null())
return;
@@ -609,7 +610,14 @@ void ContentDecryptorDelegate::OnSessionMessage(uint32 session_id,
return;
}
- session_message_cb_.Run(session_id, message, default_url_string->value());
+ GURL verified_gurl = GURL(default_url_string->value());
+ if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) {
+ DLOG(WARNING) << "SessionMessage default_url is invalid : "
+ << verified_gurl.possibly_invalid_spec();
+ verified_gurl = GURL::EmptyGURL(); // Replace invalid default_url.
+ }
+
+ session_message_cb_.Run(session_id, message, verified_gurl);
}
void ContentDecryptorDelegate::OnSessionReady(uint32 session_id) {
« no previous file with comments | « content/renderer/media/webcontentdecryptionmodulesession_impl.cc ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698