Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / tests / AssociatedURLLoaderTest.cpp

diff --git a/src/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp b/src/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp
index 04b1264..7a3cf3e 100644 (file)
--- a/src/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp
+++ b/src/third_party/WebKit/Source/web/tests/AssociatedURLLoaderTest.cpp
@@ -30,11 +30,6 @@
 
 #include "config.h"
 
-#include "FrameTestHelpers.h"
-#include "URLTestHelpers.h"
-#include "WebFrame.h"
-#include "WebURLLoaderOptions.h"
-#include "WebView.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
@@ -44,6 +39,11 @@
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
+#include "public/web/WebFrame.h"
+#include "public/web/WebURLLoaderOptions.h"
+#include "public/web/WebView.h"
+#include "web/tests/FrameTestHelpers.h"
+#include "web/tests/URLTestHelpers.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
@@ -74,14 +74,14 @@ public:
         m_frameFilePath.append("iframes_test.html");
     }
 
-    WebCore::KURL RegisterMockedUrl(const std::string& urlRoot, const WTF::String& filename)
+    blink::KURL RegisterMockedUrl(const std::string& urlRoot, const WTF::String& filename)
     {
         WebURLResponse response;
         response.initialize();
         response.setMIMEType("text/html");
         WTF::String localPath = m_baseFilePath;
         localPath.append(filename);
-        WebCore::KURL url = toKURL(urlRoot + filename.utf8().data());
+        blink::KURL url = toKURL(urlRoot + filename.utf8().data());
         Platform::current()->unitTestSupport()->registerMockedURL(url, response, localPath);
         return url;
     }
@@ -91,7 +91,7 @@ public:
         m_helper.initialize();
 
         std::string urlRoot = "http://www.test.com/";
-        WebCore::KURL url = RegisterMockedUrl(urlRoot, "iframes_test.html");
+        blink::KURL url = RegisterMockedUrl(urlRoot, "iframes_test.html");
         const char* iframeSupportFiles[] = {
             "invisible_iframe.html",
             "visible_iframe.html",
@@ -101,11 +101,7 @@ public:
             RegisterMockedUrl(urlRoot, iframeSupportFiles[i]);
         }
 
-        WebURLRequest request;
-        request.initialize();
-        request.setURL(url);
-        mainFrame()->loadRequest(request);
-        serveRequests();
+        FrameTestHelpers::loadFrame(mainFrame(), url.string().utf8().data());
 
         Platform::current()->unitTestSupport()->unregisterMockedURL(url);
     }
@@ -131,6 +127,8 @@ public:
         m_willSendRequest = true;
         EXPECT_EQ(m_expectedLoader, loader);
         EXPECT_EQ(m_expectedNewRequest.url(), newRequest.url());
+        // Check that CORS simple headers are transferred to the new request.
+        EXPECT_EQ(m_expectedNewRequest.httpHeaderField("accept"), newRequest.httpHeaderField("accept"));
         EXPECT_EQ(m_expectedRedirectResponse.url(), redirectResponse.url());
         EXPECT_EQ(m_expectedRedirectResponse.httpStatusCode(), redirectResponse.httpStatusCode());
         EXPECT_EQ(m_expectedRedirectResponse.mimeType(), redirectResponse.mimeType());
@@ -240,7 +238,7 @@ public:
             id.append("-Exposed");
         id.append(".html");
 
-        WebCore::KURL url = toKURL(id);
+        blink::KURL url = toKURL(id);
         WebURLRequest request;
         request.initialize();
         request.setURL(url);
@@ -295,7 +293,7 @@ protected:
 // Test a successful same-origin URL load.
 TEST_F(AssociatedURLLoaderTest, SameOriginSuccess)
 {
-    WebCore::KURL url = toKURL("http://www.test.com/SameOriginSuccess.html");
+    blink::KURL url = toKURL("http://www.test.com/SameOriginSuccess.html");
     WebURLRequest request;
     request.initialize();
     request.setURL(url);
@@ -319,7 +317,7 @@ TEST_F(AssociatedURLLoaderTest, SameOriginSuccess)
 TEST_F(AssociatedURLLoaderTest, SameOriginRestriction)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
-    WebCore::KURL url = toKURL("http://www.other.com/SameOriginRestriction.html");
+    blink::KURL url = toKURL("http://www.other.com/SameOriginRestriction.html");
     WebURLRequest request;
     request.initialize();
     request.setURL(url);
@@ -330,7 +328,7 @@ TEST_F(AssociatedURLLoaderTest, SameOriginRestriction)
 TEST_F(AssociatedURLLoaderTest, CrossOriginSuccess)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
-    WebCore::KURL url = toKURL("http://www.other.com/CrossOriginSuccess.html");
+    blink::KURL url = toKURL("http://www.other.com/CrossOriginSuccess.html");
     WebURLRequest request;
     request.initialize();
     request.setURL(url);
@@ -356,7 +354,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginSuccess)
 TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlSuccess)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
-    WebCore::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlSuccess.html");
+    blink::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlSuccess.html");
     WebURLRequest request;
     request.initialize();
     request.setURL(url);
@@ -383,7 +381,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlSuccess)
 TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailure)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
-    WebCore::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
+    blink::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
     WebURLRequest request;
     request.initialize();
     request.setURL(url);
@@ -416,7 +414,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailure)
 TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailureBadStatusCode)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
-    WebCore::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
+    blink::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
     WebURLRequest request;
     request.initialize();
     request.setURL(url);
@@ -445,9 +443,9 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailureBadStatusCode
 // Test a same-origin URL redirect and load.
 TEST_F(AssociatedURLLoaderTest, RedirectSuccess)
 {
-    WebCore::KURL url = toKURL("http://www.test.com/RedirectSuccess.html");
+    blink::KURL url = toKURL("http://www.test.com/RedirectSuccess.html");
     char redirect[] = "http://www.test.com/RedirectSuccess2.html";  // Same-origin
-    WebCore::KURL redirectURL = toKURL(redirect);
+    blink::KURL redirectURL = toKURL(redirect);
 
     WebURLRequest request;
     request.initialize();
@@ -484,9 +482,9 @@ TEST_F(AssociatedURLLoaderTest, RedirectSuccess)
 // Disabled, http://crbug.com/240912 .
 TEST_F(AssociatedURLLoaderTest, DISABLED_RedirectCrossOriginWithAccessControlFailure)
 {
-    WebCore::KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlFailure.html");
+    blink::KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlFailure.html");
     char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlFailure.html";  // Cross-origin
-    WebCore::KURL redirectURL = toKURL(redirect);
+    blink::KURL redirectURL = toKURL(redirect);
 
     WebURLRequest request;
     request.initialize();
@@ -516,13 +514,15 @@ TEST_F(AssociatedURLLoaderTest, DISABLED_RedirectCrossOriginWithAccessControlFai
 // Test that a cross origin redirect response with CORS headers that allow the requesting origin succeeds.
 TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlSuccess)
 {
-    WebCore::KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlSuccess.html");
+    blink::KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlSuccess.html");
     char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlSuccess.html";  // Cross-origin
-    WebCore::KURL redirectURL = toKURL(redirect);
+    blink::KURL redirectURL = toKURL(redirect);
 
     WebURLRequest request;
     request.initialize();
     request.setURL(url);
+    // Add a CORS simple header.
+    request.setHTTPHeaderField("accept", "application/json");
 
     // Create a redirect response that allows the redirect to pass the access control checks.
     m_expectedRedirectResponse = WebURLResponse();
@@ -536,6 +536,7 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlSuccess)
     m_expectedNewRequest = WebURLRequest();
     m_expectedNewRequest.initialize();
     m_expectedNewRequest.setURL(redirectURL);
+    m_expectedNewRequest.setHTTPHeaderField("accept", "application/json");
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.initialize();
@@ -583,8 +584,8 @@ TEST_F(AssociatedURLLoaderTest, UntrustedCheckHeaders)
     CheckHeaderFails("content-length");
     CheckHeaderFails("cookie");
     CheckHeaderFails("cookie2");
-    CheckHeaderFails("content-transfer-encoding");
     CheckHeaderFails("date");
+    CheckHeaderFails("dnt");
     CheckHeaderFails("expect");
     CheckHeaderFails("host");
     CheckHeaderFails("keep-alive");
@@ -640,7 +641,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginHeaderAllowResponseHeaders)
 {
     WebURLRequest request;
     request.initialize();
-    WebCore::KURL url = toKURL("http://www.other.com/CrossOriginHeaderAllowResponseHeaders.html");
+    blink::KURL url = toKURL("http://www.other.com/CrossOriginHeaderAllowResponseHeaders.html");
     request.setURL(url);
 
     WebString headerNameString(WebString::fromUTF8("non-whitelisted"));