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

Unified Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 301933002: Changing default_url to destination_url for consistency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing nit 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
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.h ('k') | content/renderer/pepper/content_decryptor_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index 6aa009a18f401e9d954f6649fbfd9c073f53c634..41e1e064100b5938674b7d239d0324af29ebc89c 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -1099,19 +1099,17 @@ void WebMediaPlayerImpl::OnKeyError(const std::string& session_id,
void WebMediaPlayerImpl::OnKeyMessage(const std::string& session_id,
const std::vector<uint8>& message,
- const std::string& default_url) {
+ const GURL& destination_url) {
DCHECK(main_loop_->BelongsToCurrentThread());
- const GURL default_url_gurl(default_url);
- DLOG_IF(WARNING, !default_url.empty() && !default_url_gurl.is_valid())
- << "Invalid URL in default_url: " << default_url;
+ DCHECK(destination_url.is_empty() || destination_url.is_valid());
client_->keyMessage(
WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
WebString::fromUTF8(session_id),
message.empty() ? NULL : &message[0],
message.size(),
- default_url_gurl);
+ destination_url);
}
void WebMediaPlayerImpl::DataSourceInitialized(const GURL& gurl, bool success) {
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.h ('k') | content/renderer/pepper/content_decryptor_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698