Using GURL in place of std::string for destination_url

content/browser/media/android/browser_media_player_manager.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/browser/media/android/browser_media_player_manager.h"
 
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "content/browser/android/content_view_core_impl.h"
@@ skipping 373 matching lines @@
     uint32 session_id,
     const std::string& web_session_id) {
   Send(new CdmMsg_SessionCreated(
       routing_id(), cdm_id, session_id, web_session_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionMessage(
     int cdm_id,
     uint32 session_id,
     const std::vector<uint8>& message,
-    const std::string& destination_url) {
-  GURL destination_gurl(destination_url);
-  if (!destination_gurl.is_valid() && !destination_gurl.is_empty()) {
+    const GURL& destination_url) {
+  GURL verified_gurl = destination_url;
+  if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) {

[xhwang, 2014/05/22 18:44:52]

This seems redundant on Android. But I think keeping it here is actually a good
idea because this will also be used by other platforms in the future. Since this
is the browser process, we need to be careful in handling error cases.

No changes required here :)

     DLOG(WARNING) << "SessionMessage destination_url is invalid : "
-                  << destination_gurl.possibly_invalid_spec();
-    destination_gurl = GURL::EmptyGURL();  // Replace invalid destination_url.
+                  << destination_url.possibly_invalid_spec();
+    verified_gurl = GURL::EmptyGURL();  // Replace invalid destination_url.
   }
 
   Send(new CdmMsg_SessionMessage(
-      routing_id(), cdm_id, session_id, message, destination_gurl));
+      routing_id(), cdm_id, session_id, message, verified_gurl));
 }
 
 void BrowserMediaPlayerManager::OnSessionReady(int cdm_id, uint32 session_id) {
   Send(new CdmMsg_SessionReady(routing_id(), cdm_id, session_id));
 }
 
 void BrowserMediaPlayerManager::OnSessionClosed(int cdm_id, uint32 session_id) {
   Send(new CdmMsg_SessionClosed(routing_id(), cdm_id, session_id));
 }
 
@@ skipping 478 matching lines @@
 #if defined(VIDEO_HOLE)
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player && player->IsSurfaceInUse())
     return;
   if (external_video_surface_container_)
     external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
 #endif  // defined(VIDEO_HOLE)
 }
 
 }  // namespace content