[ServiceWorker] Plumbing the request mode from the renderer to the ServiceWorker. [2/2 chromium]

content/renderer/service_worker/service_worker_script_context.cc

Index: content/renderer/service_worker/service_worker_script_context.cc
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
index fba887b8d46fcc4662814f8c4d9f12a1b0329546..18786afa4f12c22833ea95bd894cf9368bfe3f6d 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -35,6 +35,26 @@ void SendPostMessageToDocumentOnMainThread(
       WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.release())));
 }
 
+blink::WebURLRequest::FetchRequestMode GetBlinkFetchRequestMode(
+    FetchRequestMode mode) {
+  switch (mode) {
+    case FETCH_REQUEST_MODE_SAME_ORIGIN:
+      return blink::WebURLRequest::FetchRequestModeSameOrigin;

[jochen (gone - plz use gerrit), 2014/09/29 12:56:44]

nit. you could just use ASSERT_MATCHING_ENUM() and static_cast<> instead of this
switch (and the one above in the other direction).

[horo, 2014/09/30 02:15:39]

Done.

+      break;
+    case FETCH_REQUEST_MODE_NO_CORS:
+      return blink::WebURLRequest::FetchRequestModeNoCORS;
+      break;
+    case FETCH_REQUEST_MODE_CORS:
+      return blink::WebURLRequest::FetchRequestModeCORS;
+      break;
+    case FETCH_REQUEST_MODE_CORS_WITH_FORCED_PREFLIGHT:
+      return blink::WebURLRequest::FetchRequestModeCORSWithForcedPreflight;
+      break;
+  }
+  NOTREACHED();
+  return blink::WebURLRequest::FetchRequestModeNoCORS;
+}
+
 }  // namespace
 
 ServiceWorkerScriptContext::ServiceWorkerScriptContext(
@@ -161,6 +181,7 @@ void ServiceWorkerScriptContext::OnFetchEvent(
   }
   webRequest.setReferrer(blink::WebString::fromUTF8(request.referrer.spec()),
                          blink::WebReferrerPolicyDefault);
+  webRequest.setMode(GetBlinkFetchRequestMode(request.mode));
   webRequest.setIsReload(request.is_reload);
   proxy_->dispatchFetchEvent(request_id, webRequest);
 }