Commit b376ce6d authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

Use non-null origin in threadable_loader_test

In order to assert |WorkerGlobalScope::url_| is non-empty
when referenced (which will be needed when Issue 861564 is
applied for module workers),
this CL removes cases where |url_| can be empty in unit tests.

Bug: 861564
Change-Id: I983f334ab866495a13a15e42805998359748b907
Reviewed-on: https://chromium-review.googlesource.com/1128518
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: default avatarNate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#573997}
parent 4d2d4522
...@@ -135,7 +135,7 @@ void SetUpRedirectURL() { ...@@ -135,7 +135,7 @@ void SetUpRedirectURL() {
response.SetHTTPStatusCode(301); response.SetHTTPStatusCode(301);
response.SetLoadTiming(timing); response.SetLoadTiming(timing);
response.AddHTTPHeaderField("Location", SuccessURL().GetString()); response.AddHTTPHeaderField("Location", SuccessURL().GetString());
response.AddHTTPHeaderField("Access-Control-Allow-Origin", "null"); response.AddHTTPHeaderField("Access-Control-Allow-Origin", "http://fake.url");
URLTestHelpers::RegisterMockedURLLoadWithCustomResponse( URLTestHelpers::RegisterMockedURLLoadWithCustomResponse(
url, test::CoreTestDataPath(kFileName), response); url, test::CoreTestDataPath(kFileName), response);
...@@ -152,7 +152,7 @@ void SetUpRedirectLoopURL() { ...@@ -152,7 +152,7 @@ void SetUpRedirectLoopURL() {
response.SetHTTPStatusCode(301); response.SetHTTPStatusCode(301);
response.SetLoadTiming(timing); response.SetLoadTiming(timing);
response.AddHTTPHeaderField("Location", RedirectLoopURL().GetString()); response.AddHTTPHeaderField("Location", RedirectLoopURL().GetString());
response.AddHTTPHeaderField("Access-Control-Allow-Origin", "null"); response.AddHTTPHeaderField("Access-Control-Allow-Origin", "http://fake.url");
URLTestHelpers::RegisterMockedURLLoadWithCustomResponse( URLTestHelpers::RegisterMockedURLLoadWithCustomResponse(
url, test::CoreTestDataPath(kFileName), response); url, test::CoreTestDataPath(kFileName), response);
...@@ -189,7 +189,11 @@ class ThreadableLoaderTestHelper { ...@@ -189,7 +189,11 @@ class ThreadableLoaderTestHelper {
class DocumentThreadableLoaderTestHelper : public ThreadableLoaderTestHelper { class DocumentThreadableLoaderTestHelper : public ThreadableLoaderTestHelper {
public: public:
DocumentThreadableLoaderTestHelper() DocumentThreadableLoaderTestHelper()
: dummy_page_holder_(DummyPageHolder::Create(IntSize(1, 1))) {} : dummy_page_holder_(DummyPageHolder::Create(IntSize(1, 1))) {
GetDocument().SetURL(KURL("http://fake.url/"));
GetDocument().SetSecurityOrigin(
SecurityOrigin::Create(KURL("http://fake.url/")));
}
void CreateLoader(ThreadableLoaderClient* client) override { void CreateLoader(ThreadableLoaderClient* client) override {
ThreadableLoaderOptions options; ThreadableLoaderOptions options;
...@@ -265,7 +269,9 @@ class WebWorkerFetchContextForTest : public WebWorkerFetchContext { ...@@ -265,7 +269,9 @@ class WebWorkerFetchContextForTest : public WebWorkerFetchContext {
class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper { class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper {
public: public:
WorkerThreadableLoaderTestHelper() WorkerThreadableLoaderTestHelper()
: dummy_page_holder_(DummyPageHolder::Create(IntSize(1, 1))) {} : dummy_page_holder_(DummyPageHolder::Create(IntSize(1, 1))) {
GetDocument().SetURL(KURL("http://fake.url/"));
}
void CreateLoader(ThreadableLoaderClient* client) override { void CreateLoader(ThreadableLoaderClient* client) override {
std::unique_ptr<WaitableEvent> completion_event = std::unique_ptr<WaitableEvent> completion_event =
...@@ -773,7 +779,8 @@ TEST_P(ThreadableLoaderTest, DidFailAccessControlCheck) { ...@@ -773,7 +779,8 @@ TEST_P(ThreadableLoaderTest, DidFailAccessControlCheck) {
DidFail(ResourceError::CancelledDueToAccessCheckError( DidFail(ResourceError::CancelledDueToAccessCheckError(
SuccessURL(), ResourceRequestBlockedReason::kOther, SuccessURL(), ResourceRequestBlockedReason::kOther,
"No 'Access-Control-Allow-Origin' header is present on the requested " "No 'Access-Control-Allow-Origin' header is present on the requested "
"resource. Origin 'null' is therefore not allowed access."))); "resource. Origin 'http://fake.url' is therefore not allowed "
"access.")));
StartLoader(SuccessURL(), network::mojom::FetchRequestMode::kCORS); StartLoader(SuccessURL(), network::mojom::FetchRequestMode::kCORS);
CallCheckpoint(2); CallCheckpoint(2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment