Introduce ResourceRequesterInfo to abstract the requester of resource request

content/browser/loader/async_revalidation_manager_unittest.cc

 // Copyright 2015 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 "content/browser/loader/async_revalidation_manager.h"
 
 #include <deque>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory_handle.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader_delegate_impl.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_request.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/common/appcache_info.h"
-#include "content/public/common/process_type.h"
 #include "content/public/common/resource_type.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "ipc/ipc_param_traits.h"
 #include "net/base/load_flags.h"
 #include "net/base/network_delegate.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
@@ skipping 161 matching lines @@
     }
   }
 }
 
 // This filter just deletes any messages that are sent through it.
 class BlackholeFilter : public ResourceMessageFilter {
  public:
   explicit BlackholeFilter(ResourceContext* resource_context)
       : ResourceMessageFilter(
             ChildProcessHostImpl::GenerateChildProcessUniqueId(),
-            PROCESS_TYPE_RENDERER,
             nullptr,
             nullptr,
             nullptr,
             nullptr,
             base::Bind(&BlackholeFilter::GetContexts, base::Unretained(this))),
         resource_context_(resource_context) {
+    InitializeOnIOThread();
     ChildProcessSecurityPolicyImpl::GetInstance()->Add(child_id());
   }
 
   bool Send(IPC::Message* msg) override {
     std::unique_ptr<IPC::Message> take_ownership(msg);
     ReleaseHandlesInMessage(*msg);
     return true;
   }
 
  private:
@@ skipping 30 matching lines @@
   request.download_to_file = false;
   request.should_reset_appcache = false;
   request.is_main_frame = true;
   request.parent_is_main_frame = false;
   request.parent_render_frame_id = -1;
   request.transition_type = ui::PAGE_TRANSITION_LINK;
   request.allow_download = true;
   return request;
 }
 
+}  // namespace

[mmenke, 2016/11/21 19:51:55]

Why this change?

[horo, 2016/11/22 01:12:07]

Done.
reverted.

+
 class AsyncRevalidationManagerTest : public ::testing::Test {
  protected:
   AsyncRevalidationManagerTest(
       std::unique_ptr<net::TestNetworkDelegate> network_delegate)
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         network_delegate_(std::move(network_delegate)) {
     host_.SetLoaderDelegate(&loader_delegate_);
     browser_context_.reset(new TestBrowserContext());
     BrowserContext::EnsureResourceContextInitialized(browser_context_.get());
     base::RunLoop().RunUntilIdle();
@@ skipping 23 matching lines @@
   void SetResponse(const std::string& headers, const std::string& data) {
     job_factory_->SetResponse(headers, data);
   }
 
   // Creates a request using the current test object as the filter and
   // SubResource as the resource type.
   void MakeTestRequest(int render_view_id, int request_id, const GURL& url) {
     ResourceRequest request =
         CreateResourceRequest("GET", RESOURCE_TYPE_SUB_RESOURCE, url);
     ResourceHostMsg_RequestResource msg(render_view_id, request_id, request);
-    host_.OnMessageReceived(msg, filter_.get());
+    filter_->OnMessageReceived(msg);
     base::RunLoop().RunUntilIdle();
   }
 
   void EnsureSchemeIsAllowed(const std::string& scheme) {
     ChildProcessSecurityPolicyImpl* policy =
         ChildProcessSecurityPolicyImpl::GetInstance();
     if (!policy->IsWebSafeScheme(scheme))
       policy->RegisterWebSafeScheme(scheme);
   }
 
@@ skipping 16 matching lines @@
 
   EXPECT_TRUE(url_request->load_flags() & net::LOAD_SUPPORT_ASYNC_REVALIDATION);
 }
 
 TEST_F(AsyncRevalidationManagerTest, AsyncRevalidationNotSupportedForPOST) {
   SetResponse(net::URLRequestTestJob::test_headers(), "delay complete");
   // Create POST request.
   ResourceRequest request = CreateResourceRequest(
       "POST", RESOURCE_TYPE_SUB_RESOURCE, GURL("http://example.com/baz.php"));
   ResourceHostMsg_RequestResource msg(0, 1, request);
-  host_.OnMessageReceived(msg, filter_.get());
+  filter_->OnMessageReceived(msg);
   base::RunLoop().RunUntilIdle();
 
   net::URLRequest* url_request(
       host_.GetURLRequest(GlobalRequestID(filter_->child_id(), 1)));
   ASSERT_TRUE(url_request);
 
   EXPECT_FALSE(url_request->load_flags() &
                net::LOAD_SUPPORT_ASYNC_REVALIDATION);
 }
 
@@ skipping 189 matching lines @@
                net::LOAD_SUPPORT_ASYNC_REVALIDATION);
 
   // An async revalidation happens for the redirect. It has no body, so it has
   // already completed.
   EXPECT_TRUE(NextRequestWasDestroyed());
 
   // But no others.
   EXPECT_TRUE(IsEmpty());
 }
 
-}  // namespace
-
 }  // namespace content