third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp - Issue 2117313002: Remove WebURLResponse::initialize() [revised]

Unified Diff: third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp

Issue 2117313002: Remove WebURLResponse::initialize() [revised] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cleanups Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/testing/URLTestHelpers.cpp ('k') | third_party/WebKit/Source/web/WebDataSourceImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp

diff --git a/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp b/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp

index e29d8743a15608d7e00871c2f183549e1ee8a4c4..f1a6a4016197278e7c4abfd78d599012fc7ae768 100644

--- a/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp

+++ b/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp

@@ -77,7 +77,6 @@ public:

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);

@@ -241,7 +240,6 @@ public:

WebString headerNameString(WebString::fromUTF8(headerName));

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

m_expectedResponse.addHTTPHeaderField("Access-Control-Allow-Origin", "*");

@@ -294,7 +292,6 @@ TEST_F(AssociatedURLLoaderTest, SameOriginSuccess)

request.setURL(url);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);

@@ -332,7 +329,6 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginSuccess)

request.setRequestContext(WebURLRequest::RequestContextScript);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

Platform::current()->getURLLoaderMockFactory()->registerURL(url, m_expectedResponse, m_frameFilePath);

@@ -358,7 +354,6 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlSuccess)

request.setURL(url);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");

@@ -385,7 +380,6 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailure)

request.setURL(url);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");

@@ -418,7 +412,6 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailureBadStatusCode

request.setURL(url);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(0);

m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");

@@ -450,7 +443,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectSuccess)

request.setURL(url);

m_expectedRedirectResponse = WebURLResponse();

- m_expectedRedirectResponse.initialize();

m_expectedRedirectResponse.setMIMEType("text/html");

m_expectedRedirectResponse.setHTTPStatusCode(301);

m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);

@@ -461,7 +453,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectSuccess)

m_expectedNewRequest.setURL(redirectURL);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, m_expectedResponse, m_frameFilePath);

@@ -488,7 +479,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginFailure)

request.setURL(url);

m_expectedRedirectResponse = WebURLResponse();

- m_expectedRedirectResponse.initialize();

m_expectedRedirectResponse.setMIMEType("text/html");

m_expectedRedirectResponse.setHTTPStatusCode(301);

m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);

@@ -499,7 +489,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginFailure)

m_expectedNewRequest.setURL(redirectURL);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, m_expectedResponse, m_frameFilePath);

@@ -527,7 +516,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlFailure)

request.setURL(url);

m_expectedRedirectResponse = WebURLResponse();

- m_expectedRedirectResponse.initialize();

m_expectedRedirectResponse.setMIMEType("text/html");

m_expectedRedirectResponse.setHTTPStatusCode(301);

m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);

@@ -538,7 +526,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlFailure)

m_expectedNewRequest.setURL(redirectURL);

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, m_expectedResponse, m_frameFilePath);

@@ -572,7 +559,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlSuccess)

// Create a redirect response that allows the redirect to pass the access control checks.

m_expectedRedirectResponse = WebURLResponse();

- m_expectedRedirectResponse.initialize();

m_expectedRedirectResponse.setMIMEType("text/html");

m_expectedRedirectResponse.setHTTPStatusCode(301);

m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);

@@ -585,7 +571,6 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlSuccess)

m_expectedNewRequest.setHTTPHeaderField("accept", "application/json");

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");

@@ -699,7 +684,6 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginHeaderAllowResponseHeaders)

WebString headerNameString(WebString::fromUTF8("non-whitelisted"));

m_expectedResponse = WebURLResponse();

- m_expectedResponse.initialize();

m_expectedResponse.setMIMEType("text/html");

m_expectedResponse.setHTTPStatusCode(200);

m_expectedResponse.addHTTPHeaderField("Access-Control-Allow-Origin", "*");