Expose WebServiceWorkerNetworkProvider on DataSource

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 9ccd8205124a1a40e912df21a16df47ceb5ebe39..e5c8e5ad72217846b0c877d4075f36e4cf1ca20a 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -82,6 +82,7 @@
 #include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
 #include "public/platform/WebViewScheduler.h"
+#include "public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.h"
 #include "wtf/Vector.h"
 
 namespace blink {
@@ -823,13 +824,18 @@ bool FrameFetchContext::isControlledByServiceWorker() const {
   if (getSecurityOrigin() && getSecurityOrigin()->hasSuborigin())
     return false;
 
-  return localFrameClient()->isControlledByServiceWorker(
-      *masterDocumentLoader());
+  auto service_worker_network_provider =

[dcheng, 2017/03/10 04:48:38]

auto* here and below as well

[kinuko, 2017/03/10 05:52:29]

Done.

+      masterDocumentLoader()->getServiceWorkerNetworkProvider();
+  return service_worker_network_provider &&
+         service_worker_network_provider->isControlledByServiceWorker();
 }
 
 int64_t FrameFetchContext::serviceWorkerID() const {
   DCHECK(masterDocumentLoader());
-  return localFrameClient()->serviceWorkerID(*masterDocumentLoader());
+  auto service_worker_network_provider =
+      masterDocumentLoader()->getServiceWorkerNetworkProvider();
+  return service_worker_network_provider &&
+         service_worker_network_provider->serviceWorkerID();
 }
 
 bool FrameFetchContext::isMainFrame() const {