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

Source/platform/network/ResourceRequestTest.cpp

Index: Source/platform/network/ResourceRequestTest.cpp
diff --git a/Source/platform/network/ResourceRequestTest.cpp b/Source/platform/network/ResourceRequestTest.cpp
index 025eabc22f72feaea7ac448280149c0786519c7b..45ed5c6c854ef988520ad7a0dade8ade5ed417f6 100644
--- a/Source/platform/network/ResourceRequestTest.cpp
+++ b/Source/platform/network/ResourceRequestTest.cpp
@@ -32,7 +32,7 @@ TEST(ResourceRequestTest, CrossThreadResourceRequestData)
     original.setReportUploadProgress(false);
     original.setHasUserGesture(false);
     original.setDownloadToFile(false);
-    original.setSkipServiceWorker(false);
+    original.setServiceWorkerRequestMode(WebURLRequest::ServiceWorkerRequestModeCORS);
     original.setRequestorID(30);
     original.setRequestorProcessID(40);
     original.setAppCacheHostID(50);
@@ -53,7 +53,7 @@ TEST(ResourceRequestTest, CrossThreadResourceRequestData)
     EXPECT_FALSE(original.reportUploadProgress());
     EXPECT_FALSE(original.hasUserGesture());
     EXPECT_FALSE(original.downloadToFile());
-    EXPECT_FALSE(original.skipServiceWorker());
+    EXPECT_EQ(WebURLRequest::ServiceWorkerRequestModeCORS, original.serviceWorkerRequestMode());
     EXPECT_EQ(30, original.requestorID());
     EXPECT_EQ(40, original.requestorProcessID());
     EXPECT_EQ(50, original.appCacheHostID());
@@ -77,7 +77,7 @@ TEST(ResourceRequestTest, CrossThreadResourceRequestData)
     EXPECT_FALSE(copy1->reportUploadProgress());
     EXPECT_FALSE(copy1->hasUserGesture());
     EXPECT_FALSE(copy1->downloadToFile());
-    EXPECT_FALSE(copy1->skipServiceWorker());
+    EXPECT_EQ(WebURLRequest::ServiceWorkerRequestModeCORS, copy1->serviceWorkerRequestMode());
     EXPECT_EQ(30, copy1->requestorID());
     EXPECT_EQ(40, copy1->requestorProcessID());
     EXPECT_EQ(50, copy1->appCacheHostID());
@@ -90,7 +90,7 @@ TEST(ResourceRequestTest, CrossThreadResourceRequestData)
     copy1->setReportUploadProgress(true);
     copy1->setHasUserGesture(true);
     copy1->setDownloadToFile(true);
-    copy1->setSkipServiceWorker(true);
+    copy1->setServiceWorkerRequestMode(WebURLRequest::ServiceWorkerRequestModeSkip);
 
     OwnPtr<CrossThreadResourceRequestData> data2(copy1->copyData());
     OwnPtr<ResourceRequest> copy2(ResourceRequest::adopt(data2.release()));
@@ -98,7 +98,7 @@ TEST(ResourceRequestTest, CrossThreadResourceRequestData)
     EXPECT_TRUE(copy2->reportUploadProgress());
     EXPECT_TRUE(copy2->hasUserGesture());
     EXPECT_TRUE(copy2->downloadToFile());
-    EXPECT_TRUE(copy2->skipServiceWorker());
+    EXPECT_EQ(WebURLRequest::ServiceWorkerRequestModeSkip, copy1->serviceWorkerRequestMode());
 }
 
 } // namespace blink