Use mojo for Chrome Loading, Part 1

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 4f8735eb2593369b165219be9e282f447a85ae97..63abfedeafd0d6d7025f78fb964e0d00f11815a0 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -76,6 +76,7 @@
 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader/resource_scheduler_filter.h"
+#include "content/browser/loader/url_loader_factory_holder.h"
 #include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/capture/image_capture_impl.h"
 #include "content/browser/media/media_internals.h"
@@ -131,6 +132,7 @@
 #include "content/common/render_process_messages.h"
 #include "content/common/resource_messages.h"
 #include "content/common/site_isolation_policy.h"
+#include "content/common/url_loader_factory.mojom.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -648,6 +650,7 @@ void RenderProcessHostImpl::RegisterRendererMainThreadFactory(
 }
 
 RenderProcessHostImpl::~RenderProcessHostImpl() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 #ifndef NDEBUG
   DCHECK(is_self_deleted_)
       << "RenderProcessHostImpl is destroyed by something other than itself";
@@ -873,16 +876,16 @@ void RenderProcessHostImpl::CreateMessageFilters() {
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context =
       ChromeBlobStorageContext::GetFor(browser_context);
 
-  ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
+  resource_message_filter_ = new ResourceMessageFilter(
       GetID(), PROCESS_TYPE_RENDERER,
-      storage_partition_impl_->GetAppCacheService(),
-      blob_storage_context.get(),
+      storage_partition_impl_->GetAppCacheService(), blob_storage_context.get(),
       storage_partition_impl_->GetFileSystemContext(),
       storage_partition_impl_->GetServiceWorkerContext(),
       storage_partition_impl_->GetHostZoomLevelContext(),
       get_contexts_callback);
 
-  AddFilter(resource_message_filter);
+  AddFilter(resource_message_filter_.get());
+
   MediaStreamManager* media_stream_manager =
       BrowserMainLoop::GetInstance()->media_stream_manager();
   // The AudioInputRendererHost and AudioRendererHost needs to be available for
@@ -1094,6 +1097,9 @@ void RenderProcessHostImpl::RegisterMojoServices() {
       mojo_application_host_->service_registry_android());
 #endif
 
+  mojo_application_host_->service_registry()->AddService(base::Bind(
+      &RenderProcessHostImpl::CreateURLLoaderFactory, base::Unretained(this)));
+
   GetContentClient()->browser()->RegisterRenderProcessMojoServices(
       mojo_application_host_->service_registry());
 }
@@ -1107,6 +1113,12 @@ void RenderProcessHostImpl::CreateStoragePartitionService(
   }
 }
 
+void RenderProcessHostImpl::CreateURLLoaderFactory(
+    mojo::InterfaceRequest<mojom::URLLoaderFactory> request) {
+  url_loader_factory_holder_.reset(
+      new URLLoaderFactoryHolder(resource_message_filter_, std::move(request)));
+}
+
 int RenderProcessHostImpl::GetNextRoutingID() {
   return widget_helper_->GetNextRoutingID();
 }
@@ -1822,6 +1834,7 @@ bool RenderProcessHostImpl::IgnoreInputEvents() const {
 }
 
 void RenderProcessHostImpl::Cleanup() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Keep the one renderer thread around forever in single process mode.
   if (run_renderer_in_process())
     return;
@@ -1905,6 +1918,7 @@ void RenderProcessHostImpl::Cleanup() {
 
     // The following members should be cleared in ProcessDied() as well!
     message_port_message_filter_ = NULL;
+    url_loader_factory_holder_ = nullptr;
 
     RemoveUserData(kSessionStorageHolderKey);
 
@@ -2428,6 +2442,7 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
   within_process_died_observer_ = false;
 
   message_port_message_filter_ = NULL;
+  url_loader_factory_holder_ = nullptr;
   RemoveUserData(kSessionStorageHolderKey);
 
   IDMap<IPC::Listener>::iterator iter(&listeners_);