From 8d0d454b4e0c89c6f05d08cd9851759262e3676d Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sun, 12 May 2024 22:51:35 +0800 Subject: [PATCH] net: Remove dependency on mojo --- src/net/BUILD.gn | 2 +- src/net/cookies/cookie_partition_key.cc | 4 ++-- src/net/cookies/cookie_partition_key.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/net/BUILD.gn b/src/net/BUILD.gn index 2f3338639e..4d1de31239 100644 --- a/src/net/BUILD.gn +++ b/src/net/BUILD.gn @@ -1593,7 +1593,7 @@ component("net") { configs += [ "//build/config/compiler:optimize_max" ] } - if (!is_cronet_build) { + if (false) { deps += [ "//mojo/public/cpp/bindings:default_construct_tag" ] } } diff --git a/src/net/cookies/cookie_partition_key.cc b/src/net/cookies/cookie_partition_key.cc index 40007c4dea..128d04f186 100644 --- a/src/net/cookies/cookie_partition_key.cc +++ b/src/net/cookies/cookie_partition_key.cc @@ -14,7 +14,7 @@ #include "net/cookies/cookie_constants.h" #include "net/cookies/site_for_cookies.h" -#if !BUILDFLAG(CRONET_BUILD) +#if 0 #include "mojo/public/cpp/bindings/default_construct_tag.h" #endif @@ -41,7 +41,7 @@ CookiePartitionKey::SerializedCookiePartitionKey::TopLevelSite() const { return top_level_site_; } -#if !BUILDFLAG(CRONET_BUILD) +#if 0 CookiePartitionKey::CookiePartitionKey(mojo::DefaultConstruct::Tag) {} #endif bool CookiePartitionKey::SerializedCookiePartitionKey::has_cross_site_ancestor() diff --git a/src/net/cookies/cookie_partition_key.h b/src/net/cookies/cookie_partition_key.h index 36dc2064fd..73dba2b04e 100644 --- a/src/net/cookies/cookie_partition_key.h +++ b/src/net/cookies/cookie_partition_key.h @@ -17,7 +17,7 @@ #include "net/cookies/site_for_cookies.h" #include "url/gurl.h" -#if !BUILDFLAG(CRONET_BUILD) +#if 0 #include "mojo/public/cpp/bindings/default_construct_tag.h" #endif @@ -57,7 +57,7 @@ class NET_EXPORT CookiePartitionKey { static AncestorChainBit BoolToAncestorChainBit(bool val); CookiePartitionKey() = delete; -#if !BUILDFLAG(CRONET_BUILD) +#if 0 explicit CookiePartitionKey(mojo::DefaultConstruct::Tag); #endif CookiePartitionKey(const CookiePartitionKey& other);