Make GetURLForDebugging return a const GURL

chrome/common/resource_dispatcher.cc

 // Copyright (c) 2006-2008 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "chrome/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 298 matching lines @@
     // this might happen for kill()ed requests on the webkit end, so perhaps
     // it shouldn't be a warning...
     DLOG(WARNING) << "Got upload progress for a nonexistant or "
         "finished request";
     return;
   }
 
   PendingRequestInfo& request_info = it->second;
 
   RESOURCE_LOG("Dispatching upload progress for " <<
-               request_info.peer->GetURLForDebugging());
+      request_info.peer->GetURLForDebugging().possibly_invalid_spec());
   request_info.peer->OnUploadProgress(position, size);
 
   // Acknowlegde reciept
   message_sender()->Send(
       new ViewHostMsg_UploadProgress_ACK(message.routing_id(), request_id));
 }
 
 void ResourceDispatcher::OnReceivedResponse(
     int request_id, const ResourceResponseHead& response_head) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
@@ skipping 14 matching lines @@
             NULL, peer,
             request_info.resource_type, response_head.mime_type,
             request_info.filter_policy,
             net::ERR_INSECURE_RESPONSE);
     if (new_peer) {
       request_info.peer = new_peer;
       peer = new_peer;
     }
   }
 
-  RESOURCE_LOG("Dispatching response for " << peer->GetURLForDebugging());
+  RESOURCE_LOG("Dispatching response for " <<
+      peer->GetURLForDebugging().possibly_invalid_spec());
   peer->OnReceivedResponse(response_head, false);
 }
 
 void ResourceDispatcher::OnReceivedData(const IPC::Message& message,
                                         int request_id,
                                         base::SharedMemoryHandle shm_handle,
                                         int data_len) {
   // Acknowledge the reception of this data.
   message_sender()->Send(
       new ViewHostMsg_DataReceived_ACK(message.routing_id(), request_id));
 
   const bool shm_valid = base::SharedMemory::IsHandleValid(shm_handle);
   DCHECK((shm_valid && data_len > 0) || (!shm_valid && !data_len));
   base::SharedMemory shared_mem(shm_handle, true);  // read only
 
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end()) {
     // this might happen for kill()ed requests on the webkit end, so perhaps
     // it shouldn't be a warning...
     DLOG(WARNING) << "Got data for a nonexistant or finished request";
     return;
   }
 
   PendingRequestInfo& request_info = it->second;
 
   if (data_len > 0 && shared_mem.Map(data_len)) {
     RESOURCE_LOG("Dispatching " << data_len << " bytes for " <<
-                 request_info.peer->GetURLForDebugging());
+        request_info.peer->GetURLForDebugging().possibly_invalid_spec());
     const char* data = static_cast<char*>(shared_mem.memory());
     request_info.peer->OnReceivedData(data, data_len);
   }
 }
 
 void ResourceDispatcher::OnReceivedRedirect(
     const IPC::Message& message,
     int request_id,
     const GURL& new_url,
     const webkit_glue::ResourceLoaderBridge::ResponseInfo& info) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end()) {
     // this might happen for kill()ed requests on the webkit end, so perhaps
     // it shouldn't be a warning...
     DLOG(WARNING) << "Got data for a nonexistant or finished request";
     return;
   }
 
   PendingRequestInfo& request_info = it->second;
 
   RESOURCE_LOG("Dispatching redirect for " <<
-               request_info.peer->GetURLForDebugging());
+               request_info.peer->GetURLForDebugging().possibly_invalid_spec());
 
   if (request_info.peer->OnReceivedRedirect(new_url, info)) {
     message_sender()->Send(
         new ViewHostMsg_FollowRedirect(message.routing_id(), request_id));
   } else {
     CancelPendingRequest(message.routing_id(), request_id);
   }
 }
 
 void ResourceDispatcher::OnRequestComplete(int request_id,
                                            const URLRequestStatus& status,
                                            const std::string& security_info) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end()) {
     // this might happen for kill()ed requests on the webkit end, so perhaps
     // it shouldn't be a warning...
     DLOG(WARNING) << "Got 'complete' for a nonexistant or finished request";
     return;
   }
 
   PendingRequestInfo& request_info = it->second;
   webkit_glue::ResourceLoaderBridge::Peer* peer = request_info.peer;
 
   RESOURCE_LOG("Dispatching complete for " <<
-               request_info.peer->GetURLForDebugging());
+               request_info.peer->GetURLForDebugging().possibly_invalid_spec());
 
   if (status.status() == URLRequestStatus::CANCELED &&
       status.os_error() != net::ERR_ABORTED) {
     // Resource canceled with a specific error are filtered.
     SecurityFilterPeer* new_peer =
         SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
             request_info.resource_type,
             request_info.peer,
             status.os_error());
     if (new_peer) {
@@ skipping 167 matching lines @@
   // handle or there will be a memory leak.
   if (message.type() == ViewMsg_Resource_DataReceived::ID) {
     base::SharedMemoryHandle shm_handle;
     if (IPC::ParamTraits<base::SharedMemoryHandle>::Read(&message,
                                                          &iter,
                                                          &shm_handle)) {
       base::SharedMemory::CloseHandle(shm_handle);
     }
   }
 }