Skip to content

GitLab

T
tangled
Commit b8580159 authored by Tsuyoshi Horo's avatar Tsuyoshi Horo Committed by Commit Bot
Browse files
Options

Move WebPackage related files to browser/web_package. 

Bug: 803774
Change-Id: Ied7ac32ab21cf17c889980ab593e70ee85ef871c
Reviewed-on: https://chromium-review.googlesource.com/923924Reviewed-by: default avatarRamin Halavati <rhalavati@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537687}
parent 36460f0e
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 83 deletions
content/browser/BUILD.gn
View file @ b8580159
...@@ -1027,21 +1027,6 @@ jumbo_source_set("browser") { ...@@ -1027,21 +1027,6 @@ jumbo_source_set("browser") {
"loader/resource_requester_info.h", "loader/resource_requester_info.h",
"loader/resource_scheduler_filter.cc", "loader/resource_scheduler_filter.cc",
"loader/resource_scheduler_filter.h", "loader/resource_scheduler_filter.h",
"loader/signed_exchange_cert_fetcher.cc",
"loader/signed_exchange_cert_fetcher.h",
"loader/signed_exchange_consts.h",
"loader/signed_exchange_handler.cc",
"loader/signed_exchange_handler.h",
"loader/signed_exchange_header.cc",
"loader/signed_exchange_header.h",
"loader/signed_exchange_header_parser.cc",
"loader/signed_exchange_header_parser.h",
"loader/signed_exchange_parser.cc",
"loader/signed_exchange_parser.h",
"loader/signed_exchange_signature_verifier.cc",
"loader/signed_exchange_signature_verifier.h",
"loader/signed_exchange_url_loader_factory_for_non_network_service.cc",
"loader/signed_exchange_url_loader_factory_for_non_network_service.h",
"loader/source_stream_to_data_pipe.cc", "loader/source_stream_to_data_pipe.cc",
"loader/source_stream_to_data_pipe.h", "loader/source_stream_to_data_pipe.h",
"loader/stream_resource_handler.cc", "loader/stream_resource_handler.cc",
...@@ -1060,10 +1045,6 @@ jumbo_source_set("browser") { ...@@ -1060,10 +1045,6 @@ jumbo_source_set("browser") {
"loader/url_loader_request_handler.h", "loader/url_loader_request_handler.h",
"loader/wake_lock_resource_throttle.cc", "loader/wake_lock_resource_throttle.cc",
"loader/wake_lock_resource_throttle.h", "loader/wake_lock_resource_throttle.h",
"loader/web_package_loader.cc",
"loader/web_package_loader.h",
"loader/web_package_request_handler.cc",
"loader/web_package_request_handler.h",
"loader_delegate_impl.cc", "loader_delegate_impl.cc",
"loader_delegate_impl.h", "loader_delegate_impl.h",
"locks/lock_manager.cc", "locks/lock_manager.cc",
...@@ -1697,6 +1678,25 @@ jumbo_source_set("browser") { ...@@ -1697,6 +1678,25 @@ jumbo_source_set("browser") {
"web_contents/web_drag_source_mac.mm", "web_contents/web_drag_source_mac.mm",
"web_contents/web_drag_utils_win.cc", "web_contents/web_drag_utils_win.cc",
"web_contents/web_drag_utils_win.h", "web_contents/web_drag_utils_win.h",
"web_package/signed_exchange_cert_fetcher.cc",
"web_package/signed_exchange_cert_fetcher.h",
"web_package/signed_exchange_consts.h",
"web_package/signed_exchange_handler.cc",
"web_package/signed_exchange_handler.h",
"web_package/signed_exchange_header.cc",
"web_package/signed_exchange_header.h",
"web_package/signed_exchange_header_parser.cc",
"web_package/signed_exchange_header_parser.h",
"web_package/signed_exchange_parser.cc",
"web_package/signed_exchange_parser.h",
"web_package/signed_exchange_signature_verifier.cc",
"web_package/signed_exchange_signature_verifier.h",
"web_package/signed_exchange_url_loader_factory_for_non_network_service.cc",
"web_package/signed_exchange_url_loader_factory_for_non_network_service.h",
"web_package/web_package_loader.cc",
"web_package/web_package_loader.h",
"web_package/web_package_request_handler.cc",
"web_package/web_package_request_handler.h",
"websockets/websocket_handshake_request_info_impl.cc", "websockets/websocket_handshake_request_info_impl.cc",
"websockets/websocket_handshake_request_info_impl.h", "websockets/websocket_handshake_request_info_impl.h",
"websockets/websocket_impl.cc", "websockets/websocket_impl.cc",
......
content/browser/loader/mime_sniffing_resource_handler.cc
View file @ b8580159
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "content/browser/loader/resource_dispatcher_host_impl.h" #include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/loader/resource_request_info_impl.h" #include "content/browser/loader/resource_request_info_impl.h"
#include "content/browser/loader/stream_resource_handler.h" #include "content/browser/loader/stream_resource_handler.h"
#include "content/browser/loader/web_package_request_handler.h" #include "content/browser/web_package/web_package_request_handler.h"
#include "content/public/browser/content_browser_client.h" #include "content/public/browser/content_browser_client.h"
#include "content/public/browser/plugin_service.h" #include "content/public/browser/plugin_service.h"
#include "content/public/browser/resource_context.h" #include "content/public/browser/resource_context.h"
......
content/browser/loader/navigation_url_loader_network_service.cc
View file @ b8580159
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
#include "content/browser/loader/navigation_url_loader_delegate.h" #include "content/browser/loader/navigation_url_loader_delegate.h"
#include "content/browser/loader/resource_dispatcher_host_impl.h" #include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/loader/resource_request_info_impl.h" #include "content/browser/loader/resource_request_info_impl.h"
#include "content/browser/loader/signed_exchange_url_loader_factory_for_non_network_service.h"
#include "content/browser/loader/url_loader_request_handler.h" #include "content/browser/loader/url_loader_request_handler.h"
#include "content/browser/loader/web_package_request_handler.h"
#include "content/browser/resource_context_impl.h" #include "content/browser/resource_context_impl.h"
#include "content/browser/service_worker/service_worker_navigation_handle.h" #include "content/browser/service_worker/service_worker_navigation_handle.h"
#include "content/browser/service_worker/service_worker_navigation_handle_core.h" #include "content/browser/service_worker/service_worker_navigation_handle_core.h"
...@@ -33,6 +31,8 @@ ...@@ -33,6 +31,8 @@
#include "content/browser/storage_partition_impl.h" #include "content/browser/storage_partition_impl.h"
#include "content/browser/url_loader_factory_getter.h" #include "content/browser/url_loader_factory_getter.h"
#include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
#include "content/browser/web_package/signed_exchange_url_loader_factory_for_non_network_service.h"
#include "content/browser/web_package/web_package_request_handler.h"
#include "content/browser/webui/url_data_manager_backend.h" #include "content/browser/webui/url_data_manager_backend.h"
#include "content/browser/webui/web_ui_url_loader_factory.h" #include "content/browser/webui/web_ui_url_loader_factory.h"
#include "content/common/navigation_subresource_loader_params.h" #include "content/common/navigation_subresource_loader_params.h"
......
content/browser/web_package/OWNERS 0 → 100644
View file @ b8580159
kinuko@chromium.org
kouhei@chromium.org
horo@chromium.org
ksakamoto@chromium.org
# TEAM: loading-dev@chromium.org
# COMPONENT: Blink>Loader
content/browser/loader/signed_exchange_cert_fetcher.cc → content/browser/web_package/signed_exchange_cert_fetcher.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_cert_fetcher.h" #include "content/browser/web_package/signed_exchange_cert_fetcher.h"
#include "base/numerics/safe_conversions.h" #include "base/numerics/safe_conversions.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
......
content/browser/loader/signed_exchange_cert_fetcher.h → content/browser/web_package/signed_exchange_cert_fetcher.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_CERT_CETCHER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_CERT_CETCHER_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_CERT_CETCHER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_CERT_CETCHER_H_
#include <string> #include <string>
#include <vector> #include <vector>
...@@ -111,4 +111,4 @@ class CONTENT_EXPORT SignedExchangeCertFetcher ...@@ -111,4 +111,4 @@ class CONTENT_EXPORT SignedExchangeCertFetcher
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_CERT_CETCHER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_CERT_CETCHER_H_
content/browser/loader/signed_exchange_cert_fetcher_unittest.cc → content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_cert_fetcher.h" #include "content/browser/web_package/signed_exchange_cert_fetcher.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
......
content/browser/loader/signed_exchange_consts.h → content/browser/web_package/signed_exchange_consts.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_CONSTS_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_CONSTS_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_CONSTS_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_CONSTS_H_
namespace content { namespace content {
...@@ -25,4 +25,4 @@ constexpr char kValidityUrlKey[] = "validityUrl"; ...@@ -25,4 +25,4 @@ constexpr char kValidityUrlKey[] = "validityUrl";
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_CONSTS_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_CONSTS_H_
content/browser/loader/signed_exchange_handler.cc → content/browser/web_package/signed_exchange_handler.cc
View file @ b8580159
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_handler.h" #include "content/browser/web_package/signed_exchange_handler.h"
#include "base/feature_list.h" #include "base/feature_list.h"
#include "components/cbor/cbor_reader.h" #include "components/cbor/cbor_reader.h"
#include "content/browser/loader/merkle_integrity_source_stream.h" #include "content/browser/loader/merkle_integrity_source_stream.h"
#include "content/browser/loader/signed_exchange_cert_fetcher.h" #include "content/browser/web_package/signed_exchange_cert_fetcher.h"
#include "content/browser/loader/signed_exchange_consts.h" #include "content/browser/web_package/signed_exchange_consts.h"
#include "content/browser/loader/signed_exchange_header_parser.h" #include "content/browser/web_package/signed_exchange_header_parser.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
#include "content/public/common/shared_url_loader_factory.h" #include "content/public/common/shared_url_loader_factory.h"
#include "content/public/common/url_loader_throttle.h" #include "content/public/common/url_loader_throttle.h"
......
content/browser/loader/signed_exchange_handler.h → content/browser/web_package/signed_exchange_handler.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HANDLER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HANDLER_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HANDLER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HANDLER_H_
#include <string> #include <string>
...@@ -97,4 +97,4 @@ class SignedExchangeHandler final { ...@@ -97,4 +97,4 @@ class SignedExchangeHandler final {
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HANDLER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HANDLER_H_
content/browser/loader/signed_exchange_header.cc → content/browser/web_package/signed_exchange_header.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_header.h" #include "content/browser/web_package/signed_exchange_header.h"
#include <utility> #include <utility>
......
content/browser/loader/signed_exchange_header.h → content/browser/web_package/signed_exchange_header.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HEADER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HEADER_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HEADER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HEADER_H_
#include <map> #include <map>
#include <string> #include <string>
...@@ -50,4 +50,4 @@ class CONTENT_EXPORT SignedExchangeHeader { ...@@ -50,4 +50,4 @@ class CONTENT_EXPORT SignedExchangeHeader {
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HEADER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HEADER_H_
content/browser/loader/signed_exchange_header_parser.cc → content/browser/web_package/signed_exchange_header_parser.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_header_parser.h" #include "content/browser/web_package/signed_exchange_header_parser.h"
#include <map> #include <map>
#include "base/base64.h" #include "base/base64.h"
......
content/browser/loader/signed_exchange_header_parser.h → content/browser/web_package/signed_exchange_header_parser.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HEADER_PARSER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HEADER_PARSER_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HEADER_PARSER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HEADER_PARSER_H_
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
...@@ -48,4 +48,4 @@ class CONTENT_EXPORT SignedExchangeHeaderParser { ...@@ -48,4 +48,4 @@ class CONTENT_EXPORT SignedExchangeHeaderParser {
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_HEADER_PARSER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_HEADER_PARSER_H_
content/browser/loader/signed_exchange_header_parser_unittest.cc → content/browser/web_package/signed_exchange_header_parser_unittest.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_header_parser.h" #include "content/browser/web_package/signed_exchange_header_parser.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace content { namespace content {
......
content/browser/loader/signed_exchange_parser.cc → content/browser/web_package/signed_exchange_parser.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_parser.h" #include "content/browser/web_package/signed_exchange_parser.h"
namespace content { namespace content {
......
content/browser/loader/signed_exchange_parser.h → content/browser/web_package/signed_exchange_parser.h
View file @ b8580159
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_PARSER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_PARSER_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_PARSER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_PARSER_H_
#include <stdint.h> #include <stdint.h>
#include "base/callback.h" #include "base/callback.h"
#include "base/containers/span.h" #include "base/containers/span.h"
#include "base/macros.h" #include "base/macros.h"
#include "content/browser/loader/signed_exchange_header.h" #include "content/browser/web_package/signed_exchange_header.h"
#include "content/common/content_export.h" #include "content/common/content_export.h"
namespace content { namespace content {
...@@ -119,4 +119,4 @@ class CONTENT_EXPORT SignedExchangeParser { ...@@ -119,4 +119,4 @@ class CONTENT_EXPORT SignedExchangeParser {
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_PARSER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_PARSER_H_
content/browser/loader/signed_exchange_signature_verifier.cc → content/browser/web_package/signed_exchange_signature_verifier.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_signature_verifier.h" #include "content/browser/web_package/signed_exchange_signature_verifier.h"
#include "base/containers/span.h" #include "base/containers/span.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "components/cbor/cbor_values.h" #include "components/cbor/cbor_values.h"
#include "components/cbor/cbor_writer.h" #include "components/cbor/cbor_writer.h"
#include "content/browser/loader/signed_exchange_consts.h" #include "content/browser/web_package/signed_exchange_consts.h"
#include "content/browser/loader/signed_exchange_header_parser.h" #include "content/browser/web_package/signed_exchange_header_parser.h"
#include "crypto/signature_verifier.h" #include "crypto/signature_verifier.h"
#include "net/cert/asn1_util.h" #include "net/cert/asn1_util.h"
#include "net/cert/x509_util.h" #include "net/cert/x509_util.h"
......
content/browser/loader/signed_exchange_signature_verifier.h → content/browser/web_package/signed_exchange_signature_verifier.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_SIGNATURE_VERIFIER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_SIGNATURE_VERIFIER_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_SIGNATURE_VERIFIER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_SIGNATURE_VERIFIER_H_
#include <map> #include <map>
#include <string> #include <string>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/optional.h" #include "base/optional.h"
#include "content/browser/loader/signed_exchange_header_parser.h" #include "content/browser/web_package/signed_exchange_header_parser.h"
#include "content/common/content_export.h" #include "content/common/content_export.h"
#include "net/cert/x509_certificate.h" #include "net/cert/x509_certificate.h"
...@@ -52,4 +52,4 @@ class CONTENT_EXPORT SignedExchangeSignatureVerifier final { ...@@ -52,4 +52,4 @@ class CONTENT_EXPORT SignedExchangeSignatureVerifier final {
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_SIGNATURE_VERIFIER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_SIGNATURE_VERIFIER_H_
content/browser/loader/signed_exchange_signature_verifier_unittest.cc → content/browser/web_package/signed_exchange_signature_verifier_unittest.cc
View file @ b8580159
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_signature_verifier.h" #include "content/browser/web_package/signed_exchange_signature_verifier.h"
#include "content/browser/loader/signed_exchange_header_parser.h" #include "content/browser/web_package/signed_exchange_header_parser.h"
#include "net/cert/x509_certificate.h" #include "net/cert/x509_certificate.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
content/browser/loader/signed_exchange_url_loader_factory_for_non_network_service.cc → content/browser/web_package/signed_exchange_url_loader_factory_for_non_network_service.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_url_loader_factory_for_non_network_service.h" #include "content/browser/web_package/signed_exchange_url_loader_factory_for_non_network_service.h"
#include "base/feature_list.h" #include "base/feature_list.h"
#include "content/browser/loader/resource_requester_info.h" #include "content/browser/loader/resource_requester_info.h"
......
content/browser/loader/signed_exchange_url_loader_factory_for_non_network_service.h → content/browser/web_package/signed_exchange_url_loader_factory_for_non_network_service.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_URL_LOADER_FACTORY_FOR_NON_NETWORK_SERVICE_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_URL_LOADER_FACTORY_FOR_NON_NETWORK_SERVICE_H_
#define CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_URL_LOADER_FACTORY_FOR_NON_NETWORK_SERVICE_H_ #define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_URL_LOADER_FACTORY_FOR_NON_NETWORK_SERVICE_H_
#include "content/public/common/resource_type.h" #include "content/public/common/resource_type.h"
#include "content/public/common/shared_url_loader_factory.h" #include "content/public/common/shared_url_loader_factory.h"
...@@ -52,4 +52,4 @@ class SignedExchangeURLLoaderFactoryForNonNetworkService ...@@ -52,4 +52,4 @@ class SignedExchangeURLLoaderFactoryForNonNetworkService
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_SIGNED_EXCHANGE_URL_LOADER_FACTORY_FOR_NON_NETWORK_SERVICE_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_URL_LOADER_FACTORY_FOR_NON_NETWORK_SERVICE_H_
content/browser/loader/web_package_loader.cc → content/browser/web_package/web_package_loader.cc
View file @ b8580159
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/web_package_loader.h" #include "content/browser/web_package/web_package_loader.h"
#include <memory> #include <memory>
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "content/browser/loader/data_pipe_to_source_stream.h" #include "content/browser/loader/data_pipe_to_source_stream.h"
#include "content/browser/loader/signed_exchange_handler.h"
#include "content/browser/loader/source_stream_to_data_pipe.h" #include "content/browser/loader/source_stream_to_data_pipe.h"
#include "content/browser/web_package/signed_exchange_handler.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
#include "content/public/common/shared_url_loader_factory.h" #include "content/public/common/shared_url_loader_factory.h"
#include "net/cert/cert_status_flags.h" #include "net/cert/cert_status_flags.h"
...@@ -163,8 +163,7 @@ void WebPackageLoader::OnStartLoadingResponseBody( ...@@ -163,8 +163,7 @@ void WebPackageLoader::OnStartLoadingResponseBody(
} }
void WebPackageLoader::OnComplete( void WebPackageLoader::OnComplete(
const network::URLLoaderCompletionStatus& status) { const network::URLLoaderCompletionStatus& status) {}
}
void WebPackageLoader::FollowRedirect() { void WebPackageLoader::FollowRedirect() {
NOTREACHED(); NOTREACHED();
......
content/browser/loader/web_package_loader.h → content/browser/web_package/web_package_loader.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_WEB_PACKAGE_LOADER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_LOADER_H_
#define CONTENT_BROWSER_LOADER_WEB_PACKAGE_LOADER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_LOADER_H_
#include "base/optional.h" #include "base/optional.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
...@@ -127,4 +127,4 @@ class WebPackageLoader final : public network::mojom::URLLoaderClient, ...@@ -127,4 +127,4 @@ class WebPackageLoader final : public network::mojom::URLLoaderClient,
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_WEB_PACKAGE_LOADER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_LOADER_H_
content/browser/loader/web_package_request_handler.cc → content/browser/web_package/web_package_request_handler.cc
View file @ b8580159
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/web_package_request_handler.h" #include "content/browser/web_package/web_package_request_handler.h"
#include <memory> #include <memory>
#include "base/bind.h" #include "base/bind.h"
#include "base/feature_list.h" #include "base/feature_list.h"
#include "content/browser/loader/web_package_loader.h" #include "content/browser/web_package/web_package_loader.h"
#include "content/common/throttling_url_loader.h" #include "content/common/throttling_url_loader.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
#include "content/public/common/shared_url_loader_factory.h" #include "content/public/common/shared_url_loader_factory.h"
......
content/browser/loader/web_package_request_handler.h → content/browser/web_package/web_package_request_handler.h
View file @ b8580159
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CONTENT_BROWSER_LOADER_WEB_PACKAGE_REQUEST_HANDLER_H_ #ifndef CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_REQUEST_HANDLER_H_
#define CONTENT_BROWSER_LOADER_WEB_PACKAGE_REQUEST_HANDLER_H_ #define CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_REQUEST_HANDLER_H_
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "content/browser/loader/url_loader_request_handler.h" #include "content/browser/loader/url_loader_request_handler.h"
...@@ -61,4 +61,4 @@ class WebPackageRequestHandler final : public URLLoaderRequestHandler { ...@@ -61,4 +61,4 @@ class WebPackageRequestHandler final : public URLLoaderRequestHandler {
} // namespace content } // namespace content
#endif // CONTENT_BROWSER_LOADER_WEB_PACKAGE_REQUEST_HANDLER_H_ #endif // CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_REQUEST_HANDLER_H_
content/test/BUILD.gn
View file @ b8580159
...@@ -745,7 +745,6 @@ test("content_browsertests") { ...@@ -745,7 +745,6 @@ test("content_browsertests") {
"../browser/loader/reload_cache_control_browsertest.cc", "../browser/loader/reload_cache_control_browsertest.cc",
"../browser/loader/resource_dispatcher_host_browsertest.cc", "../browser/loader/resource_dispatcher_host_browsertest.cc",
"../browser/loader/resource_scheduler_browsertest.cc", "../browser/loader/resource_scheduler_browsertest.cc",
"../browser/loader/web_package_request_handler_browsertest.cc",
"../browser/manifest/manifest_browsertest.cc", "../browser/manifest/manifest_browsertest.cc",
"../browser/media/encrypted_media_browsertest.cc", "../browser/media/encrypted_media_browsertest.cc",
"../browser/media/media_browsertest.cc", "../browser/media/media_browsertest.cc",
...@@ -820,6 +819,7 @@ test("content_browsertests") { ...@@ -820,6 +819,7 @@ test("content_browsertests") {
"../browser/web_contents/web_contents_impl_browsertest.cc", "../browser/web_contents/web_contents_impl_browsertest.cc",
"../browser/web_contents/web_contents_view_aura_browsertest.cc", "../browser/web_contents/web_contents_view_aura_browsertest.cc",
"../browser/web_contents_binding_set_browsertest.cc", "../browser/web_contents_binding_set_browsertest.cc",
"../browser/web_package/web_package_request_handler_browsertest.cc",
"../browser/webkit_browsertest.cc", "../browser/webkit_browsertest.cc",
"../browser/webui/web_ui_browsertest.cc", "../browser/webui/web_ui_browsertest.cc",
"../browser/webui/web_ui_mojo_browsertest.cc", "../browser/webui/web_ui_mojo_browsertest.cc",
...@@ -1328,9 +1328,6 @@ test("content_unittests") { ...@@ -1328,9 +1328,6 @@ test("content_unittests") {
"../browser/loader/resource_buffer_unittest.cc", "../browser/loader/resource_buffer_unittest.cc",
"../browser/loader/resource_dispatcher_host_unittest.cc", "../browser/loader/resource_dispatcher_host_unittest.cc",
"../browser/loader/resource_loader_unittest.cc", "../browser/loader/resource_loader_unittest.cc",
"../browser/loader/signed_exchange_cert_fetcher_unittest.cc",
"../browser/loader/signed_exchange_header_parser_unittest.cc",
"../browser/loader/signed_exchange_signature_verifier_unittest.cc",
"../browser/loader/source_stream_to_data_pipe_unittest.cc", "../browser/loader/source_stream_to_data_pipe_unittest.cc",
"../browser/loader/temporary_file_stream_unittest.cc", "../browser/loader/temporary_file_stream_unittest.cc",
"../browser/loader/test_resource_handler.cc", "../browser/loader/test_resource_handler.cc",
...@@ -1491,6 +1488,9 @@ test("content_unittests") { ...@@ -1491,6 +1488,9 @@ test("content_unittests") {
"../browser/web_contents/web_contents_view_mac_unittest.mm", "../browser/web_contents/web_contents_view_mac_unittest.mm",
"../browser/web_contents/web_drag_dest_mac_unittest.mm", "../browser/web_contents/web_drag_dest_mac_unittest.mm",
"../browser/web_contents/web_drag_source_mac_unittest.mm", "../browser/web_contents/web_drag_source_mac_unittest.mm",
"../browser/web_package/signed_exchange_cert_fetcher_unittest.cc",
"../browser/web_package/signed_exchange_header_parser_unittest.cc",
"../browser/web_package/signed_exchange_signature_verifier_unittest.cc",
"../browser/websockets/websocket_manager_unittest.cc", "../browser/websockets/websocket_manager_unittest.cc",
"../browser/webui/url_data_manager_backend_unittest.cc", "../browser/webui/url_data_manager_backend_unittest.cc",
"../browser/webui/web_ui_data_source_unittest.cc", "../browser/webui/web_ui_data_source_unittest.cc",
......
content/test/fuzzer/signed_exchange_cert_fetcher_parser_fuzzer.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_cert_fetcher.h" // nogncheck #include "content/browser/web_package/signed_exchange_cert_fetcher.h" // nogncheck
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
......
content/test/fuzzer/signed_exchange_header_parser_fuzzer.cc
View file @ b8580159
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "content/browser/loader/signed_exchange_header_parser.h" // nogncheck #include "content/browser/web_package/signed_exchange_header_parser.h" // nogncheck
namespace content { namespace content {
......
tools/traffic_annotation/summary/annotations.xml
View file @ b8580159
...@@ -200,7 +200,7 @@ Refer to README.md for content description and update process. ...@@ -200,7 +200,7 @@ Refer to README.md for content description and update process.
<item id="security_key_socket" hash_code="31074955" type="0" content_hash_code="11296409" os_list="linux,windows" file_path="remoting/host/security_key/security_key_socket.cc"/> <item id="security_key_socket" hash_code="31074955" type="0" content_hash_code="11296409" os_list="linux,windows" file_path="remoting/host/security_key/security_key_socket.cc"/>
<item id="service_worker_navigation_preload" hash_code="129872904" type="0" content_hash_code="79473248" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_fetch_dispatcher.cc"/> <item id="service_worker_navigation_preload" hash_code="129872904" type="0" content_hash_code="79473248" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_fetch_dispatcher.cc"/>
<item id="service_worker_write_to_cache_job" hash_code="117963307" type="0" content_hash_code="18065724" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_write_to_cache_job.cc"/> <item id="service_worker_write_to_cache_job" hash_code="117963307" type="0" content_hash_code="18065724" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_write_to_cache_job.cc"/>
<item id="sigined_exchange_cert_fetcher" hash_code="79442849" type="0" content_hash_code="8138156" os_list="linux,windows" file_path="content/browser/loader/signed_exchange_cert_fetcher.cc"/> <item id="sigined_exchange_cert_fetcher" hash_code="79442849" type="0" content_hash_code="8138156" os_list="linux,windows" file_path="content/browser/web_package/signed_exchange_cert_fetcher.cc"/>
<item id="signed_in_profile_avatar" hash_code="108903331" type="0" content_hash_code="72850619" os_list="linux,windows" file_path="chrome/browser/profiles/profile_downloader.cc"/> <item id="signed_in_profile_avatar" hash_code="108903331" type="0" content_hash_code="72850619" os_list="linux,windows" file_path="chrome/browser/profiles/profile_downloader.cc"/>
<item id="socket_bio_adapter" hash_code="516551" type="0" content_hash_code="21643352" os_list="linux,windows" file_path="net/socket/socket_bio_adapter.cc"/> <item id="socket_bio_adapter" hash_code="516551" type="0" content_hash_code="21643352" os_list="linux,windows" file_path="net/socket/socket_bio_adapter.cc"/>
<item id="speech_recognition_downstream" hash_code="26096088" type="0" content_hash_code="120733233" os_list="linux,windows" file_path="content/browser/speech/speech_recognition_engine.cc"/> <item id="speech_recognition_downstream" hash_code="26096088" type="0" content_hash_code="120733233" os_list="linux,windows" file_path="content/browser/speech/speech_recognition_engine.cc"/>
......
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