Remove unnecessary includes in a number of net/ files.

In particular, remove them from net/ssl/ssl_info.h,
net/url_request/url_request_context.h, and
net/http/alternative_service.h. The first two were among the top 550
edges in terms of total contributions to translation unit size when
building Chrome, and the third I noticed when dealing with the fallout.

Also fix a bunch of IWYU issues that this revealed. The only interesting
one of these is transport_security_state_static.template.  The file
attempts to include a number of headers, but since it's always included
in a nested namespace, this doesn't actually work. It was only building
because files that include it already included
transport_security_state_source.h, and the other two headers it
includes are entirely inlined, which isn't a reasonable expectation.
Instead, have files that include it bring in those headers themselves.

Bug: 1227131
Change-Id: Idb2a1637c1e5cd0b8ae7cd741c62f4c26a11de6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3078384
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Reviewed-by: Carlos IL <carlosil@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#912654}

chrome/browser/chrome_content_browser_client.cc

@@ -280,6 +280,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "net/ssl/ssl_private_key.h"
 #include "pdf/buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"

components/cronet/cronet_url_request.cc

@@ -20,10 +20,12 @@
 #include "net/base/request_priority.h"
 #include "net/base/upload_data_stream.h"
 #include "net/cert/cert_status_flags.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/http/http_util.h"
 #include "net/ssl/ssl_info.h"
+#include "net/ssl/ssl_private_key.h"
 #include "net/third_party/quiche/src/quic/core/quic_packets.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/redirect_info.h"

components/cronet/cronet_url_request_context.cc

@@ -45,8 +45,10 @@
 #include "net/base/url_util.h"
 #include "net/cert/caching_cert_verifier.h"
 #include "net/cert/cert_verifier.h"
+#include "net/cert/x509_certificate.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_auth_handler_factory.h"
+#include "net/http/transport_security_state.h"
 #include "net/log/file_net_log_observer.h"
 #include "net/log/net_log_util.h"
 #include "net/net_buildflags.h"

components/cronet/ios/cronet_environment.mm

@@ -41,6 +41,7 @@
 #include "net/http/http_server_properties.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
+#include "net/http/transport_security_state.h"
 #include "net/log/file_net_log_observer.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"

components/security_interstitials/content/ssl_error_assistant.cc

@@ -11,6 +11,7 @@
 #include "components/grit/components_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
+#include "net/cert/x509_certificate.h"
 #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "third_party/re2/src/re2/re2.h"
 #include "ui/base/resource/resource_bundle.h"

components/security_interstitials/content/ssl_error_navigation_throttle.h

@@ -13,6 +13,7 @@
 #include "content/public/browser/navigation_throttle.h"
 #include "net/ssl/ssl_info.h"
 
+class GURL;
 class SSLCertReporter;
 
 namespace content {

components/security_interstitials/core/common_string_util.cc

@@ -12,6 +12,7 @@
 #include "components/url_formatter/url_formatter.h"
 #include "net/base/net_errors.h"
 #include "net/cert/ct_sct_to_string.h"
+#include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace security_interstitials {

net/cert_net/cert_net_fetcher_url_request.cc

@@ -72,6 +72,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
+#include "net/base/io_buffer.h"
 #include "net/base/isolation_info.h"
 #include "net/base/load_flags.h"
 #include "net/cert/cert_net_fetcher.h"

net/cert_net/cert_net_fetcher_url_request_unittest.cc

@@ -20,6 +20,7 @@
 #include "net/dns/mock_host_resolver.h"
 #include "net/dns/public/secure_dns_policy.h"
 #include "net/http/http_server_properties.h"
+#include "net/http/transport_security_state.h"
 #include "net/proxy_resolution/configured_proxy_resolution_service.h"
 #include "net/quic/quic_context.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"

net/http/alternative_service.cc

@@ -9,6 +9,7 @@
 #include "base/metrics/histogram_macros_local.h"
 #include "base/notreached.h"
 #include "base/strings/stringprintf.h"
+#include "net/base/port_util.h"
 
 namespace net {
 

net/http/alternative_service.h

@@ -14,7 +14,6 @@
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
-#include "net/base/port_util.h"
 #include "net/quic/quic_http_utils.h"
 #include "net/socket/next_proto.h"
 #include "net/third_party/quiche/src/quic/core/quic_versions.h"

net/http/http_transaction_test_util.cc

@@ -34,6 +34,7 @@
 #include "net/log/net_log.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_with_source.h"
+#include "net/ssl/ssl_private_key.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 

net/http/http_transaction_test_util.h

@@ -14,6 +14,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_once_callback.h"
 #include "net/base/io_buffer.h"
@@ -23,6 +24,7 @@
 #include "net/base/request_priority.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/transport_info.h"
+#include "net/cert/x509_certificate.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_request_info.h"
@@ -34,7 +36,6 @@ namespace net {
 
 class IOBuffer;
 class SSLPrivateKey;
-class X509Certificate;
 class NetLogWithSource;
 struct HttpRequestInfo;
 

net/http/transport_security_state_static_unittest.template

@@ -6,10 +6,9 @@
 // See transport_security_state_static.template for more information on the data
 // in this file.
 
-#include <stdint.h>
-
-#include "base/cxx17_backports.h"
-#include "net/http/transport_security_state_source.h"
+// Note that consumers must include <stdint.h>, "base/cxx17_backports.h", and
+// "net/http/transport_security_state_source.h", which this file cannot do
+// itself, since it's always included in a nested namespace.
 
 [[SPKI_HASHES]]
 

net/http/transport_security_state_unittest.cc

@@ -4,6 +4,8 @@
 
 #include "net/http/transport_security_state.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -11,6 +13,7 @@
 
 #include "base/base64.h"
 #include "base/callback_helpers.h"
+#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/metrics/field_trial.h"
@@ -42,6 +45,7 @@
 #include "net/extras/preload_data/decoder.h"
 #include "net/http/http_status_code.h"
 #include "net/http/http_util.h"
+#include "net/http/transport_security_state_source.h"
 #include "net/net_buildflags.h"
 #include "net/ssl/ssl_info.h"
 #include "net/test/cert_test_util.h"

net/quic/dedicated_web_transport_http3_client.cc

@@ -9,6 +9,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/abseil_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "net/base/port_util.h"
 #include "net/base/url_util.h"
 #include "net/proxy_resolution/configured_proxy_resolution_service.h"
 #include "net/proxy_resolution/proxy_resolution_request.h"

net/ssl/ssl_info.h

@@ -17,7 +17,6 @@
 #include "net/cert/sct_status_flags.h"
 #include "net/cert/signed_certificate_timestamp_and_status.h"
 #include "net/cert/x509_cert_types.h"
-#include "net/ssl/ssl_config.h"
 
 namespace net {
 

net/test/url_request/url_request_mock_data_job.cc

@@ -15,10 +15,12 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/io_buffer.h"
 #include "net/base/url_util.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "net/ssl/ssl_private_key.h"
 #include "net/url_request/url_request_filter.h"
 
 namespace net {

net/url_request/url_fetcher_core.cc

@@ -25,7 +25,9 @@
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/http_response_headers.h"
+#include "net/ssl/ssl_private_key.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_fetcher_response_writer.h"

net/url_request/url_fetcher_core.h

@@ -16,6 +16,7 @@
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_refptr.h"
 #include "base/timer/timer.h"
 #include "net/base/chunked_upload_data_stream.h"
 #include "net/base/ip_endpoint.h"

net/url_request/url_request.cc

@@ -23,6 +23,7 @@
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_delegate.h"
 #include "net/base/upload_data_stream.h"
+#include "net/cert/x509_certificate.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/same_party_context.h"
@@ -34,6 +35,7 @@
 #include "net/log/net_log_source_type.h"
 #include "net/socket/next_proto.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "net/ssl/ssl_private_key.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/redirect_util.h"
 #include "net/url_request/url_request_context.h"

net/url_request/url_request_context.h

@@ -21,8 +21,6 @@
 #include "build/chromeos_buildflags.h"
 #include "net/base/net_export.h"
 #include "net/base/request_priority.h"
-#include "net/http/http_server_properties.h"
-#include "net/http/transport_security_state.h"
 #include "net/net_buildflags.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_request.h"
@@ -41,6 +39,7 @@ class HostResolver;
 class HttpAuthHandlerFactory;
 struct HttpNetworkSessionContext;
 struct HttpNetworkSessionParams;
+class HttpServerProperties;
 class HttpTransactionFactory;
 class HttpUserAgentSettings;
 class NetLog;
@@ -51,6 +50,7 @@ class ProxyResolutionService;
 class QuicContext;
 class SCTAuditingDelegate;
 class SSLConfigService;
+class TransportSecurityState;
 class URLRequest;
 class URLRequestJobFactory;
 class URLRequestThrottlerManager;

net/url_request/url_request_context_storage.cc

@@ -9,6 +9,7 @@
 #include "base/check.h"
 #include "net/base/http_user_agent_settings.h"
 #include "net/base/network_delegate.h"
+#include "net/base/port_util.h"
 #include "net/base/proxy_delegate.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/ct_policy_enforcer.h"
@@ -19,6 +20,7 @@
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_transaction_factory.h"
+#include "net/http/transport_security_state.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/quic/quic_context.h"
 #include "net/ssl/ssl_config_service.h"

net/url_request/url_request_http_job.cc

@@ -63,6 +63,7 @@
 #include "net/http/http_transaction.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
+#include "net/http/transport_security_state.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_values.h"

net/url_request/url_request_http_job_unittest.cc

@@ -35,6 +35,7 @@
 #include "net/cookies/cookie_store_test_helpers.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_transaction_test_util.h"
+#include "net/http/transport_security_state.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/test_net_log.h"
 #include "net/log/test_net_log_util.h"

net/url_request/url_request_job.cc

@@ -23,11 +23,13 @@
 #include "net/base/net_errors.h"
 #include "net/base/network_delegate.h"
 #include "net/base/proxy_server.h"
+#include "net/cert/x509_certificate.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_with_source.h"
 #include "net/nqe/network_quality_estimator.h"
+#include "net/ssl/ssl_private_key.h"
 #include "net/url_request/redirect_util.h"
 #include "net/url_request/url_request_context.h"
 

net/url_request/url_request_quic_unittest.cc

@@ -24,6 +24,7 @@
 #include "net/cert/mock_cert_verifier.h"
 #include "net/dns/mapped_host_resolver.h"
 #include "net/dns/mock_host_resolver.h"
+#include "net/http/transport_security_state.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/test_net_log.h"
 #include "net/log/test_net_log_util.h"

net/url_request/url_request_unittest.cc

@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <iterator>
+#include <limits>
 #include <memory>
 #include <utility>
 
@@ -20,12 +23,6 @@
 #include <wrl/client.h>
 #endif
 
-#include <stdint.h>
-
-#include <algorithm>
-#include <limits>
-#include <memory>
-
 #include "base/base64url.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ -105,6 +102,8 @@
 #include "net/http/http_server_properties.h"
 #include "net/http/http_transaction_test_util.h"
 #include "net/http/http_util.h"
+#include "net/http/transport_security_state.h"
+#include "net/http/transport_security_state_source.h"
 #include "net/log/file_net_log_observer.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"

net/websockets/websocket_channel_test.cc

@@ -26,6 +26,7 @@
 #include "base/strings/string_piece.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/completion_once_callback.h"
+#include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"

net/websockets/websocket_end_to_end_test.cc

@@ -38,6 +38,7 @@
 #include "net/base/url_util.h"
 #include "net/cert/ct_policy_status.h"
 #include "net/http/http_request_headers.h"
+#include "net/http/transport_security_state.h"
 #include "net/log/net_log.h"
 #include "net/proxy_resolution/configured_proxy_resolution_service.h"
 #include "net/proxy_resolution/proxy_config.h"

services/network/expect_ct_reporter.cc

@@ -23,6 +23,7 @@
 #include "net/base/isolation_info.h"
 #include "net/base/load_flags.h"
 #include "net/cert/ct_serialization.h"
+#include "net/cert/x509_certificate.h"
 #include "net/http/http_request_headers.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/report_sender.h"

services/network/network_service.cc

@@ -43,6 +43,7 @@
 #include "net/dns/host_resolver_manager.h"
 #include "net/dns/public/dns_config_overrides.h"
 #include "net/http/http_auth_handler_factory.h"
+#include "net/http/transport_security_state.h"
 #include "net/log/file_net_log_observer.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_capture_mode.h"

services/network/tls_client_socket.h

@@ -24,6 +24,7 @@ namespace net {
 class ClientSocketFactory;
 class SSLClientContext;
 class SSLClientSocket;
+struct SSLConfig;
 class StreamSocket;
 }  // namespace net
 

services/network/tls_socket_factory.cc

@@ -14,6 +14,7 @@
 #include "net/cert/ct_policy_enforcer.h"
 #include "net/cert/multi_log_ct_verifier.h"
 #include "net/http/http_network_session.h"
+#include "net/http/transport_security_state.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/stream_socket.h"
 #include "net/ssl/ssl_config.h"

services/network/trust_tokens/trust_token_key_commitment_controller.cc

@@ -20,6 +20,7 @@
 #include "services/network/trust_tokens/trust_token_parameterization.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace network {
 

services/network/trust_tokens/trust_token_key_commitment_controller.h

@@ -26,6 +26,10 @@ struct RedirectInfo;
 class URLRequest;
 }  // namespace net
 
+namespace url {
+class Origin;
+}
+
 namespace network {
 
 namespace internal {