Define parameter structs of resource messages out of resource_messages.h

content/browser/security_exploit_browsertest.cc

 // Copyright (c) 2013 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/frame_messages.h"
 #include "content/common/resource_messages.h"
+#include "content/common/resource_request.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/appcache_info.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_switches.h"
@@ skipping 68 matching lines @@
   else
     next_rfh = wc->GetRenderManagerForTesting()->pending_frame_host();
 
   EXPECT_TRUE(next_rfh);
   EXPECT_NE(shell->web_contents()->GetRenderProcessHost()->GetID(),
             next_rfh->GetProcess()->GetID());
 
   return next_rfh->render_view_host();
 }
 
-ResourceHostMsg_Request CreateXHRRequest(const char* url) {
-  ResourceHostMsg_Request request;
+ResourceRequest CreateXHRRequest(const char* url) {
+  ResourceRequest request;
   request.method = "GET";
   request.url = GURL(url);
   request.referrer_policy = blink::WebReferrerPolicyDefault;
   request.load_flags = 0;
   request.origin_pid = 0;
   request.resource_type = RESOURCE_TYPE_XHR;
   request.request_context = 0;
   request.appcache_host_id = kAppCacheNoHostId;
   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;
 }
 
-ResourceHostMsg_Request CreateXHRRequestWithOrigin(const char* origin) {
-  ResourceHostMsg_Request request =
-      CreateXHRRequest("http://bar.com/simple_page.html");
+ResourceRequest CreateXHRRequestWithOrigin(const char* origin) {
+  ResourceRequest request = CreateXHRRequest("http://bar.com/simple_page.html");
   request.first_party_for_cookies = GURL(origin);
   request.headers = base::StringPrintf("Origin: %s\r\n", origin);
   return request;
 }
 
 void TryCreateDuplicateRequestIds(Shell* shell, bool block_loaders) {
   NavigateToURL(shell, GURL("http://foo.com/simple_page.html"));
   RenderFrameHost* rfh = shell->web_contents()->GetMainFrame();
 
   if (block_loaders) {
     // Test the case where loaders are placed into blocked_loaders_map_.
     ResourceDispatcherHost::BlockRequestsForFrameFromUI(rfh);
   }
 
   // URLRequestSlowDownloadJob waits for another request to kFinishDownloadUrl
   // to finish all pending requests. It is never sent, so the following URL
   // blocks indefinitely, which is good because the request stays alive and the
   // test can try to reuse the request id without a race.
   const char* blocking_url = net::URLRequestSlowDownloadJob::kUnknownSizeUrl;
-  ResourceHostMsg_Request request(CreateXHRRequest(blocking_url));
+  ResourceRequest request(CreateXHRRequest(blocking_url));
 
   // Use the same request id twice.
   RenderProcessHostWatcher process_killed(
       rfh->GetProcess(), RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   IPC::IpcSecurityTestUtil::PwnMessageReceived(
       rfh->GetProcess()->GetChannel(),
       ResourceHostMsg_RequestResource(rfh->GetRoutingID(),
                                       kRequestIdNotPreviouslyUsed, request));
   IPC::IpcSecurityTestUtil::PwnMessageReceived(
       rfh->GetProcess()->GetChannel(),
@@ skipping 245 matching lines @@
                        int child_process_id,
                        const GURL& origin) override {
     // Simulate a case where an app origin is not in an app process.
     return true;
   }
 };
 
 // Renderer processes should not be able to spoof Origin HTTP headers.
 IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, InvalidOriginHeaders) {
   // Create a set of IPC messages with various Origin headers.
-  ResourceHostMsg_Request chrome_origin_msg(
+  ResourceRequest chrome_origin_msg(
       CreateXHRRequestWithOrigin("chrome://settings"));
-  ResourceHostMsg_Request embedder_isolated_origin_msg(
+  ResourceRequest embedder_isolated_origin_msg(
       CreateXHRRequestWithOrigin("https://isolated.bar.com"));
-  ResourceHostMsg_Request invalid_origin_msg(
-      CreateXHRRequestWithOrigin("invalidurl"));
-  ResourceHostMsg_Request invalid_scheme_origin_msg(
+  ResourceRequest invalid_origin_msg(CreateXHRRequestWithOrigin("invalidurl"));
+  ResourceRequest invalid_scheme_origin_msg(
       CreateXHRRequestWithOrigin("fake-scheme://foo"));
 
   GURL web_url("http://foo.com/simple_page.html");
   NavigateToURL(shell(), web_url);
   RenderFrameHost* web_rfh = shell()->web_contents()->GetMainFrame();
 
   // Web processes cannot make XHRs with chrome:// Origin headers.
   {
     RenderProcessHostWatcher web_process_killed(
         web_rfh->GetProcess(),
         RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
     IPC::IpcSecurityTestUtil::PwnMessageReceived(
         web_rfh->GetProcess()->GetChannel(),
         ResourceHostMsg_RequestResource(web_rfh->GetRoutingID(),
                                         kRequestIdNotPreviouslyUsed,
                                         chrome_origin_msg));
     web_process_killed.Wait();
   }
 
   // Web processes cannot make XHRs with URLs that the content embedder expects
   // to have process isolation.  Ideally this would test chrome-extension://
   // URLs for Chrome Apps, but those can't be tested inside content/ and the
-  // ResourceHostMsg_Request IPC can't be created in a test outside content/.
+  // ResourceRequest IPC can't be created in a test outside content/.
   NavigateToURL(shell(), web_url);
   {
     // Set up a ContentBrowserClient that simulates an app URL in a non-app
     // process.
     IsolatedAppContentBrowserClient app_client;
     ContentBrowserClient* old_client = SetBrowserClientForTesting(&app_client);
     RenderProcessHostWatcher web_process_killed(
         web_rfh->GetProcess(),
         RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
     IPC::IpcSecurityTestUtil::PwnMessageReceived(
@@ skipping 94 matching lines @@
   // separate task of the message loop, so ensure that the process is still
   // considered alive.
   EXPECT_TRUE(root->current_frame_host()->GetProcess()->HasConnection());
 
   exit_observer.Wait();
   EXPECT_FALSE(exit_observer.did_exit_normally());
   ResourceDispatcherHost::Get()->SetDelegate(nullptr);
 }
 
 }  // namespace content