Commit 98e19779 authored by Takashi Toyoshima's avatar Takashi Toyoshima Committed by Commit Bot

OOR-CORS: Remove unnecessary SetFetchCredentialsMode calls from tests

Some tests in blink_platform_unittests call SetFetchCredentialsMode with
kOmit, but it should not be needed. Just the default value, kInclude
should work, and the actual default value in the production code.

Bug: 742316
Change-Id: Ib215536b0f72daa953c9bb7fad6a931b69e3b29f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530491
Auto-Submit: Takashi Toyoshima <toyoshim@chromium.org>
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: default avatarYutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642416}
parent b3ce148f
...@@ -273,8 +273,6 @@ TEST_F(BaseFetchContextTest, CanRequest) { ...@@ -273,8 +273,6 @@ TEST_F(BaseFetchContextTest, CanRequest) {
ResourceRequest resource_request(url); ResourceRequest resource_request(url);
resource_request.SetRequestContext(mojom::RequestContextType::SCRIPT); resource_request.SetRequestContext(mojom::RequestContextType::SCRIPT);
resource_request.SetRequestorOrigin(GetSecurityOrigin()); resource_request.SetRequestorOrigin(GetSecurityOrigin());
resource_request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
ResourceLoaderOptions options; ResourceLoaderOptions options;
......
...@@ -264,8 +264,6 @@ class FrameFetchContextSubresourceFilterTest : public FrameFetchContextTest { ...@@ -264,8 +264,6 @@ class FrameFetchContextSubresourceFilterTest : public FrameFetchContextTest {
bool keepalive = false) { bool keepalive = false) {
const KURL input_url("http://example.com/"); const KURL input_url("http://example.com/");
ResourceRequest resource_request(input_url); ResourceRequest resource_request(input_url);
resource_request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
resource_request.SetKeepalive(keepalive); resource_request.SetKeepalive(keepalive);
resource_request.SetRequestorOrigin(document->Fetcher() resource_request.SetRequestorOrigin(document->Fetcher()
->GetProperties() ->GetProperties()
...@@ -1110,8 +1108,6 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest, ...@@ -1110,8 +1108,6 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest,
LoadResourceFromMemoryCache) { LoadResourceFromMemoryCache) {
ResourceRequest resource_request(url); ResourceRequest resource_request(url);
resource_request.SetRequestContext(mojom::RequestContextType::IMAGE); resource_request.SetRequestContext(mojom::RequestContextType::IMAGE);
resource_request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
Resource* resource = MockResource::Create(resource_request); Resource* resource = MockResource::Create(resource_request);
EXPECT_CALL( EXPECT_CALL(
*client, *client,
...@@ -1134,8 +1130,6 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest, ...@@ -1134,8 +1130,6 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest,
MemoryCacheCertificateError) { MemoryCacheCertificateError) {
ResourceRequest resource_request(url); ResourceRequest resource_request(url);
resource_request.SetRequestContext(mojom::RequestContextType::IMAGE); resource_request.SetRequestContext(mojom::RequestContextType::IMAGE);
resource_request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
ResourceResponse response(url); ResourceResponse response(url);
response.SetHasMajorCertificateErrors(true); response.SetHasMajorCertificateErrors(true);
Resource* resource = MockResource::Create(resource_request); Resource* resource = MockResource::Create(resource_request);
...@@ -1269,7 +1263,6 @@ TEST_F(FrameFetchContextTest, DispatchWillSendRequestWhenDetached) { ...@@ -1269,7 +1263,6 @@ TEST_F(FrameFetchContextTest, DispatchWillSendRequestWhenDetached) {
TEST_F(FrameFetchContextTest, DispatchDidReceiveResponseWhenDetached) { TEST_F(FrameFetchContextTest, DispatchDidReceiveResponseWhenDetached) {
ResourceRequest request(KURL("https://www.example.com/")); ResourceRequest request(KURL("https://www.example.com/"));
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
Resource* resource = MockResource::Create(request); Resource* resource = MockResource::Create(request);
ResourceResponse response; ResourceResponse response;
...@@ -1356,7 +1349,6 @@ TEST_F(FrameFetchContextTest, AllowImageWhenDetached) { ...@@ -1356,7 +1349,6 @@ TEST_F(FrameFetchContextTest, AllowImageWhenDetached) {
TEST_F(FrameFetchContextTest, PopulateResourceRequestWhenDetached) { TEST_F(FrameFetchContextTest, PopulateResourceRequestWhenDetached) {
const KURL url("https://www.example.com/"); const KURL url("https://www.example.com/");
ResourceRequest request(url); ResourceRequest request(url);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
ClientHintsPreferences client_hints_preferences; ClientHintsPreferences client_hints_preferences;
client_hints_preferences.SetShouldSendForTesting( client_hints_preferences.SetShouldSendForTesting(
......
...@@ -760,7 +760,6 @@ TEST_P(ImageResourceReloadTest, ...@@ -760,7 +760,6 @@ TEST_P(ImageResourceReloadTest,
ScopedMockedURLLoad scoped_mocked_url_load(test_url, GetTestFilePath()); ScopedMockedURLLoad scoped_mocked_url_load(test_url, GetTestFilePath());
ResourceRequest request(test_url); ResourceRequest request(test_url);
request.SetPreviewsState(WebURLRequest::kServerLoFiOn); request.SetPreviewsState(WebURLRequest::kServerLoFiOn);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
ImageResource* image_resource = ImageResource::Create(request); ImageResource* image_resource = ImageResource::Create(request);
image_resource->NotifyStartLoad(); image_resource->NotifyStartLoad();
......
...@@ -73,8 +73,6 @@ class MemoryCacheCorrectnessTest : public testing::Test { ...@@ -73,8 +73,6 @@ class MemoryCacheCorrectnessTest : public testing::Test {
MockResource* ResourceFromResourceRequest(ResourceRequest request) { MockResource* ResourceFromResourceRequest(ResourceRequest request) {
if (request.Url().IsNull()) if (request.Url().IsNull())
request.SetURL(KURL(kResourceURL)); request.SetURL(KURL(kResourceURL));
request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
MockResource* resource = MockResource::Create(request); MockResource* resource = MockResource::Create(request);
ResourceResponse response(KURL{kResourceURL}); ResourceResponse response(KURL{kResourceURL});
response.SetMimeType("text/html"); response.SetMimeType("text/html");
...@@ -419,7 +417,6 @@ TEST_F(MemoryCacheCorrectnessTest, FreshWithStaleRedirect) { ...@@ -419,7 +417,6 @@ TEST_F(MemoryCacheCorrectnessTest, FreshWithStaleRedirect) {
ResourceRequest request(redirect_url); ResourceRequest request(redirect_url);
request.SetRequestorOrigin(GetSecurityOrigin()); request.SetRequestorOrigin(GetSecurityOrigin());
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
MockResource* first_resource = MockResource::Create(request); MockResource* first_resource = MockResource::Create(request);
ResourceResponse stale301_response(redirect_url); ResourceResponse stale301_response(redirect_url);
......
...@@ -89,11 +89,7 @@ class MemoryCacheTest : public testing::Test { ...@@ -89,11 +89,7 @@ class MemoryCacheTest : public testing::Test {
} }
static FakeResource* Create(const KURL& url, ResourceType type) { static FakeResource* Create(const KURL& url, ResourceType type) {
ResourceRequest request(url); ResourceRequest request(url);
request.SetFetchCredentialsMode(
network::mojom::FetchCredentialsMode::kOmit);
ResourceLoaderOptions options; ResourceLoaderOptions options;
return MakeGarbageCollected<FakeResource>(request, type, options); return MakeGarbageCollected<FakeResource>(request, type, options);
} }
......
...@@ -369,7 +369,6 @@ TEST_F(ResourceFetcherTest, MAYBE_DontReuseMediaDataUrl) { ...@@ -369,7 +369,6 @@ TEST_F(ResourceFetcherTest, MAYBE_DontReuseMediaDataUrl) {
auto* fetcher = CreateFetcher(); auto* fetcher = CreateFetcher();
ResourceRequest request(KURL("data:text/html,foo")); ResourceRequest request(KURL("data:text/html,foo"));
request.SetRequestContext(mojom::RequestContextType::VIDEO); request.SetRequestContext(mojom::RequestContextType::VIDEO);
request.SetFetchCredentialsMode(network::mojom::FetchCredentialsMode::kOmit);
ResourceLoaderOptions options; ResourceLoaderOptions options;
options.data_buffering_policy = kDoNotBufferData; options.data_buffering_policy = kDoNotBufferData;
options.initiator_info.name = fetch_initiator_type_names::kInternal; options.initiator_info.name = fetch_initiator_type_names::kInternal;
......
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