Decouple IPC::MessageFilter from IPC::Channel

content/browser/loader/resource_dispatcher_host_unittest.cc

Index: content/browser/loader/resource_dispatcher_host_unittest.cc
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 0610a75dfba7a91ff5acf7727759ed5bf19ab6fe..75211e01540aca6e222587861adf122dcdf0b6d5 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -15,6 +15,7 @@
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "content/browser/browser_message_filter_peer.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/loader/cross_site_resource_handler.h"
@@ -216,9 +217,10 @@ class TestFilter : public ResourceMessageFilter {
             base::Bind(&TestFilter::GetContexts, base::Unretained(this))),
         resource_context_(resource_context),
         canceled_(false),
-        received_after_canceled_(0) {
+        received_after_canceled_(0),
+        peer_(new BrowserMessageFilterPeer(base::GetCurrentProcId())) {
     ChildProcessSecurityPolicyImpl::GetInstance()->Add(child_id());
-    set_peer_pid_for_testing(base::GetCurrentProcId());
+    OnFilterAddedToHost(peer_.get());
   }
 
   void set_canceled(bool canceled) { canceled_ = canceled; }
@@ -250,7 +252,7 @@ class TestFilter : public ResourceMessageFilter {
   ResourceContext* resource_context_;
   bool canceled_;
   int received_after_canceled_;
-
+  scoped_ptr<BrowserMessageFilterPeer> peer_;
   DISALLOW_COPY_AND_ASSIGN(TestFilter);
 };
 
@@ -1186,7 +1188,7 @@ TEST_F(ResourceDispatcherHostTest, DeletedFilterDetached) {
       host_.GetURLRequest(GlobalRequestID(filter_->child_id(), 2)));
   DCHECK_EQ(filter_.get(), info_prefetch->filter());
   DCHECK_EQ(filter_.get(), info_ping->filter());
-  filter_->OnChannelClosing();
+  filter_->OnSenderClosing();
   info_prefetch->filter_.reset();
   info_ping->filter_.reset();
 
@@ -1231,7 +1233,7 @@ TEST_F(ResourceDispatcherHostTest, DeletedFilterDetachedRedirect) {
   GlobalRequestID global_request_id(filter_->child_id(), 1);
   ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(
       host_.GetURLRequest(global_request_id));
-  info->filter_->OnChannelClosing();
+  info->filter_->OnSenderClosing();
   info->filter_.reset();
 
   // From the renderer's perspective, the request was cancelled.
@@ -2807,7 +2809,7 @@ TEST_F(ResourceDispatcherHostTest, ReleaseTemporiesOnProcessExit) {
       filter_->child_id(), file_path));
 
   // Let the process die.
-  filter_->OnChannelClosing();
+  filter_->OnSenderClosing();
   base::RunLoop().RunUntilIdle();
 
   // The file is no longer readable to the child and has been deleted.