From 1b7193abe207808e7c2bff7c47a0ef4c6484a3fd Mon Sep 17 00:00:00 2001 From: Chongyun Lee Date: Sun Apr 20 23:55:52 2025 +0800 Subject: [PATCH] reland jumbo 3 Enable jumbo build for the following component(s)/source_set(s): - //net:net - //net/dns:dns --- net/BUILD.gn | 10 +++++++++- net/base/host_port_pair.cc | 4 ++++ net/base/ip_endpoint.cc | 4 ++++ net/dns/BUILD.gn | 3 ++- net/dns/dns_response.cc | 4 ++++ net/dns/host_cache.cc | 8 ++++++++ net/dns/host_resolver_cache.cc | 4 ++++ net/dns/host_resolver_dns_task.cc | 4 ++++ net/dns/host_resolver_internal_result.cc | 6 ++++++ net/dns/host_resolver_manager.cc | 4 ++++ net/filter/filter_source_stream.cc | 5 ++++- net/filter/gzip_source_stream.cc | 4 +++- net/http/http_server_properties_manager.cc | 4 ++++ net/http/transport_security_persister.cc | 6 ++++++ .../network_error_logging_service.cc | 10 ++++++++++ .../configured_proxy_resolution_service.cc | 10 +++++++++- net/proxy_resolution/proxy_config_service.cc | 10 +++++++--- net/quic/bidirectional_stream_quic_impl.cc | 4 ++++ net/quic/dedicated_web_transport_http3_client.cc | 4 ++++ net/quic/quic_chromium_client_stream.cc | 4 ++++ net/quic/quic_session_pool.cc | 4 ++++ net/reporting/reporting_header_parser.cc | 6 ++++++ net/reporting/reporting_service.cc | 6 ++++++ net/server/web_socket_encoder.cc | 14 ++++++++++++++ net/websockets/websocket_channel.cc | 4 ++++ net/websockets/websocket_frame.cc | 16 ++++++++++++++++ .../websocket_http2_handshake_stream.cc | 4 ++++ .../websocket_http3_handshake_stream.cc | 4 ++++ 28 files changed, 162 insertions(+), 8 deletions(-) diff --git a/net/BUILD.gn b/net/BUILD.gn index 3b66c31a70..1c22c437d5 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/cast.gni") import("//build/config/compiler/compiler.gni") import("//build/config/cronet/config.gni") import("//build/config/features.gni") +import("//build/config/jumbo.gni") import("//crypto/features.gni") import("//net/features.gni") import("//testing/libfuzzer/fuzzer_test.gni") @@ -146,7 +147,7 @@ proto_library("device_bound_sessions_storage_proto") { sources = [ "device_bound_sessions/proto/storage.proto" ] } -component("net") { +jumbo_component("net") { sources = [ "base/address_family.cc", "base/address_family.h", @@ -1127,6 +1128,9 @@ component("net") { "url_request/websocket_handshake_userdata_key.cc", "url_request/websocket_handshake_userdata_key.h", ] + jumbo_excluded_sources = [ + "spdy/spdy_stream.cc", # Fail to compile due to function name confliction + ] if (is_posix || is_fuchsia) { sources += [ "base/net_errors_posix.cc" ] @@ -1332,6 +1336,10 @@ component("net") { "base/network_interfaces_linux.h", "base/platform_mime_util_linux.cc", ] + jumbo_excluded_sources += [ + "base/address_tracker_linux.cc", # Fail to compile due to the confliction between `linux/if.h` and `net/if.h` + "base/network_interfaces_linux.cc", # Ditto + ] } if (is_linux) { diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc index 14a3e506a4..91b856035b 100644 --- a/net/base/host_port_pair.cc +++ b/net/base/host_port_pair.cc @@ -20,6 +20,8 @@ #include "url/gurl.h" #include "url/scheme_host_port.h" +#define kValuePortKey kValuePortKey_HostPortPair + namespace net { namespace { @@ -139,3 +141,5 @@ base::Value HostPortPair::ToValue() const { } } // namespace net + +#undef kValuePortKey diff --git a/net/base/ip_endpoint.cc b/net/base/ip_endpoint.cc index 369b1e4e08..11705ef071 100644 --- a/net/base/ip_endpoint.cc +++ b/net/base/ip_endpoint.cc @@ -37,6 +37,8 @@ #include #endif +#define kValuePortKey kValuePortKey_IPEndPoint + namespace net { namespace { @@ -327,3 +329,5 @@ std::ostream& operator<<(std::ostream& os, const IPEndPoint& ip_endpoint) { } } // namespace net + +#undef kValuePortKey diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn index 543b8ae16c..f95737faaf 100644 --- a/net/dns/BUILD.gn +++ b/net/dns/BUILD.gn @@ -2,13 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/jumbo.gni") import("//net/features.gni") import("//testing/libfuzzer/fuzzer_test.gni") import("//third_party/protobuf/proto_library.gni") enable_built_in_dns = use_blink -source_set("dns") { +jumbo_source_set("dns") { # Due to circular dependencies, should only be depended on through //net. visibility = [ "//net", diff --git a/net/dns/dns_response.cc b/net/dns/dns_response.cc index bf9faa08bb..f73e0de94c 100644 --- a/net/dns/dns_response.cc +++ b/net/dns/dns_response.cc @@ -31,6 +31,8 @@ #include "net/dns/public/dns_protocol.h" #include "net/dns/record_rdata.h" +#define kHeaderSize kHeaderSize_DnsResponse + namespace net { namespace { @@ -626,3 +628,5 @@ bool DnsResponse::WriteAnswer(base::SpanWriter* writer, } } // namespace net + +#undef kHeaderSize diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc index b2ef120926..98e1b9f974 100644 --- a/net/dns/host_cache.cc +++ b/net/dns/host_cache.cc @@ -44,6 +44,10 @@ #include "net/log/net_log.h" #include "url/scheme_host_port.h" +#define kSecureKey kSecureKey_HostCache +#define EndpointMetadataPairToValue EndpointMetadataPairToValue_HostCache +#define EndpointMetadataPairFromValue EndpointMetadataPairFromValue_HostCache + namespace net { namespace { @@ -1332,3 +1336,7 @@ std::ostream& operator<<(std::ostream& out, return out << "EntryStaleness{" << s.expired_by << ", " << s.network_changes << ", " << s.stale_hits << "}"; } + +#undef kSecureKey +#undef EndpointMetadataPairToValue +#undef EndpointMetadataPairFromValue diff --git a/net/dns/host_resolver_cache.cc b/net/dns/host_resolver_cache.cc index 93032e14bb..a8e8ce6f22 100644 --- a/net/dns/host_resolver_cache.cc +++ b/net/dns/host_resolver_cache.cc @@ -24,6 +24,8 @@ #include "url/url_canon.h" #include "url/url_canon_stdstring.h" +#define kSecureKey kSecureKey_HostResolverCache + namespace net { namespace { @@ -453,3 +455,5 @@ base::Value HostResolverCache::SerializeEntries( } } // namespace net + +#undef kSecureKey diff --git a/net/dns/host_resolver_dns_task.cc b/net/dns/host_resolver_dns_task.cc index bec87c2963..c7c3f522b3 100644 --- a/net/dns/host_resolver_dns_task.cc +++ b/net/dns/host_resolver_dns_task.cc @@ -24,6 +24,8 @@ #include "net/dns/host_resolver_internal_result.h" #include "net/dns/public/util.h" +#define NetLogResults NetLogResults_HostResolverDnsTask + namespace net { namespace { @@ -1159,3 +1161,5 @@ bool HostResolverDnsTask::ShouldTriggerHttpToHttpsUpgrade( } } // namespace net + +#undef NetLogResults diff --git a/net/dns/host_resolver_internal_result.cc b/net/dns/host_resolver_internal_result.cc index afaf662c21..df2c1ec958 100644 --- a/net/dns/host_resolver_internal_result.cc +++ b/net/dns/host_resolver_internal_result.cc @@ -27,6 +27,9 @@ #include "url/url_canon.h" #include "url/url_canon_stdstring.h" +#define EndpointMetadataPairToValue EndpointMetadataPairToValue_HostResolverInternalResult +#define EndpointMetadataPairFromValue EndpointMetadataPairFromValue_HostResolverInternalResult + namespace net { namespace { @@ -635,3 +638,6 @@ HostResolverInternalAliasResult::HostResolverInternalAliasResult( alias_target_(MaybeCanonicalizeName(std::move(alias_target))) {} } // namespace net + +#undef EndpointMetadataPairToValue +#undef EndpointMetadataPairFromValue diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc index 644ae1d52c..d4f3716904 100644 --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc @@ -140,6 +140,8 @@ #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) +#define NetLogResults NetLogResults_HostResolverManager + namespace net { namespace { @@ -1834,3 +1836,5 @@ std::unique_ptr HostResolverManager::CreateDohProbeRunner( } } // namespace net + +#undef NetLogResults diff --git a/net/filter/filter_source_stream.cc b/net/filter/filter_source_stream.cc index 5fbbea0f88..2489cecbbe 100644 --- a/net/filter/filter_source_stream.cc +++ b/net/filter/filter_source_stream.cc @@ -29,7 +29,7 @@ namespace net { -namespace { +namespace filter_source_stream { constexpr char kDeflate[] = "deflate"; constexpr char kGZip[] = "gzip"; @@ -52,6 +52,7 @@ FilterSourceStream::~FilterSourceStream() = default; int FilterSourceStream::Read(IOBuffer* read_buffer, int read_buffer_size, CompletionOnceCallback callback) { + using namespace filter_source_stream; DCHECK_EQ(STATE_NONE, next_state_); DCHECK(read_buffer); DCHECK_LT(0, read_buffer_size); @@ -89,6 +90,7 @@ bool FilterSourceStream::MayHaveMoreBytes() const { SourceStreamType FilterSourceStream::ParseEncodingType( std::string_view encoding) { + using namespace filter_source_stream; std::string lower_encoding = base::ToLowerASCII(encoding); static constexpr auto kEncodingMap = base::MakeFixedFlatMap({ @@ -202,6 +204,7 @@ int FilterSourceStream::DoLoop(int result) { } int FilterSourceStream::DoReadData() { + using namespace filter_source_stream; // Read more data means subclasses have consumed all input or this is the // first read in which case the |drainable_input_buffer_| is not initialized. DCHECK(drainable_input_buffer_ == nullptr || diff --git a/net/filter/gzip_source_stream.cc b/net/filter/gzip_source_stream.cc index b5841091be..d647fde115 100644 --- a/net/filter/gzip_source_stream.cc +++ b/net/filter/gzip_source_stream.cc @@ -26,7 +26,7 @@ namespace net { -namespace { +namespace gzip_source_stream { const char kDeflate[] = "DEFLATE"; const char kGzip[] = "GZIP"; @@ -77,6 +77,7 @@ bool GzipSourceStream::Init() { } std::string GzipSourceStream::GetTypeAsString() const { + using namespace gzip_source_stream; switch (type()) { case SourceStreamType::kGzip: return kGzip; @@ -94,6 +95,7 @@ base::expected GzipSourceStream::FilterData( size_t input_buffer_size, size_t* consumed_bytes, bool upstream_end_reached) { + using namespace gzip_source_stream; *consumed_bytes = 0; char* input_data = input_buffer->data(); size_t input_data_size = input_buffer_size; diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc index ebaa8e9a5e..1f295d4f83 100644 --- a/net/http/http_server_properties_manager.cc +++ b/net/http/http_server_properties_manager.cc @@ -29,6 +29,8 @@ #include "url/gurl.h" #include "url/scheme_host_port.h" +#define kVersionKey kVersionKey_HTTPServerPropertiesManager + namespace net { namespace { @@ -1011,3 +1013,5 @@ void HttpServerPropertiesManager::OnHttpServerPropertiesLoaded() { } } // namespace net + +#undef kVersionKey diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc index 9179f95651..56e750ef00 100644 --- a/net/http/transport_security_persister.cc +++ b/net/http/transport_security_persister.cc @@ -30,6 +30,9 @@ #include "net/cert/x509_certificate.h" #include "net/http/transport_security_state.h" +#define kVersionKey kVersionKey_TransportSecurityPersister +#define LoadState LoadState_TransportSecurityPersister + namespace net { BASE_FEATURE(kTransportSecurityFileWriterSchedule, @@ -338,3 +341,6 @@ void TransportSecurityPersister::CompleteLoad(const std::string& state) { } } // namespace net + +#undef kVersionKey +#undef LoadState diff --git a/net/network_error_logging/network_error_logging_service.cc b/net/network_error_logging/network_error_logging_service.cc index 9166fd62cd..d172171c96 100644 --- a/net/network_error_logging/network_error_logging_service.cc +++ b/net/network_error_logging/network_error_logging_service.cc @@ -34,6 +34,11 @@ #include "url/gurl.h" #include "url/origin.h" +#define kIncludeSubdomainsKey kIncludeSubdomainsKey_NetworkErrorLoggingService +#define kMaxAgeKey kMaxAgeKey_NetworkErrorLoggingService +#define kMaxJsonSize kMaxJsonSize_NetworkErrorLoggingService +#define kMaxJsonDepth kMaxJsonDepth_NetworkErrorLoggingService + namespace net { namespace { @@ -1081,3 +1086,8 @@ NetworkErrorLoggingService::NetworkErrorLoggingService() : clock_(base::DefaultClock::GetInstance()) {} } // namespace net + +#undef kIncludeSubdomainsKey +#undef kMaxAgeKey +#undef kMaxJsonSize +#undef kMaxJsonDepth diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc index 82c6860602..cfe77c50ef 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc @@ -161,6 +161,10 @@ class DefaultPollPolicy } }; +} // namespace + +namespace configured_proxy_resolution_service { + // Config getter that always returns direct settings. class ProxyConfigServiceDirect : public ProxyConfigService { public: @@ -174,6 +178,10 @@ class ProxyConfigServiceDirect : public ProxyConfigService { } }; +} // namespace configured_proxy_resolution_service + +namespace { + // Proxy resolver that fails every time. class ProxyResolverNull : public ProxyResolver { public: @@ -895,7 +903,7 @@ std::unique_ptr ConfiguredProxyResolutionService::CreateDirect() { // Use direct connections. return std::make_unique( - std::make_unique(), + std::make_unique(), std::make_unique(), nullptr, /*quick_check_enabled=*/true); } diff --git a/net/proxy_resolution/proxy_config_service.cc b/net/proxy_resolution/proxy_config_service.cc index e32f7dd46b..25c271441b 100644 --- a/net/proxy_resolution/proxy_config_service.cc +++ b/net/proxy_resolution/proxy_config_service.cc @@ -75,6 +75,10 @@ class UnsetProxyConfigService : public ProxyConfigService { }; #endif +} // namespace + +namespace proxy_config_service { + // Config getter that always returns direct settings. class ProxyConfigServiceDirect : public ProxyConfigService { public: @@ -88,7 +92,7 @@ class ProxyConfigServiceDirect : public ProxyConfigService { } }; -} // namespace +} // namespace proxy_config_service // static std::unique_ptr @@ -133,11 +137,11 @@ ProxyConfigService::CreateSystemProxyConfigService( base::SingleThreadTaskRunner::GetCurrentDefault()); #elif BUILDFLAG(IS_FUCHSIA) // TODO(crbug.com/42050626): Implement a system proxy service for Fuchsia. - return std::make_unique(); + return std::make_unique(); #else LOG(WARNING) << "Failed to choose a system proxy settings fetcher " "for this platform."; - return std::make_unique(); + return std::make_unique(); #endif } diff --git a/net/quic/bidirectional_stream_quic_impl.cc b/net/quic/bidirectional_stream_quic_impl.cc index 83bf267ae0..141591c353 100644 --- a/net/quic/bidirectional_stream_quic_impl.cc +++ b/net/quic/bidirectional_stream_quic_impl.cc @@ -19,6 +19,8 @@ #include "net/third_party/quiche/src/quiche/quic/core/quic_connection.h" #include "quic_http_stream.h" +#define ScopedBoolSaver ScopedBoolSaver_BidirectionalStreamQuicImpl + namespace net { namespace { // Sets a boolean to a value, and restores it to the previous value once @@ -408,3 +410,5 @@ void BidirectionalStreamQuicImpl::ResetStream() { } } // namespace net + +#undef ScopedBoolSaver diff --git a/net/quic/dedicated_web_transport_http3_client.cc b/net/quic/dedicated_web_transport_http3_client.cc index 9879fd4203..0bf1ff4aec 100644 --- a/net/quic/dedicated_web_transport_http3_client.cc +++ b/net/quic/dedicated_web_transport_http3_client.cc @@ -32,6 +32,9 @@ #include "net/url_request/url_request_context.h" #include "url/scheme_host_port.h" +#define HostsFromOrigins HostsFromOrigins_DedicatedWebTransportHTTP3Client +#define HostsFromSchemeHostPorts HostsFromSchemeHostPorts_DedicatedWebTransportHTTP3Client + namespace net { namespace { @@ -1025,3 +1028,6 @@ } } // namespace net + +#undef HostsFromOrigins +#undef HostsFromSchemeHostPorts diff --git a/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc index f6becb91d0..ceaf3d57b0 100644 --- a/net/quic/quic_chromium_client_stream.cc +++ b/net/quic/quic_chromium_client_stream.cc @@ -33,6 +33,8 @@ #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_write_blocked_list.h" +#define ScopedBoolSaver ScopedBoolSaver_QuicChromiumClientStream + namespace net { namespace { // Sets a boolean to a value, and restores it to the previous value once @@ -934,3 +936,5 @@ bool QuicChromiumClientStream::IsFirstStream() { } } // namespace net + +#undef ScopedBoolSaver diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc index 9779dc5574..7751288da7 100644 --- a/net/quic/quic_session_pool.cc +++ b/net/quic/quic_session_pool.cc @@ -88,6 +88,8 @@ #include "url/scheme_host_port.h" #include "url/url_constants.h" +#define HostsFromOrigins HostsFromOrigins_QuicSessionPool + namespace net { namespace { @@ -2454,3 +2456,5 @@ bool QuicSessionPool::CryptoConfigCacheIsEmptyForTesting( } } // namespace net + +#undef HostsFromOrigins diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc index fe0b75c667..d2bff8c3c7 100644 --- a/net/reporting/reporting_header_parser.cc +++ b/net/reporting/reporting_header_parser.cc @@ -31,6 +31,9 @@ #include "net/reporting/reporting_endpoint.h" #include "net/reporting/reporting_target_type.h" +#define kIncludeSubdomainsKey kIncludeSubdomainsKey_ReportingHeaderParser +#define kMaxAgeKey kMaxAgeKey_ReportingHeaderParser + namespace net { namespace { @@ -368,3 +371,6 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader( } } // namespace net + +#undef kIncludeSubdomainsKey +#undef kMaxAgeKey diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc index 8daacdc85d..4171afe33e 100644 --- a/net/reporting/reporting_service.cc +++ b/net/reporting/reporting_service.cc @@ -30,6 +30,9 @@ #include "url/gurl.h" #include "url/origin.h" +#define kMaxJsonSize kMaxJsonSize_ReportingService +#define kMaxJsonDepth kMaxJsonDepth_ReportingService + namespace net { namespace { @@ -370,3 +373,6 @@ base::Value ReportingService::StatusAsValue() const { } } // namespace net + +#undef kMaxJsonSize +#undef kMaxJsonDepth diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc index 2a7d1ba8d5..f13761272c 100644 --- a/net/server/web_socket_encoder.cc +++ b/net/server/web_socket_encoder.cc @@ -24,6 +24,13 @@ #include "net/websockets/websocket_extension_parser.h" #include "net/websockets/websocket_frame.h" +#define kFinalBit kFinalBit_WebSocketEncoder +#define kReserved1Bit kReserved1Bit_WebSocketEncoder +#define kReserved2Bit kReserved2Bit_WebSocketEncoder +#define kReserved3Bit kReserved3Bit_WebSocketEncoder +#define kOpCodeMask kOpCodeMask_WebSocketEncoder +#define kMaskBit kMaskBit_WebSocketEncoder + namespace net { NET_EXPORT @@ -404,3 +411,10 @@ bool WebSocketEncoder::Deflate(std::string_view message, std::string* output) { } } // namespace net + +#undef kFinalBit +#undef kReserved1Bit +#undef kReserved2Bit +#undef kReserved3Bit +#undef kOpCodeMask +#undef kMaskBit diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc index defb320b2b..de17bf39d4 100644 --- a/net/websockets/websocket_channel.cc +++ b/net/websockets/websocket_channel.cc @@ -43,6 +43,8 @@ #include "net/websockets/websocket_handshake_response_info.h" #include "net/websockets/websocket_stream.h" +#define kWebSocketCloseCodeLength kWebSocketCloseCodeLength_WebSocketChannel + namespace net { class AuthChallengeInfo; class AuthCredentials; @@ -987,3 +989,5 @@ void WebSocketChannel::CloseTimeout() { } } // namespace net + +#undef kWebSocketCloseCodeLength diff --git a/net/websockets/websocket_frame.cc b/net/websockets/websocket_frame.cc index c971ff0cda..290b93542d 100644 --- a/net/websockets/websocket_frame.cc +++ b/net/websockets/websocket_frame.cc @@ -21,6 +21,14 @@ #include "net/base/net_errors.h" #include "net/websockets/websocket_errors.h" +#define kWebSocketCloseCodeLength kWebSocketCloseCodeLength_WebSocketFrame +#define kFinalBit kFinalBit_WebSocketFrame +#define kReserved1Bit kReserved1Bit_WebSocketFrame +#define kReserved2Bit kReserved2Bit_WebSocketFrame +#define kReserved3Bit kReserved3Bit_WebSocketFrame +#define kOpCodeMask kOpCodeMask_WebSocketFrame +#define kMaskBit kMaskBit_WebSocketFrame + namespace net { namespace { @@ -307,3 +315,11 @@ ParseCloseFrameResult ParseCloseFrame(base::span payload) { } } // namespace net + +#undef kWebSocketCloseCodeLength +#undef kFinalBit +#undef kReserved1Bit +#undef kReserved2Bit +#undef kReserved3Bit +#undef kOpCodeMask +#undef kMaskBit diff --git a/net/websockets/websocket_http2_handshake_stream.cc b/net/websockets/websocket_http2_handshake_stream.cc index 2ee6bcf5e2..f6507e45aa 100644 --- a/net/websockets/websocket_http2_handshake_stream.cc +++ b/net/websockets/websocket_http2_handshake_stream.cc @@ -34,6 +34,8 @@ #include "net/websockets/websocket_handshake_constants.h" #include "net/websockets/websocket_handshake_request_info.h" +#define ValidateStatus ValidateStatus_WebSocketHttp2HandshakeStream + namespace net { namespace { @@ -419,3 +421,5 @@ void WebSocketHttp2HandshakeStream::OnFailure( } } // namespace net + +#undef ValidateStatus diff --git a/net/websockets/websocket_http3_handshake_stream.cc b/net/websockets/websocket_http3_handshake_stream.cc index 41ba26fe48..55f5657768 100644 --- a/net/websockets/websocket_http3_handshake_stream.cc +++ b/net/websockets/websocket_http3_handshake_stream.cc @@ -29,6 +29,8 @@ #include "net/websockets/websocket_handshake_constants.h" #include "net/websockets/websocket_handshake_request_info.h" +#define ValidateStatus ValidateStatus_WebSocketHttp3HandshakeStream + namespace net { struct AlternativeService; @@ -401,3 +403,5 @@ void WebSocketHttp3HandshakeStream::OnFailure( } } // namespace net + +#undef ValidateStatus diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index 5ec129a9ea..de23b6d50b 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -63,6 +63,8 @@ #include #endif +#define TaskRunner TaskRunner_HttpCache + namespace net { namespace { @@ -1751,3 +1753,5 @@ void HttpCache::OnNoVarySearchCacheLoadComplete( } } // namespace net + +#undef TaskRunner diff --git a/net/http/http_proxy_connect_job.cc b/net/http/http_proxy_connect_job.cc index a34459b3f3..e2d7f0102c 100644 --- a/net/http/http_proxy_connect_job.cc +++ b/net/http/http_proxy_connect_job.cc @@ -54,6 +54,8 @@ #include "url/gurl.h" #include "url/scheme_host_port.h" +#define TaskRunner TaskRunner_HttpProxyConnectJob + namespace net { namespace { @@ -1008,3 +1010,5 @@ void HttpProxyConnectJob::EmitConnectLatency(NextProto http_version, } } // namespace net + +#undef TaskRunner diff --git a/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc index f274d6791d..aa7e92fd8f 100644 --- a/net/http/http_stream_factory_job.cc +++ b/net/http/http_stream_factory_job.cc @@ -56,6 +56,8 @@ #include "url/scheme_host_port.h" #include "url/url_constants.h" +#define TaskRunner TaskRunner_HttpStreamFactoryJob + namespace net { namespace { @@ -1348,3 +1350,5 @@ void HttpStreamFactory::Job::RecordCompletionHistograms(int result) { } } // namespace net + +#undef TaskRunner diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc index a4551d4bfd..c6664ea64f 100644 --- a/net/http/http_stream_factory_job_controller.cc +++ b/net/http/http_stream_factory_job_controller.cc @@ -45,6 +45,8 @@ #include "url/scheme_host_port.h" #include "url/url_constants.h" +#define TaskRunner TaskRunner_HttpStreamFactoryJobController + namespace net { namespace { @@ -1565,3 +1567,5 @@ void HttpStreamFactory::JobController::OnPoolPreconnectsComplete(int rv) { } } // namespace net + +#undef TaskRunner diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc index 6d9a7d4394..5f58a96b9c 100644 --- a/net/url_request/url_request_error_job.cc +++ b/net/url_request/url_request_error_job.cc @@ -12,6 +12,8 @@ #include "net/base/net_errors.h" #include "net/base/task/task_runner.h" +#define TaskRunner TaskRunner_URLRequestErrorJob + namespace net { namespace { @@ -46,3 +48,5 @@ void URLRequestErrorJob::StartAsync() { } } // namespace net + +#undef TaskRunner diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index ff36f3719d..b4a2ac28a9 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -40,6 +40,8 @@ #include "net/url_request/redirect_util.h" #include "net/url_request/url_request_context.h" +#define TaskRunner TaskRunner_URLRequestJob + namespace net { namespace { @@ -775,3 +777,5 @@ void URLRequestJob::RecordBytesRead(int bytes_read) { } } // namespace net + +#undef TaskRunner diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc index 270cbfcf40..19f5805390 100644 --- a/net/url_request/url_request_redirect_job.cc +++ b/net/url_request/url_request_redirect_job.cc @@ -27,6 +27,8 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" +#define TaskRunner TaskRunner_URLRequestRedirectJob + namespace net { namespace { @@ -117,3 +119,5 @@ void URLRequestRedirectJob::StartAsync() { } } // namespace net + +#undef TaskRunner