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

chrome/browser/renderer_host/safe_browsing_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/safe_browsing_resource_handler.h"
 
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/global_request_id.h"
 #include "chrome/browser/renderer_host/render_message_filter.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
+#include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/base/io_buffer.h"
 
 // Maximum time in milliseconds to wait for the safe browsing service to
 // verify a URL. After this amount of time the outstanding check will be
 // aborted, and the URL will be treated as if it were safe.
 static const int kCheckUrlTimeoutMs = 5000;
 
 // TODO(eroman): Downgrade these CHECK()s to DCHECKs once there is more
 //               unit test coverage.
 
 SafeBrowsingResourceHandler::SafeBrowsingResourceHandler(
     ResourceHandler* handler,
-    int render_process_host_id,
     int render_view_id,
     ResourceType::Type resource_type,
     SafeBrowsingService* safe_browsing,
     ResourceDispatcherHost* resource_dispatcher_host,
-    ResourceDispatcherHost::Receiver* receiver)
+    ResourceMessageFilter* filter)
     : state_(STATE_NONE),
       defer_state_(DEFERRED_NONE),
       deferred_request_id_(-1),
       next_handler_(handler),
-      render_process_host_id_(render_process_host_id),
+      render_process_host_id_(filter->child_id()),
       render_view_id_(render_view_id),
       safe_browsing_(safe_browsing),
       rdh_(resource_dispatcher_host),
       resource_type_(resource_type) {
   registrar_.Add(this, NotificationType::RESOURCE_MESSAGE_FILTER_SHUTDOWN,
-                 Source<RenderMessageFilter>(
-                     static_cast<RenderMessageFilter*>(receiver)));
+                 NotificationService::AllSources());
 }
 
 SafeBrowsingResourceHandler::~SafeBrowsingResourceHandler() {
 }
 
 bool SafeBrowsingResourceHandler::OnUploadProgress(int request_id,
                                                    uint64 position,
                                                    uint64 size) {
   return next_handler_->OnUploadProgress(request_id, position, size);
 }
@@ skipping 147 matching lines @@
   } else {
     rdh_->CancelRequest(render_process_host_id_, deferred_request_id_, false);
   }
 
   Release();  // Balances the AddRef() in StartDisplayingBlockingPage().
 }
 
 void SafeBrowsingResourceHandler::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
-  DCHECK(type.value == NotificationType::RESOURCE_MESSAGE_FILTER_SHUTDOWN);
-  Shutdown();
+  if (Source<ResourceMessageFilter>(source).ptr()->child_id() ==
+          render_process_host_id_) {
+    Shutdown();
+  }
 }
 
 void SafeBrowsingResourceHandler::Shutdown() {
   if (state_ == STATE_CHECKING_URL) {
     timer_.Stop();
     safe_browsing_->CancelCheck(this);
     state_ = STATE_NONE;
     // Balance the AddRef() from CheckUrl() which would ordinarily be
     // balanced by OnUrlCheckResult().
     Release();
@@ skipping 82 matching lines @@
     rdh_->FollowDeferredRedirect(render_process_host_id_, request_id,
                                  false, GURL());
   }
 }
 
 void SafeBrowsingResourceHandler::ClearDeferredRequestInfo() {
   deferred_request_id_ = -1;
   deferred_url_ = GURL();
   deferred_redirect_response_ = NULL;
 }