Cleanup canonical_cookie.h includes

Also for net/cookies/cookie_monster.h,
net/cookies/cookie_partition_key.h and
services/network/restricted_cookie_manager.h

Removed unused includes, added forward declarations where possible.

Saves 150MB of compile size, according to the compile-size bot.

Bug: 40318405
Change-Id: I88ab337c0c660894a7f0a662d3d67b00e3bd1984
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6349077
Auto-Submit: Aldo Culquicondor <acondor@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1432148}

chrome/browser/browsing_data/browsing_data_remover_browsertest.cc

@@ -72,6 +72,7 @@
 #include "media/mojo/mojom/media_types.mojom.h"
 #include "media/mojo/services/video_decode_perf_history.h"
 #include "media/mojo/services/webrtc_video_perf_history.h"
+#include "net/base/features.h"
 #include "net/cookies/cookie_partition_key.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"

chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

@@ -34,6 +34,7 @@
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
+#include "net/base/features.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_inclusion_status.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -257,6 +257,7 @@
 #include "components/site_engagement/content/site_engagement_service.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
 #include "components/sync/base/features.h"
+#include "crypto/crypto_buildflags.h"
 #include "extensions/buildflags/buildflags.h"
 #include "media/base/media_switches.h"
 #include "pdf/buildflags.h"

chrome/browser/subresource_filter/safe_browsing_child_navigation_throttle_unittest.cc

@@ -24,6 +24,7 @@
 #include "components/subresource_filter/core/mojom/subresource_filter.mojom.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/test/navigation_simulator.h"
+#include "net/base/features.h"
 #include "services/network/public/cpp/features.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"

chrome/browser/ui/browser_navigator_browsertest.cc

@@ -57,6 +57,7 @@
 #include "content/public/test/test_frame_navigation_observer.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
+#include "net/base/features.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/request_handler_util.h"

components/component_updater/installer_policies/first_party_sets_component_installer_policy.cc

@@ -13,6 +13,7 @@
 #include "base/files/file_util.h"
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
+#include "base/logging.h"
 #include "base/no_destructor.h"
 #include "base/path_service.h"
 #include "base/task/thread_pool.h"

components/content_settings/core/common/cookie_settings_base.cc

@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/not_fatal_until.h"
 #include "base/notreached.h"
+#include "base/rand_util.h"
 #include "base/types/optional_ref.h"
 #include "base/types/optional_util.h"
 #include "build/build_config.h"

content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc

@@ -18,6 +18,7 @@
 #include "content/public/test/browser_task_environment.h"
 #include "content/public/test/test_browser_context.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_deletion_info.h"
 #include "services/network/cookie_manager.h"

content/browser/browsing_data/browsing_data_remover_impl_unittest.cc

@@ -58,6 +58,7 @@
 #include "content/public/test/test_storage_partition.h"
 #include "content/public/test/test_utils.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_deletion_info.h"
 #include "net/cookies/cookie_store.h"
 #include "net/http/http_network_session.h"

content/browser/cookie_store/cookie_change_subscription.cc

@@ -9,6 +9,8 @@
 #include "content/browser/cookie_store/cookie_change_subscriptions.pb.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
+#include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_util.h"
 #include "services/network/public/cpp/is_potentially_trustworthy.h"

content/browser/storage_partition_impl_unittest.cc

@@ -83,6 +83,7 @@
 #include "net/base/schemeful_site.h"
 #include "net/base/test_completion_callback.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_access_result.h"
 #include "net/cookies/cookie_inclusion_status.h"
 #include "ppapi/buildflags/buildflags.h"

ios/net/cookies/cookie_store_ios.mm

@@ -29,6 +29,7 @@
 #import "ios/net/cookies/system_cookie_util.h"
 #import "ios/net/ios_net_buildflags.h"
 #import "net/base/apple/url_conversions.h"
+#import "net/cookies/cookie_access_params.h"
 #import "net/cookies/cookie_constants.h"
 #import "net/cookies/cookie_util.h"
 #import "net/cookies/parsed_cookie.h"

ios/web/download/download_session_cookie_storage.mm

@@ -8,6 +8,7 @@
 #import "ios/net/cookies/system_cookie_util.h"
 #import "net/base/apple/url_conversions.h"
 #import "net/cookies/canonical_cookie.h"
+#import "net/cookies/cookie_access_params.h"
 #import "net/cookies/cookie_constants.h"
 
 @implementation DownloadSessionCookieStorage {

ios/web/net/cookies/wk_http_system_cookie_store.mm

@@ -22,6 +22,7 @@
 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
 #import "net/base/apple/url_conversions.h"
 #import "net/cookies/canonical_cookie.h"
+#import "net/cookies/cookie_access_params.h"
 #import "net/cookies/cookie_constants.h"
 #import "url/gurl.h"
 

net/cookies/canonical_cookie.cc

@@ -64,6 +64,7 @@
 #include "base/strings/stringprintf.h"
 #include "net/base/features.h"
 #include "net/base/url_util.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_options.h"

net/cookies/canonical_cookie.h

@@ -11,30 +11,29 @@
 #include <string_view>
 #include <vector>
 
-#include "base/feature_list.h"
-#include "base/gtest_prod_util.h"
 #include "base/rand_util.h"
-#include "base/time/time.h"
 #include "base/types/pass_key.h"
 #include "crypto/process_bound_string.h"
-#include "net/base/features.h"
 #include "net/base/net_export.h"
-#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_access_result.h"
 #include "net/cookies/cookie_base.h"
 #include "net/cookies/cookie_constants.h"
-#include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_options.h"
-#include "net/cookies/cookie_partition_key.h"
 #include "net/cookies/unique_cookie_key.h"
 #include "url/third_party/mozilla/url_parse.h"
 
 class GURL;
 
+namespace base {
+class Time;
+}  // namespace base
+
 namespace net {
 
 class ParsedCookie;
 class CanonicalCookie;
+class CookieInclusionStatus;
+class CookiePartitionKey;
 
 struct CookieWithAccessResult;
 struct CookieAndLineWithAccessResult;

net/cookies/canonical_cookie_proto_converter.cc

@@ -9,6 +9,7 @@
 #include <string>
 #include <utility>
 
+#include "base/notreached.h"
 #include "base/types/expected.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"

net/cookies/canonical_cookie_unittest.cc

@@ -15,6 +15,7 @@
 #include "build/build_config.h"
 #include "net/base/features.h"
 #include "net/cookies/canonical_cookie_test_helpers.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_options.h"

net/cookies/cookie_base.cc

@@ -9,6 +9,7 @@
 #include "base/strings/strcat.h"
 #include "base/types/pass_key.h"
 #include "net/base/features.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_util.h"

net/cookies/cookie_base.h

@@ -11,17 +11,20 @@
 
 #include "base/types/pass_key.h"
 #include "net/base/net_export.h"
-#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_access_result.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_options.h"
-#include "net/cookies/cookie_partition_key.h"
 #include "net/cookies/unique_cookie_key.h"
 
 class GURL;
 
 namespace net {
 
+class CookiePartitionKey;
+
+struct CookieAccessParams;
+struct CookieAccessResult;
+
 // A base class for cookies and cookie-like objects. Encapsulates logic for
 // determining whether a cookie could be sent/set, based on its attributes and
 // the request context.

net/cookies/cookie_deletion_info_unittest.cc

@@ -6,6 +6,7 @@
 
 #include "base/test/scoped_feature_list.h"
 #include "net/base/features.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"

net/cookies/cookie_monster.cc

@@ -82,6 +82,7 @@
 #include "net/base/schemeful_site.h"
 #include "net/base/url_util.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_base.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_monster_change_dispatcher.h"

net/cookies/cookie_monster.h

@@ -26,14 +26,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/rand_util.h"
 #include "base/thread_annotations.h"
-#include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/base/schemeful_site.h"
-#include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_access_delegate.h"
 #include "net/cookies/cookie_constants.h"
-#include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_monster_change_dispatcher.h"
 #include "net/cookies/cookie_store.h"
 #include "net/log/net_log_with_source.h"
@@ -41,7 +38,9 @@
 
 namespace net {
 
+class CanonicalCookie;
 class CookieChangeDispatcher;
+class CookieInclusionStatus;
 
 // The cookie monster is the system for storing and retrieving cookies. It has
 // an in-memory list of all cookies, and synchronizes non-session cookies to an

net/cookies/cookie_monster_change_dispatcher.cc

@@ -15,6 +15,7 @@
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_access_delegate.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_change_dispatcher.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_monster.h"

net/cookies/cookie_partition_key.h

@@ -12,7 +12,6 @@
 #include "base/types/expected.h"
 #include "base/types/optional_ref.h"
 #include "net/base/cronet_buildflags.h"
-#include "net/base/features.h"
 #include "net/base/net_export.h"
 #include "net/base/network_isolation_key.h"
 #include "net/base/schemeful_site.h"

net/cookies/cookie_util.cc

@@ -36,7 +36,9 @@
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/base/schemeful_site.h"
 #include "net/base/url_util.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_access_delegate.h"
+#include "net/cookies/cookie_access_result.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_monster.h"

net/cookies/cookie_util.h

@@ -13,8 +13,6 @@
 #include "base/time/time.h"
 #include "base/types/optional_ref.h"
 #include "net/base/net_export.h"
-#include "net/cookies/canonical_cookie.h"
-#include "net/cookies/cookie_access_result.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_setting_override.h"
@@ -28,11 +26,18 @@ class GURL;
 
 namespace net {
 
-class IsolationInfo;
-class SchemefulSite;
+class CanonicalCookie;
 class CookieAccessDelegate;
 class CookieInclusionStatus;
+class IsolationInfo;
 class ParsedCookie;
+class SchemefulSite;
+
+struct CookieAccessResult;
+struct CookieWithAccessResult;
+
+using CookieList = std::vector<CanonicalCookie>;
+using CookieAccessResultList = std::vector<CookieWithAccessResult>;
 
 namespace cookie_util {
 

net/cookies/cookie_util_unittest.cc

@@ -19,7 +19,9 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
 #include "net/base/features.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
+#include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_options.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

net/device_bound_sessions/session.cc

@@ -10,6 +10,7 @@
 #include "components/unexportable_keys/unexportable_key_id.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_store.h"

net/device_bound_sessions/session_service_impl.cc

@@ -10,6 +10,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/task/sequenced_task_runner.h"
 #include "components/unexportable_keys/unexportable_key_service.h"
+#include "net/base/features.h"
 #include "net/base/schemeful_site.h"
 #include "net/device_bound_sessions/registration_request_param.h"
 #include "net/device_bound_sessions/session_store.h"

net/device_bound_sessions/session_store.h

@@ -5,11 +5,17 @@
 #ifndef NET_DEVICE_BOUND_SESSIONS_SESSION_STORE_H_
 #define NET_DEVICE_BOUND_SESSIONS_SESSION_STORE_H_
 
+#include <map>
 #include <memory>
 #include <string>
 
+#include "base/functional/callback.h"
 #include "net/device_bound_sessions/session.h"
 
+namespace base {
+class FilePath;
+}  // namespace base
+
 namespace net {
 class SchemefulSite;
 }

services/network/restricted_cookie_manager.cc

@@ -31,6 +31,7 @@
 #include "net/base/isolation_info.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_access_params.h"
 #include "net/cookies/cookie_access_result.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_inclusion_status.h"

services/network/restricted_cookie_manager.h

@@ -12,23 +12,17 @@
 
 #include "base/component_export.h"
 #include "base/containers/linked_list.h"
-#include "base/functional/callback_forward.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/raw_ref.h"
 #include "base/memory/weak_ptr.h"
 #include "base/rand_util.h"
-#include "base/sequence_checker.h"
 #include "base/timer/timer.h"
 #include "mojo/public/cpp/base/shared_memory_version.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/isolation_info.h"
-#include "net/cookies/canonical_cookie.h"
-#include "net/cookies/cookie_change_dispatcher.h"
-#include "net/cookies/cookie_inclusion_status.h"
 #include "net/cookies/cookie_partition_key_collection.h"
 #include "net/cookies/cookie_setting_override.h"
-#include "net/cookies/cookie_store.h"
 #include "net/first_party_sets/first_party_set_metadata.h"
 #include "net/storage_access_api/status.h"
 #include "services/network/public/mojom/cookie_access_observer.mojom.h"
@@ -37,6 +31,8 @@
 #include "url/origin.h"
 
 namespace net {
+class CanonicalCookie;
+class CookieInclusionStatus;
 class CookieStore;
 class SiteForCookies;
 }  // namespace net