Remove WebURLRequest::initialize() and simplify WebURLRequest

third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 166 matching lines @@
 
     void didFail(WebURLLoader* loader, const WebURLError& error) override
     {
         m_didFail = true;
         EXPECT_EQ(m_expectedLoader.get(), loader);
     }
 
     void CheckMethodFails(const char* unsafeMethod)
     {
         WebURLRequest request;
-        request.initialize();
         request.setURL(toKURL("http://www.test.com/success.html"));
         request.setHTTPMethod(WebString::fromUTF8(unsafeMethod));
         WebURLLoaderOptions options;
         options.untrustedHTTP = true;
         CheckFails(request, options);
     }
 
     void CheckHeaderFails(const char* headerField)
     {
         CheckHeaderFails(headerField, "foo");
     }
 
     void CheckHeaderFails(const char* headerField, const char* headerValue)
     {
         WebURLRequest request;
-        request.initialize();
         request.setURL(toKURL("http://www.test.com/success.html"));
         if (equalIgnoringCase(WebString::fromUTF8(headerField), "referer"))
             request.setHTTPReferrer(WebString::fromUTF8(headerValue), WebReferrerPolicyDefault);
         else
             request.setHTTPHeaderField(WebString::fromUTF8(headerField), WebString::fromUTF8(headerValue));
         WebURLLoaderOptions options;
         options.untrustedHTTP = true;
         CheckFails(request, options);
     }
 
@@ skipping 14 matching lines @@
     bool CheckAccessControlHeaders(const char* headerName, bool exposed)
     {
         std::string id("http://www.other.com/CheckAccessControlExposeHeaders_");
         id.append(headerName);
         if (exposed)
             id.append("-Exposed");
         id.append(".html");
 
         KURL url = toKURL(id);
         WebURLRequest request;
-        request.initialize();
         request.setURL(url);
 
         WebString headerNameString(WebString::fromUTF8(headerName));
         m_expectedResponse = WebURLResponse();
         m_expectedResponse.setMIMEType("text/html");
         m_expectedResponse.setHTTPStatusCode(200);
         m_expectedResponse.addHTTPHeaderField("Access-Control-Allow-Origin", "*");
         if (exposed)
             m_expectedResponse.addHTTPHeaderField("access-control-expose-headers", headerNameString);
         m_expectedResponse.addHTTPHeaderField(headerNameString, "foo");
@@ skipping 32 matching lines @@
     bool m_didReceiveCachedMetadata;
     bool m_didFinishLoading;
     bool m_didFail;
 };
 
 // Test a successful same-origin URL load.
 TEST_F(AssociatedURLLoaderTest, SameOriginSuccess)
 {
     KURL url = toKURL("http://www.test.com/SameOriginSuccess.html");
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);
 
     m_expectedLoader = createAssociatedURLLoader();
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 }
 
 // Test that the same-origin restriction is the default.
 TEST_F(AssociatedURLLoaderTest, SameOriginRestriction)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
     KURL url = toKURL("http://www.other.com/SameOriginRestriction.html");
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
     CheckFails(request);
 }
 
 // Test a successful cross-origin load.
 TEST_F(AssociatedURLLoaderTest, CrossOriginSuccess)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
     KURL url = toKURL("http://www.other.com/CrossOriginSuccess");
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
     // No-CORS requests (CrossOriginRequestPolicyAllow) aren't allowed for the
     // default context. So we set the context as Script here.
     request.setRequestContext(WebURLRequest::RequestContextScript);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);
 
     WebURLLoaderOptions options;
     options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
     m_expectedLoader = createAssociatedURLLoader(options);
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 }
 
 // Test a successful cross-origin load using CORS.
 TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlSuccess)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
     KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlSuccess.html");
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);
 
     WebURLLoaderOptions options;
     options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl;
     m_expectedLoader = createAssociatedURLLoader(options);
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 }
 
 // Test an unsuccessful cross-origin load using CORS.
 TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailure)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
     KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);
 
     WebURLLoaderOptions options;
     // Send credentials. This will cause the CORS checks to fail, because credentials can't be
@@ skipping 11 matching lines @@
     EXPECT_TRUE(m_didFail);
     EXPECT_FALSE(m_didReceiveResponse);
 }
 
 // Test an unsuccessful cross-origin load using CORS.
 TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailureBadStatusCode)
 {
     // This is cross-origin since the frame was loaded from www.test.com.
     KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(0);
     m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);
 
     WebURLLoaderOptions options;
     options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl;
@@ skipping 10 matching lines @@
 }
 
 // Test a same-origin URL redirect and load.
 TEST_F(AssociatedURLLoaderTest, RedirectSuccess)
 {
     KURL url = toKURL("http://www.test.com/RedirectSuccess.html");
     char redirect[] = "http://www.test.com/RedirectSuccess2.html";  // Same-origin
     KURL redirectURL = toKURL(redirect);
 
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
 
     m_expectedRedirectResponse = WebURLResponse();
     m_expectedRedirectResponse.setMIMEType("text/html");
     m_expectedRedirectResponse.setHTTPStatusCode(301);
     m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedRedirectResponse, m_frameFilePath);
 
     m_expectedNewRequest = WebURLRequest();
-    m_expectedNewRequest.initialize();
     m_expectedNewRequest.setURL(redirectURL);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, m_expectedResponse, m_frameFilePath);
 
     m_expectedLoader = createAssociatedURLLoader();
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     EXPECT_TRUE(m_willFollowRedirect);
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 }
 
 // Test a cross-origin URL redirect without Access Control set.
 TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginFailure)
 {
     KURL url = toKURL("http://www.test.com/RedirectCrossOriginFailure.html");
     char redirect[] = "http://www.other.com/RedirectCrossOriginFailure.html";  // Cross-origin
     KURL redirectURL = toKURL(redirect);
 
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
 
     m_expectedRedirectResponse = WebURLResponse();
     m_expectedRedirectResponse.setMIMEType("text/html");
     m_expectedRedirectResponse.setHTTPStatusCode(301);
     m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedRedirectResponse, m_frameFilePath);
 
     m_expectedNewRequest = WebURLRequest();
-    m_expectedNewRequest.initialize();
     m_expectedNewRequest.setURL(redirectURL);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, m_expectedResponse, m_frameFilePath);
 
     m_expectedLoader = createAssociatedURLLoader();
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
 
     serveRequests();
     EXPECT_FALSE(m_willFollowRedirect);
     EXPECT_FALSE(m_didReceiveResponse);
     EXPECT_FALSE(m_didReceiveData);
     EXPECT_FALSE(m_didFinishLoading);
 }
 
 // Test that a cross origin redirect response without CORS headers fails.
 TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlFailure)
 {
     KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlFailure.html");
     char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlFailure.html";  // Cross-origin
     KURL redirectURL = toKURL(redirect);
 
     WebURLRequest request;
-    request.initialize();
     request.setURL(url);
 
     m_expectedRedirectResponse = WebURLResponse();
     m_expectedRedirectResponse.setMIMEType("text/html");
     m_expectedRedirectResponse.setHTTPStatusCode(301);
     m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedRedirectResponse, m_frameFilePath);
 
     m_expectedNewRequest = WebURLRequest();
-    m_expectedNewRequest.initialize();
     m_expectedNewRequest.setURL(redirectURL);
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, m_expectedResponse, m_frameFilePath);
 
     WebURLLoaderOptions options;
     options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl;
     m_expectedLoader = createAssociatedURLLoader(options);
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
 
     serveRequests();
     // We should get a notification about access control check failure.
     EXPECT_FALSE(m_willFollowRedirect);
     EXPECT_FALSE(m_didReceiveResponse);
     EXPECT_FALSE(m_didReceiveData);
     EXPECT_TRUE(m_didFail);
 }
 
 // Test that a cross origin redirect response with CORS headers that allow the requesting origin succeeds.
 TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlSuccess)
 {
     KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlSuccess.html");
     char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlSuccess.html";  // Cross-origin
     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();
     m_expectedRedirectResponse.setMIMEType("text/html");
     m_expectedRedirectResponse.setHTTPStatusCode(301);
     m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);
     m_expectedRedirectResponse.addHTTPHeaderField("access-control-allow-origin", "*");
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedRedirectResponse, m_frameFilePath);
 
     m_expectedNewRequest = WebURLRequest();
-    m_expectedNewRequest.initialize();
     m_expectedNewRequest.setURL(redirectURL);
     m_expectedNewRequest.setHTTPHeaderField("accept", "application/json");
 
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");
     Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, m_expectedResponse, m_frameFilePath);
 
     WebURLLoaderOptions options;
@@ skipping 91 matching lines @@
     EXPECT_TRUE(CheckAccessControlHeaders("non-whitelisted", true));
 
     // Test that Set-Cookie headers aren't returned, even if exposed.
     EXPECT_FALSE(CheckAccessControlHeaders("Set-Cookie", true));
 }
 
 // Test that the loader can allow non-whitelisted response headers for trusted CORS loads.
 TEST_F(AssociatedURLLoaderTest, CrossOriginHeaderAllowResponseHeaders)
 {
     WebURLRequest request;
-    request.initialize();
     KURL url = toKURL("http://www.other.com/CrossOriginHeaderAllowResponseHeaders.html");
     request.setURL(url);
 
     WebString headerNameString(WebString::fromUTF8("non-whitelisted"));
     m_expectedResponse = WebURLResponse();
     m_expectedResponse.setMIMEType("text/html");
     m_expectedResponse.setHTTPStatusCode(200);
     m_expectedResponse.addHTTPHeaderField("Access-Control-Allow-Origin", "*");
     m_expectedResponse.addHTTPHeaderField(headerNameString, "foo");
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);
 
     WebURLLoaderOptions options;
     options.exposeAllResponseHeaders = true; // This turns off response whitelisting.
     options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl;
     m_expectedLoader = createAssociatedURLLoader(options);
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 
     EXPECT_FALSE(m_actualResponse.httpHeaderField(headerNameString).isEmpty());
 }
 
 } // namespace blink