Create a ResourceMessageFilter to filter resource related IPCs. This gets ri...

chrome/browser/renderer_host/sync_resource_handler.cc

 // Copyright (c) 2010 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 "chrome/browser/renderer_host/sync_resource_handler.h"
 
 #include "base/logging.h"
 #include "chrome/browser/debugger/devtools_netlog_observer.h"
 #include "chrome/browser/net/load_timing_observer.h"
 #include "chrome/browser/renderer_host/global_request_id.h"
+#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
+#include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/common/render_messages.h"
 #include "net/base/io_buffer.h"
 #include "net/http/http_response_headers.h"
 
 SyncResourceHandler::SyncResourceHandler(
-    ResourceDispatcherHost::Receiver* receiver,
-    int process_id,
+    ResourceMessageFilter* filter,
     const GURL& url,
     IPC::Message* result_message,
     ResourceDispatcherHost* resource_dispatcher_host)
     : read_buffer_(new net::IOBuffer(kReadBufSize)),
-      receiver_(receiver),
-      process_id_(process_id),
+      filter_(filter),
       result_message_(result_message),
       rdh_(resource_dispatcher_host) {
   result_.final_url = url;
 }
 
 SyncResourceHandler::~SyncResourceHandler() {
 }
 
 bool SyncResourceHandler::OnUploadProgress(int request_id,
                                            uint64 position,
                                            uint64 size) {
   return true;
 }
 
 bool SyncResourceHandler::OnRequestRedirected(int request_id,
                                               const GURL& new_url,
                                               ResourceResponse* response,
                                               bool* defer) {
   net::URLRequest* request = rdh_->GetURLRequest(
-      GlobalRequestID(process_id_, request_id));
+      GlobalRequestID(filter_->child_id(), request_id));
   LoadTimingObserver::PopulateTimingInfo(request, response);
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
   // TODO(darin): It would be much better if this could live in WebCore, but
   // doing so requires API changes at all levels.  Similar code exists in
   // WebCore/platform/network/cf/ResourceHandleCFNet.cpp :-(
   if (new_url.GetOrigin() != result_.final_url.GetOrigin()) {
     LOG(ERROR) << "Cross origin redirect denied";
     return false;
   }
   result_.final_url = new_url;
   return true;
 }
 
 bool SyncResourceHandler::OnResponseStarted(int request_id,
                                             ResourceResponse* response) {
   net::URLRequest* request = rdh_->GetURLRequest(
-      GlobalRequestID(process_id_, request_id));
+      GlobalRequestID(filter_->child_id(), request_id));
   LoadTimingObserver::PopulateTimingInfo(request, response);
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
 
   // We don't care about copying the status here.
   result_.headers = response->response_head.headers;
   result_.mime_type = response->response_head.mime_type;
   result_.charset = response->response_head.charset;
   result_.download_file_path = response->response_head.download_file_path;
   result_.request_time = response->response_head.request_time;
   result_.response_time = response->response_head.response_time;
@@ skipping 25 matching lines @@
   return true;
 }
 
 bool SyncResourceHandler::OnResponseCompleted(
     int request_id,
     const URLRequestStatus& status,
     const std::string& security_info) {
   result_.status = status;
 
   ViewHostMsg_SyncLoad::WriteReplyParams(result_message_, result_);
-  receiver_->Send(result_message_);
+  filter_->Send(result_message_);
   result_message_ = NULL;
   return true;
 }
 
 void SyncResourceHandler::OnRequestClosed() {
   if (!result_message_)
     return;
 
   result_message_->set_reply_error();
-  receiver_->Send(result_message_);
-  receiver_ = NULL;  // net::URLRequest is gone, and perhaps also the receiver.
+  filter_->Send(result_message_);
 }