NetS13nSW: Initialize URLLoaderFactoryGetter properly

Previously, URLLoaderFactoryGetter expects that the NetworkContext is ready when
it's initialized (URLLoaderFactoryGetter::Initialize()). However, when
ServiceWorkerServicification is on without NetworkService, the initialization
fails because URLRequestContext which is necessary to create a dummy
NetworkContext is not set at that point.
This CL splits the initialization process into two parts: creating valid
InterfacePtrs (URLLoaderFactoryGetter::Initialize()) and passing the
InterfaceRequests to the appropriate places
(URLLoaderFactoryGetter::EstablishConnection()).  NetworkContext is used only
for the latter, so EstablishConnection() is called after URLRequestContext is
set if ServiceWorkerServicification is on without NetworkService.

Bug: 829251
Change-Id: I5fbbaa2d48232965681fc96d802711369cd96528
Reviewed-on: https://chromium-review.googlesource.com/1025490Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553405}

content/browser/storage_partition_impl_map.cc

@@ -37,6 +37,7 @@
 #include "content/browser/streams/stream_registry.h"
 #include "content/browser/streams/stream_url_request_job.h"
 #include "content/browser/webui/url_data_manager_backend.h"
+#include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ -48,6 +49,7 @@
 #include "crypto/sha2.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "services/network/public/cpp/features.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "storage/browser/blob/blob_url_request_job_factory.h"
 #include "storage/browser/fileapi/file_system_url_request_job_factory.h"
@@ -435,6 +437,17 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
       browser_context_->CreateMediaRequestContextForStoragePartition(
           partition->GetPath(), in_memory));
 
+  if (ServiceWorkerUtils::IsServicificationEnabled() &&
+      !base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+    // This needs to happen after SetURLRequestContext() since we need this
+    // code path only for non-NetworkService case where NetworkContext needs to
+    // be initialized using |url_request_context_|, which is initialized by
+    // SetURLRequestContext().
+    DCHECK(partition->url_loader_factory_getter());
+    DCHECK(partition->url_request_context_);
+    partition->url_loader_factory_getter()->HandleFactoryRequests();
+  }
+
   PostCreateInitialization(partition, in_memory);
 
   return partition;

content/browser/url_loader_factory_getter.cc

@@ -5,8 +5,10 @@
 #include "content/browser/url_loader_factory_getter.h"
 
 #include "base/bind.h"
+#include "base/feature_list.h"
 #include "base/lazy_instance.h"
 #include "content/browser/storage_partition_impl.h"
+#include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 
@@ -107,14 +109,19 @@ URLLoaderFactoryGetter::URLLoaderFactoryGetter() {}
 
 void URLLoaderFactoryGetter::Initialize(StoragePartitionImpl* partition) {
   DCHECK(partition);
-  partition_ = partition;
+  DCHECK(!pending_network_factory_request_.is_pending());
+  DCHECK(!pending_blob_factory_request_.is_pending());
 
+  partition_ = partition;
   network::mojom::URLLoaderFactoryPtr network_factory;
-  HandleNetworkFactoryRequestOnUIThread(MakeRequest(&network_factory));
-
   network::mojom::URLLoaderFactoryPtr blob_factory;
-  partition_->GetBlobURLLoaderFactory()->HandleRequest(
-      mojo::MakeRequest(&blob_factory));
+  pending_network_factory_request_ = MakeRequest(&network_factory);
+  pending_blob_factory_request_ = mojo::MakeRequest(&blob_factory);
+
+  // If NetworkService is disabled, HandleFactoryRequests should be called after
+  // NetworkContext in |partition_| is ready.
+  if (base::FeatureList::IsEnabled(network::features::kNetworkService))
+    HandleFactoryRequests();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ -123,6 +130,16 @@ void URLLoaderFactoryGetter::Initialize(StoragePartitionImpl* partition) {
                      blob_factory.PassInterface()));
 }
 
+void URLLoaderFactoryGetter::HandleFactoryRequests() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(pending_network_factory_request_.is_pending());
+  DCHECK(pending_blob_factory_request_.is_pending());
+  HandleNetworkFactoryRequestOnUIThread(
+      std::move(pending_network_factory_request_));
+  partition_->GetBlobURLLoaderFactory()->HandleRequest(
+      std::move(pending_blob_factory_request_));
+}
+
 void URLLoaderFactoryGetter::OnStoragePartitionDestroyed() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   partition_ = nullptr;

content/browser/url_loader_factory_getter.h

@@ -31,10 +31,19 @@ class URLLoaderFactoryGetter
   CONTENT_EXPORT URLLoaderFactoryGetter();
 
   // Initializes this object on the UI thread. The |partition| is used to
-  // initialize the URLLoaderFactories for the network service and AppCache, and
-  // will be cached to recover from connection error.
+  // initialize the URLLoaderFactories for the network service, AppCache, and
+  // ServiceWorkers, and will be cached to recover from connection error.
+  // After Initialize(), you can get URLLoaderFactories from this
+  // getter. However, any messages on it will be queued until
+  // HandleFactoryRequests() is called.
   void Initialize(StoragePartitionImpl* partition);
 
+  // Called on the UI thread to actually instantiate factories whose pointers
+  // are to be exposed by this getter.  This must be called after NetworkContext
+  // is initialized.
+  // TODO(shimazu): Remove this once NetworkService is shipped.
+  void HandleFactoryRequests();
+
   // Clear the cached pointer to |StoragePartitionImpl| on the UI thread. Should
   // be called when the partition is going away.
   void OnStoragePartitionDestroyed();
@@ -106,6 +115,10 @@ class URLLoaderFactoryGetter
   // Call |network_factory_.FlushForTesting()|. For test use only.
   void FlushNetworkInterfaceForTesting();
 
+  // Bound with appropriate URLLoaderFactories at HandleFactoryRequests().
+  network::mojom::URLLoaderFactoryRequest pending_network_factory_request_;
+  network::mojom::URLLoaderFactoryRequest pending_blob_factory_request_;
+
   // Only accessed on IO thread.
   network::mojom::URLLoaderFactoryPtr network_factory_;
   network::mojom::URLLoaderFactoryPtr blob_factory_;