Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1139)

Unified Diff: Source/web/tests/AssociatedURLLoaderTest.cpp

Issue 545123002: Cleanup namespace usage in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 | « Source/web/tests/ActivityLoggerTest.cpp ('k') | Source/web/tests/ChromeClientImplTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/AssociatedURLLoaderTest.cpp
diff --git a/Source/web/tests/AssociatedURLLoaderTest.cpp b/Source/web/tests/AssociatedURLLoaderTest.cpp
index 767e1c303226a5a72354d0d941b3c6c525dfa505..a5ed5b64d52fbe305a13c202968ec3a0d457cabe 100644
--- a/Source/web/tests/AssociatedURLLoaderTest.cpp
+++ b/Source/web/tests/AssociatedURLLoaderTest.cpp
@@ -74,14 +74,14 @@ public:
m_frameFilePath.append("iframes_test.html");
}
- blink::KURL RegisterMockedUrl(const std::string& urlRoot, const WTF::String& filename)
+ 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);
- blink::KURL url = toKURL(urlRoot + filename.utf8().data());
+ 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/";
- blink::KURL url = RegisterMockedUrl(urlRoot, "iframes_test.html");
+ KURL url = RegisterMockedUrl(urlRoot, "iframes_test.html");
const char* iframeSupportFiles[] = {
"invisible_iframe.html",
"visible_iframe.html",
@@ -207,7 +207,7 @@ public:
request.initialize();
request.setURL(toKURL("http://www.test.com/success.html"));
if (equalIgnoringCase(WebString::fromUTF8(headerField), "referer"))
- request.setHTTPReferrer(WebString::fromUTF8(headerValue), blink::WebReferrerPolicyDefault);
+ request.setHTTPReferrer(WebString::fromUTF8(headerValue), WebReferrerPolicyDefault);
else
request.setHTTPHeaderField(WebString::fromUTF8(headerField), WebString::fromUTF8(headerValue));
WebURLLoaderOptions options;
@@ -238,7 +238,7 @@ public:
id.append("-Exposed");
id.append(".html");
- blink::KURL url = toKURL(id);
+ KURL url = toKURL(id);
WebURLRequest request;
request.initialize();
request.setURL(url);
@@ -293,7 +293,7 @@ protected:
// Test a successful same-origin URL load.
TEST_F(AssociatedURLLoaderTest, SameOriginSuccess)
{
- blink::KURL url = toKURL("http://www.test.com/SameOriginSuccess.html");
+ KURL url = toKURL("http://www.test.com/SameOriginSuccess.html");
WebURLRequest request;
request.initialize();
request.setURL(url);
@@ -317,7 +317,7 @@ TEST_F(AssociatedURLLoaderTest, SameOriginSuccess)
TEST_F(AssociatedURLLoaderTest, SameOriginRestriction)
{
// This is cross-origin since the frame was loaded from www.test.com.
- blink::KURL url = toKURL("http://www.other.com/SameOriginRestriction.html");
+ KURL url = toKURL("http://www.other.com/SameOriginRestriction.html");
WebURLRequest request;
request.initialize();
request.setURL(url);
@@ -328,7 +328,7 @@ TEST_F(AssociatedURLLoaderTest, SameOriginRestriction)
TEST_F(AssociatedURLLoaderTest, CrossOriginSuccess)
{
// This is cross-origin since the frame was loaded from www.test.com.
- blink::KURL url = toKURL("http://www.other.com/CrossOriginSuccess.html");
+ KURL url = toKURL("http://www.other.com/CrossOriginSuccess.html");
WebURLRequest request;
request.initialize();
request.setURL(url);
@@ -354,7 +354,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginSuccess)
TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlSuccess)
{
// This is cross-origin since the frame was loaded from www.test.com.
- blink::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlSuccess.html");
+ KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlSuccess.html");
WebURLRequest request;
request.initialize();
request.setURL(url);
@@ -381,7 +381,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlSuccess)
TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailure)
{
// This is cross-origin since the frame was loaded from www.test.com.
- blink::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
+ KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
WebURLRequest request;
request.initialize();
request.setURL(url);
@@ -414,7 +414,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailure)
TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailureBadStatusCode)
{
// This is cross-origin since the frame was loaded from www.test.com.
- blink::KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
+ KURL url = toKURL("http://www.other.com/CrossOriginWithAccessControlFailure.html");
WebURLRequest request;
request.initialize();
request.setURL(url);
@@ -443,9 +443,9 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginWithAccessControlFailureBadStatusCode
// Test a same-origin URL redirect and load.
TEST_F(AssociatedURLLoaderTest, RedirectSuccess)
{
- blink::KURL url = toKURL("http://www.test.com/RedirectSuccess.html");
+ KURL url = toKURL("http://www.test.com/RedirectSuccess.html");
char redirect[] = "http://www.test.com/RedirectSuccess2.html"; // Same-origin
- blink::KURL redirectURL = toKURL(redirect);
+ KURL redirectURL = toKURL(redirect);
WebURLRequest request;
request.initialize();
@@ -482,9 +482,9 @@ TEST_F(AssociatedURLLoaderTest, RedirectSuccess)
// Disabled, http://crbug.com/240912 .
TEST_F(AssociatedURLLoaderTest, DISABLED_RedirectCrossOriginWithAccessControlFailure)
{
- blink::KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlFailure.html");
+ KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlFailure.html");
char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlFailure.html"; // Cross-origin
- blink::KURL redirectURL = toKURL(redirect);
+ KURL redirectURL = toKURL(redirect);
WebURLRequest request;
request.initialize();
@@ -514,9 +514,9 @@ 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)
{
- blink::KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlSuccess.html");
+ KURL url = toKURL("http://www.test.com/RedirectCrossOriginWithAccessControlSuccess.html");
char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlSuccess.html"; // Cross-origin
- blink::KURL redirectURL = toKURL(redirect);
+ KURL redirectURL = toKURL(redirect);
WebURLRequest request;
request.initialize();
@@ -641,7 +641,7 @@ TEST_F(AssociatedURLLoaderTest, CrossOriginHeaderAllowResponseHeaders)
{
WebURLRequest request;
request.initialize();
- blink::KURL url = toKURL("http://www.other.com/CrossOriginHeaderAllowResponseHeaders.html");
+ KURL url = toKURL("http://www.other.com/CrossOriginHeaderAllowResponseHeaders.html");
request.setURL(url);
WebString headerNameString(WebString::fromUTF8("non-whitelisted"));
« no previous file with comments | « Source/web/tests/ActivityLoggerTest.cpp ('k') | Source/web/tests/ChromeClientImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698