Commit 1f2ca177 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Chromium LUCI CQ

Deprecate blink::mojom::ResourceType in //content/browser/web_package

This CL replaces blink::mojom::ResourceType with
network::mojom::RequestDestination in //content/browser/web_package
since blink::mojom::ResourceType is deprecated[1].

[1] https://crbug.com/960143

Bug: 1059639
Change-Id: Id0f360de51d22316afdc12190635adeade56752c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2637099Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#845092}
parent f31bed56
......@@ -33,12 +33,12 @@
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/cpp/url_loader_completion_status.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom-shared.h"
#include "services/network/public/mojom/url_loader.mojom.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
#include "storage/browser/blob/blob_data_handle.h"
#include "storage/browser/blob/blob_impl.h"
#include "storage/browser/blob/mojo_blob_reader.h"
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
namespace content {
......@@ -150,8 +150,7 @@ class InnerResponseURLLoader : public network::mojom::URLLoader {
// or report_raw_headers is set. Users can inspect the certificate for the
// main frame using the info bubble in Omnibox, and for the subresources in
// DevTools' Security panel.
if ((request.resource_type !=
static_cast<int>(blink::mojom::ResourceType::kMainFrame)) &&
if (request.destination != network::mojom::RequestDestination::kDocument &&
!request.report_raw_headers) {
response_->ssl_info = base::nullopt;
}
......
......@@ -24,6 +24,7 @@
#include "net/http/http_request_headers.h"
#include "net/http/http_status_code.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom-shared.h"
#include "third_party/blink/public/common/loader/throttling_url_loader.h"
#include "third_party/blink/public/common/loader/url_loader_throttle.h"
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
......@@ -114,6 +115,7 @@ SignedExchangeCertFetcher::SignedExchangeCertFetcher(
resource_request_->request_initiator = url::Origin();
resource_request_->resource_type =
static_cast<int>(blink::mojom::ResourceType::kSubResource);
resource_request_->destination = network::mojom::RequestDestination::kEmpty;
// Cert requests should not send credential informartion, because the default
// credentials mode of Fetch is "omit".
resource_request_->credentials_mode = network::mojom::CredentialsMode::kOmit;
......
......@@ -23,12 +23,12 @@
#include "net/test/test_data_directory.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom-shared.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/loader/url_loader_throttle.h"
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
namespace content {
......@@ -273,8 +273,8 @@ TEST_F(SignedExchangeCertFetcherTest, Simple) {
ASSERT_TRUE(mock_loader_factory_.client_remote());
ASSERT_TRUE(mock_loader_factory_.url_request());
EXPECT_EQ(url_, mock_loader_factory_.url_request()->url);
EXPECT_EQ(static_cast<int>(blink::mojom::ResourceType::kSubResource),
mock_loader_factory_.url_request()->resource_type);
EXPECT_EQ(network::mojom::RequestDestination::kEmpty,
mock_loader_factory_.url_request()->destination);
EXPECT_EQ(mock_loader_factory_.url_request()->credentials_mode,
network::mojom::CredentialsMode::kOmit);
EXPECT_TRUE(mock_loader_factory_.url_request()->request_initiator->opaque());
......@@ -330,8 +330,8 @@ TEST_F(SignedExchangeCertFetcherTest, ForceFetchAndFail) {
ASSERT_TRUE(mock_loader_factory_.url_request());
EXPECT_EQ(url_, mock_loader_factory_.url_request()->url);
EXPECT_EQ(static_cast<int>(blink::mojom::ResourceType::kSubResource),
mock_loader_factory_.url_request()->resource_type);
EXPECT_EQ(network::mojom::RequestDestination::kEmpty,
mock_loader_factory_.url_request()->destination);
EXPECT_EQ(net::LOAD_DISABLE_CACHE | net::LOAD_BYPASS_CACHE,
mock_loader_factory_.url_request()->load_flags);
EXPECT_EQ(mock_loader_factory_.url_request()->credentials_mode,
......
......@@ -15,6 +15,7 @@
#include "net/base/load_flags.h"
#include "net/http/http_status_code.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom-shared.h"
#include "third_party/blink/public/common/loader/throttling_url_loader.h"
#include "third_party/blink/public/common/loader/url_loader_throttle.h"
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
......@@ -88,6 +89,7 @@ void SignedExchangeValidityPinger::Start(
resource_request->method = "HEAD";
resource_request->resource_type =
static_cast<int>(blink::mojom::ResourceType::kSubResource);
resource_request->destination = network::mojom::RequestDestination::kEmpty;
// Set empty origin as the initiator and attach no cookies.
resource_request->request_initiator = url::Origin();
resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
......
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