Fix SW tests with servicification

content/child/service_worker/service_worker_network_provider.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/service_worker/service_worker_network_provider.h"
 
 #include "base/atomic_sequence_num.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
@@ skipping 51 matching lines @@
     request.SetExtraData(extra_data);
 
     // If the provider does not have a controller at this point, the renderer
     // expects the request to never be handled by a controlling service worker,
     // so set the ServiceWorkerMode to skip local workers here. Otherwise, a
     // service worker that is in the process of becoming the controller (i.e.,
     // via claim()) on the browser-side could handle the request and break
     // the assumptions of the renderer.
     if (request.GetFrameType() != blink::WebURLRequest::kFrameTypeTopLevel &&
         request.GetFrameType() != blink::WebURLRequest::kFrameTypeNested &&
         !provider_->IsControlledByServiceWorker() &&

[falken, 2017/06/13 05:48:47]

Seems likely this should use IsControlledByServiceWorker() instead?

[kinuko, 2017/06/13 06:45:55]

Changed the 'IsServicificationEnabled()' code in the provider_ instead

         request.GetServiceWorkerMode() !=
             blink::WebURLRequest::ServiceWorkerMode::kNone) {
       request.SetServiceWorkerMode(
           blink::WebURLRequest::ServiceWorkerMode::kForeign);
     }
   }
 
   bool IsControlledByServiceWorker() override {
+    if (ServiceWorkerUtils::IsServicificationEnabled()) {
+      // Interception for subresource loading is not working (yet)
+      // when servicification is enabled.
+      return false;
+    }
     return provider_->IsControlledByServiceWorker();
   }
 
   int GetProviderID() const override { return provider_->provider_id(); }
 
   int64_t ServiceWorkerID() override {
     if (provider_->context() && provider_->context()->controller())
       return provider_->context()->controller()->version_id();
     return kInvalidServiceWorkerVersionId;
   }
@@ skipping 130 matching lines @@
 void ServiceWorkerNetworkProvider::SetServiceWorkerVersionId(
     int64_t version_id,
     int embedded_worker_id) {
   DCHECK_NE(kInvalidServiceWorkerProviderId, provider_id_);
   if (!ChildThreadImpl::current())
     return;  // May be null in some tests.
   dispatcher_host_->OnSetHostedVersionId(provider_id(), version_id,
                                          embedded_worker_id);
 }
 
 bool ServiceWorkerNetworkProvider::IsControlledByServiceWorker() const {

[falken, 2017/06/13 05:48:47]

Would it be safer to put the return false here instead of above to cover the
callsites that come here directly?

[kinuko, 2017/06/13 06:45:55]

Done.

   return context() && context()->controller();
 }
 
 }  // namespace content