Introduce ResourceRequesterInfo to abstract the requester of resource request

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 1d4435b0419b32557f1bf795a97c952286f133f1..a9b705afeb672bc694cb41f282eea78e9f0540e1 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -239,7 +239,6 @@ class TestFilterSpecifyingChild : public ResourceMessageFilter {
                                      int process_id)
       : ResourceMessageFilter(
             process_id,
-            PROCESS_TYPE_RENDERER,
             NULL,
             NULL,
             NULL,
@@ -984,9 +983,7 @@ class ResourceDispatcherHostTest : public testing::TestWithParam<TestConfig>,
 
   void CancelRequest(int request_id);
   void RendererCancelRequest(int request_id) {
-    ResourceMessageFilter* old_filter = SetFilter(filter_.get());
-    host_.OnCancelRequest(request_id);
-    SetFilter(old_filter);
+    host_.OnCancelRequest(filter_.get(), request_id);
   }
 
   void CompleteStartRequest(int request_id);
@@ -1041,14 +1038,6 @@ class ResourceDispatcherHostTest : public testing::TestWithParam<TestConfig>,
         base::Bind(&GenerateIPCMessage, filter_, base::Passed(&ack)));
   }
 
-  // Setting filters for testing renderer messages.
-  // Returns the previous filter.
-  ResourceMessageFilter* SetFilter(ResourceMessageFilter* new_filter) {
-    ResourceMessageFilter* old_filter = host_.filter_;
-    host_.filter_ = new_filter;
-    return old_filter;
-  }
-
   void WaitForRequestComplete() {
     DCHECK(!wait_for_request_complete_loop_);
     wait_for_request_complete_loop_.reset(new base::RunLoop);
@@ -1571,11 +1560,9 @@ TEST_P(ResourceDispatcherHostTest, DeletedFilterDetached) {
       host_.GetURLRequest(GlobalRequestID(filter_->child_id(), 1)));
   ResourceRequestInfoImpl* info_ping = ResourceRequestInfoImpl::ForRequest(
       host_.GetURLRequest(GlobalRequestID(filter_->child_id(), 2)));
-  DCHECK_EQ(filter_.get(), info_prefetch->filter());
-  DCHECK_EQ(filter_.get(), info_ping->filter());
+  DCHECK_EQ(filter_.get(), info_prefetch->requester_info().filter());
+  DCHECK_EQ(filter_.get(), info_ping->requester_info().filter());
   filter_->OnChannelClosing();
-  info_prefetch->filter_.reset();
-  info_ping->filter_.reset();
 
   // From the renderer's perspective, the requests were cancelled.
   ResourceIPCAccumulator::ClassifiedMessages msgs;
@@ -1618,8 +1605,7 @@ TEST_P(ResourceDispatcherHostTest, DeletedFilterDetachedRedirect) {
   GlobalRequestID global_request_id(filter_->child_id(), 1);
   ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(
       host_.GetURLRequest(global_request_id));
-  info->filter_->OnChannelClosing();
-  info->filter_.reset();
+  info->requester_info().filter()->OnChannelClosing();
 
   // From the renderer's perspective, the request was cancelled.
   ResourceIPCAccumulator::ClassifiedMessages msgs;
@@ -3058,7 +3044,7 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationWithTwoRedirects) {
   EXPECT_EQ(second_filter->child_id(), info->GetChildID());
   EXPECT_EQ(new_render_view_id, info->GetRouteID());
   EXPECT_EQ(new_request_id, info->GetRequestID());
-  EXPECT_EQ(second_filter.get(), info->filter());
+  EXPECT_EQ(second_filter.get(), info->requester_info().filter());
 
   // Let request complete.
   base::RunLoop().RunUntilIdle();
@@ -3717,9 +3703,10 @@ TEST_P(ResourceDispatcherHostTest, SyncLoadWithMojoSuccess) {
   bool called = false;
   bool was_null = false;
   SyncLoadResult result;
-  host_.OnSyncLoadWithMojo(0, 1, request, filter_.get(),
-                           base::Bind(&StoreSyncLoadResult,
-                                      &called, &was_null, &result));
+  host_.OnSyncLoadWithMojo(
+      0, 1, request,
+      ResourceRequesterInfo::CreateForRenderer(filter_->GetWeakPtr()),
+      base::Bind(&StoreSyncLoadResult, &called, &was_null, &result));
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(called);
   EXPECT_FALSE(was_null);
@@ -3734,9 +3721,10 @@ TEST_P(ResourceDispatcherHostTest, SyncLoadWithMojoError) {
   bool called = false;
   bool was_null = false;
   SyncLoadResult result;
-  host_.OnSyncLoadWithMojo(0, 1, request, filter_.get(),
-                           base::Bind(&StoreSyncLoadResult,
-                                      &called, &was_null, &result));
+  host_.OnSyncLoadWithMojo(
+      0, 1, request,
+      ResourceRequesterInfo::CreateForRenderer(filter_->GetWeakPtr()),
+      base::Bind(&StoreSyncLoadResult, &called, &was_null, &result));
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(called);
   EXPECT_FALSE(was_null);
@@ -3751,9 +3739,10 @@ TEST_P(ResourceDispatcherHostTest, SyncLoadWithMojoCancel) {
   bool called = false;
   bool was_null = false;
   SyncLoadResult result;
-  host_.OnSyncLoadWithMojo(0, 1, request, filter_.get(),
-                           base::Bind(&StoreSyncLoadResult,
-                                      &called, &was_null, &result));
+  host_.OnSyncLoadWithMojo(
+      0, 1, request,
+      ResourceRequesterInfo::CreateForRenderer(filter_->GetWeakPtr()),
+      base::Bind(&StoreSyncLoadResult, &called, &was_null, &result));
   host_.CancelRequestsForProcess(filter_->child_id());
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(called);