Changing default_url to destination_url for consistency

content/renderer/media/webmediaplayer_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 1081 matching lines @@
 
   client_->keyError(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id),
       static_cast<blink::WebMediaPlayerClient::MediaKeyErrorCode>(error_code),
       short_system_code);
 }
 
 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());

[teravest, 2014/06/02 14:25:34]

This should be !destination_url.is_valid(), right?

[AmoghBihani, 2014/06/02 16:23:52]

We want the URL to be either empty or valid. This is a negation of the earlier
code where we sent a warning when the URL was neither empty not valid, i.e.
filled with invalid characters.

 
   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) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   if (!success) {
     SetNetworkState(WebMediaPlayer::NetworkStateFormatError);
 
     // TODO(scherkus): This should be handled by HTMLMediaElement and controls
     // should know when to invalidate themselves http://crbug.com/337015
@@ skipping 250 matching lines @@
   compositor_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(&GetCurrentFrameAndSignal,
                                                base::Unretained(compositor_),
                                                &video_frame,
                                                &event));
   event.Wait();
   return video_frame;
 }
 
 }  // namespace content