| Index: content/child/web_url_request_util.cc
|
| diff --git a/content/child/web_url_request_util.cc b/content/child/web_url_request_util.cc
|
| index 51faca131d31156c97fa965ee2749359d9dafacc..a8eb8682ed634b00a542baf22af62c7c9c942c1e 100644
|
| --- a/content/child/web_url_request_util.cc
|
| +++ b/content/child/web_url_request_util.cc
|
| @@ -485,16 +485,16 @@ blink::WebMixedContentContextType GetMixedContentContextTypeForWebURLRequest(
|
| request.getRequestContext(), block_mixed_plugin_content);
|
| }
|
|
|
| -STATIC_ASSERT_ENUM(SkipServiceWorker::NONE,
|
| - WebURLRequest::SkipServiceWorker::None);
|
| -STATIC_ASSERT_ENUM(SkipServiceWorker::CONTROLLING,
|
| - WebURLRequest::SkipServiceWorker::Controlling);
|
| -STATIC_ASSERT_ENUM(SkipServiceWorker::ALL,
|
| - WebURLRequest::SkipServiceWorker::All);
|
| -
|
| -SkipServiceWorker GetSkipServiceWorkerForWebURLRequest(
|
| +STATIC_ASSERT_ENUM(ServiceWorkerMode::NONE,
|
| + WebURLRequest::ServiceWorkerMode::None);
|
| +STATIC_ASSERT_ENUM(ServiceWorkerMode::FOREIGN,
|
| + WebURLRequest::ServiceWorkerMode::Foreign);
|
| +STATIC_ASSERT_ENUM(ServiceWorkerMode::ALL,
|
| + WebURLRequest::ServiceWorkerMode::All);
|
| +
|
| +ServiceWorkerMode GetServiceWorkerModeForWebURLRequest(
|
| const blink::WebURLRequest& request) {
|
| - return static_cast<SkipServiceWorker>(request.skipServiceWorker());
|
| + return static_cast<ServiceWorkerMode>(request.getServiceWorkerMode());
|
| }
|
|
|
| blink::WebURLError CreateWebURLError(const blink::WebURL& unreachable_url,
|
|
|