Define parameter structs of resource messages out of resource_messages.h

content/browser/loader/resource_dispatcher_host_impl.h

 // Copyright (c) 2012 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.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 29 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/resource_type.h"
 #include "ipc/ipc_message.h"
 #include "net/base/request_priority.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/url_request/url_request.h"
 
 class ResourceHandler;
-struct ResourceHostMsg_Request;
 
 namespace base {
 class FilePath;
 }
 
 namespace net {
 class URLRequestJobFactory;
 }
 
 namespace storage {
@@ skipping 12 matching lines @@
 class ResourceMessageDelegate;
 class ResourceMessageFilter;
 class ResourceRequestInfoImpl;
 class SaveFileManager;
 class ServiceWorkerNavigationHandleCore;
 class WebContentsImpl;
 struct CommonNavigationParams;
 struct DownloadSaveInfo;
 struct NavigationRequestInfo;
 struct Referrer;
+struct ResourceRequest;
 
 // This class is responsible for notifying the IO thread (specifically, the
 // ResourceDispatcherHostImpl) of frame events. It has an interace for callers
 // to use and also sends notifications on WebContentsObserver events. All
 // methods (static or class) will be called from the UI thread and post to the
 // IO thread.
 // TODO(csharrison): Add methods tracking visibility and audio changes, to
 // propogate to the ResourceScheduler.
 class LoaderIOThreadNotifier : public WebContentsObserver {
  public:
@@ skipping 365 matching lines @@
   // Checks all pending requests and updates the load info if necessary.
   void UpdateLoadInfo();
 
   // Resumes or cancels (if |cancel_requests| is true) any blocked requests.
   void ProcessBlockedRequestsForRoute(
       const GlobalFrameRoutingId& global_routing_id,
       bool cancel_requests);
 
   void OnRequestResource(int routing_id,
                          int request_id,
-                         const ResourceHostMsg_Request& request_data);
+                         const ResourceRequest& request_data);
   void OnSyncLoad(int request_id,
-                  const ResourceHostMsg_Request& request_data,
+                  const ResourceRequest& request_data,
                   IPC::Message* sync_result);
 
   bool IsRequestIDInUse(const GlobalRequestID& id) const;
 
   // Update the ResourceRequestInfo and internal maps when a request is
   // transferred from one process to another.
   void UpdateRequestForTransfer(int child_id,
                                 int route_id,
                                 int request_id,
-                                const ResourceHostMsg_Request& request_data,
+                                const ResourceRequest& request_data,
                                 LoaderMap::iterator iter);
 
   void BeginRequest(int request_id,
-                    const ResourceHostMsg_Request& request_data,
+                    const ResourceRequest& request_data,
                     IPC::Message* sync_result,  // only valid for sync
-                    int route_id);  // only valid for async
+                    int route_id);              // only valid for async
 
   // Creates a ResourceHandler to be used by BeginRequest() for normal resource
   // loading.
   std::unique_ptr<ResourceHandler> CreateResourceHandler(
       net::URLRequest* request,
-      const ResourceHostMsg_Request& request_data,
+      const ResourceRequest& request_data,
       IPC::Message* sync_result,
       int route_id,
       int process_type,
       int child_id,
       ResourceContext* resource_context);
 
   // Wraps |handler| in the standard resource handlers for normal resource
   // loading and navigation requests. This adds MimeTypeResourceHandler and
   // ResourceThrottles.
   std::unique_ptr<ResourceHandler> AddStandardHandlers(
@@ skipping 43 matching lines @@
   ResourceLoader* GetLoader(const GlobalRequestID& id) const;
   ResourceLoader* GetLoader(int child_id, int request_id) const;
 
   // Registers |delegate| to receive resource IPC messages targeted to the
   // specified |id|.
   void RegisterResourceMessageDelegate(const GlobalRequestID& id,
                                        ResourceMessageDelegate* delegate);
   void UnregisterResourceMessageDelegate(const GlobalRequestID& id,
                                          ResourceMessageDelegate* delegate);
 
-  int BuildLoadFlagsForRequest(const ResourceHostMsg_Request& request_data,
+  int BuildLoadFlagsForRequest(const ResourceRequest& request_data,
                                int child_id,
                                bool is_sync_load);
 
   // The certificate on a ResourceResponse is associated with a
   // particular renderer process. As a transfer to a new process
   // completes, the stored certificate has to be updated to reflect the
   // new renderer process.
   void UpdateResponseCertificateForTransfer(ResourceResponse* response,
                                             const net::SSLInfo& ssl_info,
                                             int child_id);
@@ skipping 95 matching lines @@
   // Allows tests to use a mock CertStore. If set, the CertStore must
   // outlive this ResourceDispatcherHostImpl.
   CertStore* cert_store_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_DISPATCHER_HOST_IMPL_H_