Use Associated interfaces for mojo-loading

content/browser/service_worker/service_worker_fetch_dispatcher.h

Index: content/browser/service_worker/service_worker_fetch_dispatcher.h
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.h b/content/browser/service_worker/service_worker_fetch_dispatcher.h
index c81ccef7632a09800784564d2e74808587a93908..f11de85cd643a154b83430e56a6436549ff2b34a 100644
--- a/content/browser/service_worker/service_worker_fetch_dispatcher.h
+++ b/content/browser/service_worker/service_worker_fetch_dispatcher.h
@@ -5,6 +5,8 @@
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_FETCH_DISPATCHER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_FETCH_DISPATCHER_H_
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -13,8 +15,12 @@
 #include "content/common/service_worker/fetch_event_dispatcher.mojom.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/common/service_worker/service_worker_types.h"
+#include "content/common/url_loader.mojom.h"
+#include "content/common/url_loader_factory.mojom.h"
 #include "content/public/common/resource_type.h"
 #include "net/log/net_log_with_source.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
 
 namespace net {
 class URLRequest;
@@ -48,7 +54,7 @@ class CONTENT_EXPORT ServiceWorkerFetchDispatcher {
       net::URLRequest* original_request,
       const MojoURLLoaderFactoryGetter& url_loader_factory_getter);
 
-  // Dispatches a fetch event to the |version| given in ctor, and fires
+  // Dispatches a fecth event to the |version| given in ctor, and fires
   // |fetch_callback| (also given in ctor) when finishes. It runs
   // |prepare_callback| as an intermediate step once the version is activated
   // and running.
@@ -80,6 +86,11 @@ class CONTENT_EXPORT ServiceWorkerFetchDispatcher {
   std::unique_ptr<ServiceWorkerFetchRequest> request_;
   ResourceType resource_type_;
   bool did_complete_;
+  mojom::URLLoaderFactoryPtr url_loader_factory_;
+  std::unique_ptr<mojom::URLLoader> url_loader_;
+  std::unique_ptr<mojom::URLLoaderClient> url_loader_client_;

[horo, 2016/10/28 03:01:28]

As I talked offline, you must keep |url_loader_client_| alive until OnComplete()
is called.

[yhirano, 2016/11/01 10:10:31]

Done.

+  service_manager::InterfaceRegistry interface_registry_;
+  service_manager::InterfaceProvider interface_provider_;
   mojom::FetchEventPreloadHandlePtr preload_handle_;
 
   base::WeakPtrFactory<ServiceWorkerFetchDispatcher> weak_factory_;