PlzNavigate: Add first version of NavigationURLLoader.

content/browser/loader/resource_dispatcher_host_impl.h

Index: content/browser/loader/resource_dispatcher_host_impl.h
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index b4548badd1cc14dc6af7557853f3fbf6cae4fcdb..02e641b3768c1f2e6bedce265cc23f97d95ee0f4 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -54,6 +54,8 @@ class ShareableFileReference;
 }
 
 namespace content {
+class AppCacheService;
+class NavigationURLLoaderCore;
 class ResourceContext;
 class ResourceDispatcherHostDelegate;
 class ResourceMessageDelegate;
@@ -256,21 +258,14 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   // elsewhere.
   void FinishedWithResourcesForRequest(const net::URLRequest* request_);
 
-  // PlzNavigate
-  // Called by NavigationRequest to start a navigation request in the node
-  // identified by |frame_node_id|.
-  void StartNavigationRequest(const CommonNavigationParams& common_params,
+  // PlzNavigate: Begins a request for NavigationURLLoader. |loader| is the
+  // loader to attach to the leaf resource handler.
+  void BeginNavigationRequest(ResourceContext* resource_context,
+                              int64 frame_tree_node_id,
+                              const CommonNavigationParams& common_params,
                               const NavigationRequestInfo& info,
                               scoped_refptr<ResourceRequestBody> request_body,
-                              int64 navigation_request_id,
-                              int64 frame_node_id);
-
-  // PlzNavigate
-  // Called by NavigationRequest to cancel a navigation request with the
-  // provided |navigation_request_id| in the node identified by
-  // |frame_node_id|.
-  void CancelNavigationRequest(int64 navigation_request_id,
-                               int64 frame_node_id);
+                              NavigationURLLoaderCore* loader);
 
  private:
   friend class ResourceDispatcherHostTest;
@@ -411,6 +406,17 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
       int child_id,
       ResourceContext* resource_context);
 
+  // Wraps |handler| in the standard resource handlers for normal resource
+  // loading and navigation requests.

[clamy, 2014/10/16 13:43:51]

nit: Maybe precise which kind of ResourceHandlers can be added by this function?

[davidben, 2014/10/22 01:32:37]

Done.

+  scoped_ptr<ResourceHandler> AddStandardHandlers(
+      net::URLRequest* request,
+      ResourceType resource_type,
+      ResourceContext* resource_context,
+      AppCacheService* appcache_service,
+      int child_id,
+      int route_id,
+      scoped_ptr<ResourceHandler> handler);
+
   void OnDataDownloadedACK(int request_id);
   void OnUploadProgressACK(int request_id);
   void OnCancelRequest(int request_id);