[ServiceWorker] Add m_skipServiceWorker to CrossThreadResourceRequestData.

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
new file mode 100644
index 0000000000000000000000000000000000000000..a433a646c8ad032806c6cdc969f4e6262d446d60
--- /dev/null
+++ b/Source/platform/network/ResourceRequestTest.cpp
@@ -0,0 +1,105 @@
+// 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 "config.h"
+#include "ResourceRequest.h"
+
+#include "platform/network/FormData.h"
+#include "platform/weborigin/KURL.h"
+#include "platform/weborigin/Referrer.h"
+#include "public/platform/WebURLRequest.h"
+#include "wtf/text/AtomicString.h"
+

[tkent, 2014/09/07 23:53:53]

nit: This blank line is unnecessary.

[horo, 2014/09/08 01:04:05]

Done.

+#include <gtest/gtest.h>
+
+namespace blink {
+
+TEST(ResourceRequestTest, CrossThreadResourceRequestData)
+{
+    ResourceRequest original;
+    original.setURL(KURL(ParsedURLString, "http://www.example.com/test.htm"));
+    original.setCachePolicy(UseProtocolCachePolicy);
+    original.setTimeoutInterval(10);
+    original.setFirstPartyForCookies(KURL(ParsedURLString, "http://www.example.com/first_party.htm"));
+    original.setHTTPMethod(AtomicString("GET"));

[tkent, 2014/09/07 23:53:53]

nit: AtomicString("GET") should be AtomicString("GET",
AtomicString::ConstructFromLiteral).

[horo, 2014/09/08 01:04:04]

Done.

+    original.setHTTPHeaderField(AtomicString("Foo"), AtomicString("Bar"));
+    original.setHTTPHeaderField(AtomicString("Piyo"), AtomicString("Fuga"));
+    original.setPriority(ResourceLoadPriorityLow, 20);
+
+    RefPtr<FormData> originalBody(FormData::create("Test Body"));
+    original.setHTTPBody(originalBody);
+    original.setAllowStoredCredentials(false);
+    original.setReportUploadProgress(false);
+    original.setHasUserGesture(false);
+    original.setDownloadToFile(false);
+    original.setSkipServiceWorker(false);
+    original.setRequestorID(30);
+    original.setRequestorProcessID(40);
+    original.setAppCacheHostID(50);
+    original.setRequestContext(WebURLRequest::RequestContextAudio);
+    original.setFrameType(WebURLRequest::FrameTypeNested);
+    original.setHTTPReferrer(Referrer("http://www.example.com/referrer.htm", ReferrerPolicyDefault));
+
+    EXPECT_STREQ("http://www.example.com/test.htm", original.url().string().utf8().data());
+    EXPECT_EQ(UseProtocolCachePolicy, original.cachePolicy());
+    EXPECT_EQ(10, original.timeoutInterval());
+    EXPECT_STREQ("http://www.example.com/first_party.htm", original.firstPartyForCookies().string().utf8().data());
+    EXPECT_STREQ("GET", original.httpMethod().utf8().data());
+    EXPECT_STREQ("Bar", original.httpHeaderFields().get("Foo").utf8().data());
+    EXPECT_STREQ("Fuga", original.httpHeaderFields().get("Piyo").utf8().data());
+    EXPECT_EQ(ResourceLoadPriorityLow, original.priority());
+    EXPECT_STREQ("Test Body", original.httpBody()->flattenToString().utf8().data());
+    EXPECT_EQ(false, original.allowStoredCredentials());

[tkent, 2014/09/07 23:53:54]

EXPECT_EQ(false,  -> EXPECT_FALSE(

[horo, 2014/09/08 01:04:04]

Done.

+    EXPECT_EQ(false, original.reportUploadProgress());
+    EXPECT_EQ(false, original.hasUserGesture());
+    EXPECT_EQ(false, original.downloadToFile());
+    EXPECT_EQ(false, original.skipServiceWorker());
+    EXPECT_EQ(30, original.requestorID());
+    EXPECT_EQ(40, original.requestorProcessID());
+    EXPECT_EQ(50, original.appCacheHostID());
+    EXPECT_EQ(WebURLRequest::RequestContextAudio, original.requestContext());
+    EXPECT_EQ(WebURLRequest::FrameTypeNested, original.frameType());
+    EXPECT_STREQ("http://www.example.com/referrer.htm", original.httpReferrer().utf8().data());
+    EXPECT_EQ(ReferrerPolicyDefault, original.referrerPolicy());
+
+    OwnPtr<CrossThreadResourceRequestData> data1(original.copyData());
+    OwnPtr<ResourceRequest> copy1(ResourceRequest::adopt(data1.release()));
+
+    EXPECT_STREQ("http://www.example.com/test.htm", copy1->url().string().utf8().data());
+    EXPECT_EQ(UseProtocolCachePolicy, copy1->cachePolicy());
+    EXPECT_EQ(10, copy1->timeoutInterval());
+    EXPECT_STREQ("http://www.example.com/first_party.htm", copy1->firstPartyForCookies().string().utf8().data());
+    EXPECT_STREQ("GET", copy1->httpMethod().utf8().data());
+    EXPECT_STREQ("Bar", copy1->httpHeaderFields().get("Foo").utf8().data());
+    EXPECT_EQ(ResourceLoadPriorityLow, copy1->priority());
+    EXPECT_STREQ("Test Body", copy1->httpBody()->flattenToString().utf8().data());
+    EXPECT_EQ(false, copy1->allowStoredCredentials());
+    EXPECT_EQ(false, copy1->reportUploadProgress());
+    EXPECT_EQ(false, copy1->hasUserGesture());
+    EXPECT_EQ(false, copy1->downloadToFile());
+    EXPECT_EQ(false, copy1->skipServiceWorker());
+    EXPECT_EQ(30, copy1->requestorID());
+    EXPECT_EQ(40, copy1->requestorProcessID());
+    EXPECT_EQ(50, copy1->appCacheHostID());
+    EXPECT_EQ(WebURLRequest::RequestContextAudio, copy1->requestContext());
+    EXPECT_EQ(WebURLRequest::FrameTypeNested, copy1->frameType());
+    EXPECT_STREQ("http://www.example.com/referrer.htm", copy1->httpReferrer().utf8().data());
+    EXPECT_EQ(ReferrerPolicyDefault, copy1->referrerPolicy());
+
+    copy1->setAllowStoredCredentials(true);
+    copy1->setReportUploadProgress(true);
+    copy1->setHasUserGesture(true);
+    copy1->setDownloadToFile(true);
+    copy1->setSkipServiceWorker(true);
+
+    OwnPtr<CrossThreadResourceRequestData> data2(copy1->copyData());
+    OwnPtr<ResourceRequest> copy2(ResourceRequest::adopt(data2.release()));
+    EXPECT_EQ(true, copy2->allowStoredCredentials());

[tkent, 2014/09/07 23:53:54]

EXPECT_EQ(true, - EXPECT_TRUE(

[horo, 2014/09/08 01:04:04]

Done.

+    EXPECT_EQ(true, copy2->reportUploadProgress());
+    EXPECT_EQ(true, copy2->hasUserGesture());
+    EXPECT_EQ(true, copy2->downloadToFile());
+    EXPECT_EQ(true, copy2->skipServiceWorker());
+}
+
+} // namespace blink