Use mojo for Chrome Loading, Part 1

content/child/resource_dispatcher.h

Index: content/child/resource_dispatcher.h
diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h
index 17c80e41603ae8280e88063464d818d77da959ca..b4048a2bc4f15b1db263292acdb7e41905f92a88 100644
--- a/content/child/resource_dispatcher.h
+++ b/content/child/resource_dispatcher.h
@@ -22,6 +22,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
+#include "content/common/url_loader.mojom.h"
 #include "content/public/common/resource_type.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
@@ -68,14 +69,16 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
   // response parameter.
   void StartSync(const RequestInfo& request_info,
                  ResourceRequestBody* request_body,
-                 SyncLoadResponse* response);
+                 SyncLoadResponse* response,
+                 mojom::URLLoaderPtr url_loader);
 
   // Call this method to initiate the request. If this method succeeds, then
   // the peer's methods will be called asynchronously to report various events.
   // Returns the request id.
   virtual int StartAsync(const RequestInfo& request_info,
                          ResourceRequestBody* request_body,
-                         std::unique_ptr<RequestPeer> peer);
+                         std::unique_ptr<RequestPeer> peer,
+                         mojom::URLLoaderPtr url_loader);
 
   // Removes a request from the |pending_requests_| list, returning true if the
   // request was found and removed.
@@ -119,6 +122,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
       scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter);
 
  private:
+  friend class URLResponseBodyConsumer;
   friend class ResourceDispatcherTest;
 
   typedef std::deque<IPC::Message*> MessageQueue;
@@ -154,6 +158,8 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
     linked_ptr<base::SharedMemory> buffer;
     scoped_refptr<SharedMemoryReceivedDataFactory> received_data_factory;
     std::unique_ptr<SiteIsolationResponseMetaData> site_isolation_metadata;
+    mojom::URLLoaderPtr url_loader;
+    std::unique_ptr<mojom::URLLoaderClient> url_loader_client;

[kinuko, 2016/05/20 09:38:51]

nit: can we move these at the very end of the struct and after the comment like
"// Used only when MojoIPC is enabled" ?

[yhirano, 2016/05/20 11:32:54]

Done.

     int buffer_size;
   };
   using PendingRequestMap = std::map<int, std::unique_ptr<PendingRequestInfo>>;