Rename SkipServiceWorker to ServiceWorkerMode

content/renderer/shared_worker/embedded_shared_worker_stub.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/renderer/shared_worker/embedded_shared_worker_stub.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 78 matching lines @@
     ServiceWorkerNetworkProvider* provider =
         GetNetworkProviderFromDataSource(data_source);
     std::unique_ptr<RequestExtraData> extra_data(new RequestExtraData);
     extra_data->set_service_worker_provider_id(provider->provider_id());
     extra_data->set_initiated_in_secure_context(
         static_cast<DataSourceExtraData*>(data_source->getExtraData())
             ->is_secure_context);
     request.setExtraData(extra_data.release());
     // If the provider does not have a controller at this point, the renderer
     // expects subresource requests to never be handled by a controlling service
-    // worker, so set the SkipServiceWorker flag 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.
+    // 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.getRequestContext() !=
             blink::WebURLRequest::RequestContextSharedWorker &&
         !provider->IsControlledByServiceWorker() &&
-        request.skipServiceWorker() !=
-            blink::WebURLRequest::SkipServiceWorker::All) {
-      request.setSkipServiceWorker(
-          blink::WebURLRequest::SkipServiceWorker::Controlling);
+        request.getServiceWorkerMode() !=
+            blink::WebURLRequest::ServiceWorkerMode::None) {
+      request.setServiceWorkerMode(
+          blink::WebURLRequest::ServiceWorkerMode::Foreign);
     }
   }
 
   bool isControlledByServiceWorker(blink::WebDataSource& data_source) override {
     ServiceWorkerNetworkProvider* provider =
         GetNetworkProviderFromDataSource(&data_source);
     return provider->IsControlledByServiceWorker();
   }
 
   int64_t serviceWorkerID(blink::WebDataSource& data_source) override {
@@ skipping 193 matching lines @@
   }
 }
 
 void EmbeddedSharedWorkerStub::OnTerminateWorkerContext() {
   // After this we wouldn't get any IPC for this stub.
   running_ = false;
   impl_->terminateWorkerContext();
 }
 
 }  // namespace content