Reland "Inline ResourceDispatcherHostImpl::CreateBaseResourceHandler"

This is a reland of ffc8179c8a7bca7404f1f9463331c9a8f54b69a5.
The original CL was reverted due to an infra issue.

Original change's description:
> Inline ResourceDispatcherHostImpl::CreateBaseResourceHandler
>
> Now it always creates a MojoAsyncResourceHandler, so there is no need to
> have a separate function.
>
> Bug: None
> Change-Id: Iafadf07f8dd5930d8de600ed87c0d2aa62a91038
> Reviewed-on: https://chromium-review.googlesource.com/1169034
> Reviewed-by: Charlie Harrison <csharrison@chromium.org>

Bug: None
Change-Id: If915cdf70ae06088b7eea366972472d22b71c28e
Tbr: csharrison@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/1173591Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582805}

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -1060,11 +1060,11 @@ ResourceDispatcherHostImpl::CreateResourceHandler(
          requester_info->IsNavigationPreload() ||
          requester_info->IsCertificateFetcherForSignedExchange());
   // Construct the IPC resource handler.
-  std::unique_ptr<ResourceHandler> handler;
-  handler = CreateBaseResourceHandler(
-      request, url_loader_options, std::move(mojo_request),
-      std::move(url_loader_client),
-      static_cast<ResourceType>(request_data.resource_type));
+  std::unique_ptr<ResourceHandler> handler =
+      std::make_unique<MojoAsyncResourceHandler>(
+          request, this, std::move(mojo_request), std::move(url_loader_client),
+          static_cast<ResourceType>(request_data.resource_type),
+          url_loader_options);
 
   // Prefetches outlive their child process.
   if (request_data.resource_type == RESOURCE_TYPE_PREFETCH) {
@@ -1083,20 +1083,6 @@ ResourceDispatcherHostImpl::CreateResourceHandler(
       std::move(handler));
 }
 
-std::unique_ptr<ResourceHandler>
-ResourceDispatcherHostImpl::CreateBaseResourceHandler(
-    net::URLRequest* request,
-    uint32_t url_loader_options,
-    network::mojom::URLLoaderRequest mojo_request,
-    network::mojom::URLLoaderClientPtr url_loader_client,
-    ResourceType resource_type) {
-  std::unique_ptr<ResourceHandler> handler;
-  handler.reset(new MojoAsyncResourceHandler(
-      request, this, std::move(mojo_request), std::move(url_loader_client),
-      resource_type, url_loader_options));
-  return handler;
-}
-
 std::unique_ptr<ResourceHandler>
 ResourceDispatcherHostImpl::AddStandardHandlers(
     net::URLRequest* request,

content/browser/loader/resource_dispatcher_host_impl.h

@@ -588,14 +588,6 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
       network::mojom::URLLoaderRequest mojo_request,
       network::mojom::URLLoaderClientPtr url_loader_client);
 
-  // Creates either MojoAsyncResourceHandler or AsyncResourceHandler.
-  std::unique_ptr<ResourceHandler> CreateBaseResourceHandler(
-      net::URLRequest* request,
-      uint32_t url_loader_options,
-      network::mojom::URLLoaderRequest mojo_request,
-      network::mojom::URLLoaderClientPtr url_loader_client,
-      ResourceType resource_type);
-
   // Wraps |handler| in the standard resource handlers for normal resource
   // loading and navigation requests. This adds MimeTypeResourceHandler and
   // ResourceThrottles.