Define parameter structs of resource messages out of resource_messages.h

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/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"
@@ skipping 199 matching lines @@
                    net::URLRequestContext** request_context) {
     *resource_context = resource_context_;
     *request_context = resource_context_->GetRequestContext();
   }
 
   ResourceContext* resource_context_;
 
   DISALLOW_COPY_AND_ASSIGN(BlackholeFilter);
 };
 
-ResourceHostMsg_Request CreateResourceRequest(const char* method,
-                                              ResourceType type,
-                                              const GURL& url) {
-  ResourceHostMsg_Request request;
+ResourceRequest CreateResourceRequest(const char* method,
+                                      ResourceType type,
+                                      const GURL& url) {
+  ResourceRequest request;
   request.method = std::string(method);
   request.url = url;
   request.first_party_for_cookies = url;  // Bypass third-party cookie blocking.
   request.referrer_policy = blink::WebReferrerPolicyDefault;
   request.load_flags = 0;
   request.origin_pid = 0;
   request.resource_type = type;
   request.request_context = 0;
   request.appcache_host_id = kAppCacheNoHostId;
   request.download_to_file = false;
@@ skipping 37 matching lines @@
     base::RunLoop().RunUntilIdle();
   }
 
   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) {
-    ResourceHostMsg_Request request =
+    ResourceRequest request =
         CreateResourceRequest("GET", RESOURCE_TYPE_SUB_RESOURCE, url);
     ResourceHostMsg_RequestResource msg(render_view_id, request_id, request);
     host_.OnMessageReceived(msg, filter_.get());
     base::RunLoop().RunUntilIdle();
   }
 
   void EnsureSchemeIsAllowed(const std::string& scheme) {
     ChildProcessSecurityPolicyImpl* policy =
         ChildProcessSecurityPolicyImpl::GetInstance();
     if (!policy->IsWebSafeScheme(scheme))
@@ skipping 15 matching lines @@
   net::URLRequest* url_request(
       host_.GetURLRequest(GlobalRequestID(filter_->child_id(), 1)));
   ASSERT_TRUE(url_request);
 
   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.
-  ResourceHostMsg_Request request = CreateResourceRequest(
+  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());
   base::RunLoop().RunUntilIdle();
 
   net::URLRequest* url_request(
       host_.GetURLRequest(GlobalRequestID(filter_->child_id(), 1)));
   ASSERT_TRUE(url_request);
 
   EXPECT_FALSE(url_request->load_flags() &
@@ skipping 195 matching lines @@
   // already completed.
   EXPECT_TRUE(NextRequestWasDestroyed());
 
   // But no others.
   EXPECT_TRUE(IsEmpty());
 }
 
 }  // namespace
 
 }  // namespace content