Move TPCD prefs and constants to components/ dir.
This is needed to use in components/ tests in https://chromium-review.googlesource.com/c/chromium/src/+/5653028.
Change-Id: Ic5ba04b3d4b99389ca9c27dea0d47a255d9c89c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5659140
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Anton Maliev <amaliev@chromium.org>
Reviewed-by: Abe Boujane <boujane@google.com>
Cr-Commit-Position: refs/heads/main@{#1319976}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 5bc0675..7d1bf84 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1751,9 +1751,6 @@
"tpcd/experiment/experiment_manager_impl.h",
"tpcd/experiment/tpcd_experiment_features.cc",
"tpcd/experiment/tpcd_experiment_features.h",
- "tpcd/experiment/tpcd_pref_names.cc",
- "tpcd/experiment/tpcd_pref_names.h",
- "tpcd/experiment/tpcd_utils.h",
"tpcd/heuristics/opener_heuristic_metrics.cc",
"tpcd/heuristics/opener_heuristic_metrics.h",
"tpcd/heuristics/opener_heuristic_service.cc",
@@ -2363,6 +2360,7 @@
"//components/prefs",
"//components/privacy_sandbox",
"//components/privacy_sandbox:privacy_sandbox_prefs",
+ "//components/privacy_sandbox:tpcd",
"//components/privacy_sandbox:tracking_protection_onboarding",
"//components/privacy_sandbox:tracking_protection_prefs",
"//components/privacy_sandbox:tracking_protection_reminder_service",
diff --git a/chrome/browser/page_load_metrics/observers/third_party_cookie_deprecation_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/third_party_cookie_deprecation_metrics_observer_browsertest.cc
index 25f2ec9..353d34e 100644
--- a/chrome/browser/page_load_metrics/observers/third_party_cookie_deprecation_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/third_party_cookie_deprecation_metrics_observer_browsertest.cc
@@ -18,8 +18,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h"
#include "chrome/browser/tpcd/experiment/tpcd_experiment_features.h"
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "chrome/browser/tpcd/support/top_level_trial_service.h"
#include "chrome/browser/tpcd/support/top_level_trial_service_factory.h"
#include "chrome/browser/tpcd/support/tpcd_support_service.h"
@@ -36,6 +34,8 @@
#include "components/content_settings/core/common/pref_names.h"
#include "components/network_session_configurator/common/network_switches.h"
#include "components/prefs/pref_service.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
#include "components/privacy_sandbox/tracking_protection_onboarding.h"
#include "components/subresource_filter/core/common/common_features.h"
#include "components/subresource_filter/core/common/test_ruleset_utils.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 8d750cf..e236744 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -73,7 +73,6 @@
#include "chrome/browser/sharing_hub/sharing_hub_features.h"
#include "chrome/browser/ssl/ssl_config_service_manager.h"
#include "chrome/browser/task_manager/task_manager_interface.h"
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
#include "chrome/browser/tracing/chrome_tracing_delegate.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/hats/hats_service_desktop.h"
@@ -96,6 +95,7 @@
#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
#include "chrome/browser/ui/webui/policy/policy_ui.h"
#include "chrome/browser/ui/webui/print_preview/policy_settings.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/subresource_filter/ad_heuristic_tpcd_browsertest.cc b/chrome/browser/subresource_filter/ad_heuristic_tpcd_browsertest.cc
index ac4c08c..18a71b8 100644
--- a/chrome/browser/subresource_filter/ad_heuristic_tpcd_browsertest.cc
+++ b/chrome/browser/subresource_filter/ad_heuristic_tpcd_browsertest.cc
@@ -21,8 +21,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h"
#include "chrome/browser/tpcd/experiment/tpcd_experiment_features.h"
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "chrome/browser/tpcd/support/tpcd_support_service.h"
#include "chrome/browser/tpcd/support/tpcd_support_service_factory.h"
#include "chrome/browser/tpcd/support/validity_service.h"
@@ -38,6 +36,8 @@
#include "components/metrics/content/subprocess_metrics_provider.h"
#include "components/network_session_configurator/common/network_switches.h"
#include "components/prefs/pref_service.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
#include "components/privacy_sandbox/tracking_protection_prefs.h"
#include "components/subresource_filter/core/common/test_ruleset_utils.h"
#include "components/tpcd/metadata/browser/parser.h"
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.cc b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
index 39c1c8b..47480e791 100644
--- a/chrome/browser/tab_contents/navigation_metrics_recorder.cc
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder.cc
@@ -13,9 +13,9 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tpcd/experiment/experiment_manager_impl.h"
#include "chrome/browser/tpcd/experiment/tpcd_experiment_features.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "components/content_settings/core/browser/cookie_settings.h"
#include "components/navigation_metrics/navigation_metrics.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
#include "components/profile_metrics/browser_profile_type.h"
#include "components/site_engagement/content/site_engagement_service.h"
#include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc b/chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc
index e86d0ad0..bc32021 100644
--- a/chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc
@@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
+
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
#include "chrome/browser/tpcd/experiment/tpcd_experiment_features.h"
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -17,6 +16,8 @@
#include "components/content_settings/core/common/features.h"
#include "components/navigation_metrics/navigation_metrics.h"
#include "components/prefs/pref_service.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
#include "components/site_engagement/content/site_engagement_score.h"
#include "components/site_engagement/content/site_engagement_service.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/tpcd/experiment/BUILD.gn b/chrome/browser/tpcd/experiment/BUILD.gn
index 4d60186b3..5b763d6 100644
--- a/chrome/browser/tpcd/experiment/BUILD.gn
+++ b/chrome/browser/tpcd/experiment/BUILD.gn
@@ -17,6 +17,7 @@
"//chrome/test:test_support",
"//components/privacy_sandbox:privacy_sandbox_settings_headers",
"//components/privacy_sandbox:test_support",
+ "//components/privacy_sandbox:tpcd",
"//components/privacy_sandbox:tracking_protection_onboarding",
"//components/privacy_sandbox:tracking_protection_prefs",
"//content/test:test_support",
diff --git a/chrome/browser/tpcd/experiment/DEPS b/chrome/browser/tpcd/experiment/DEPS
index 7f0c531..10efb725 100644
--- a/chrome/browser/tpcd/experiment/DEPS
+++ b/chrome/browser/tpcd/experiment/DEPS
@@ -1,3 +1,4 @@
include_rules = [
"+components/keyed_service",
+ "+components/privacy_sandbox",
]
diff --git a/chrome/browser/tpcd/experiment/experiment_manager_impl.cc b/chrome/browser/tpcd/experiment/experiment_manager_impl.cc
index 2682e84f..50ee091c 100644
--- a/chrome/browser/tpcd/experiment/experiment_manager_impl.cc
+++ b/chrome/browser/tpcd/experiment/experiment_manager_impl.cc
@@ -23,10 +23,10 @@
#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tpcd/experiment/tpcd_experiment_features.h"
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/prefs/pref_service.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
#include "components/variations/synthetic_trials.h"
#include "content/public/common/content_features.h"
diff --git a/chrome/browser/tpcd/experiment/experiment_manager_impl_browsertest.cc b/chrome/browser/tpcd/experiment/experiment_manager_impl_browsertest.cc
index fdfd8501..ba95725 100644
--- a/chrome/browser/tpcd/experiment/experiment_manager_impl_browsertest.cc
+++ b/chrome/browser/tpcd/experiment/experiment_manager_impl_browsertest.cc
@@ -21,14 +21,14 @@
#include "chrome/browser/privacy_sandbox/tracking_protection_onboarding_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tpcd/experiment/tpcd_experiment_features.h"
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/metrics/metrics_service.h"
#include "components/prefs/pref_service.h"
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
#include "components/privacy_sandbox/tracking_protection_onboarding.h"
#include "components/variations/active_field_trials.h"
#include "components/variations/hashing.h"
diff --git a/chrome/browser/tpcd/experiment/experiment_manager_impl_unittest.cc b/chrome/browser/tpcd/experiment/experiment_manager_impl_unittest.cc
index 15eb123..e6f282b 100644
--- a/chrome/browser/tpcd/experiment/experiment_manager_impl_unittest.cc
+++ b/chrome/browser/tpcd/experiment/experiment_manager_impl_unittest.cc
@@ -11,12 +11,12 @@
#include "build/buildflag.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/tpcd/experiment/tpcd_experiment_features.h"
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/prefs/testing_pref_service.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
#include "content/public/common/content_features.h"
#include "content/public/test/browser_task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 697e971..af9478b9 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1988,6 +1988,7 @@
"//components/privacy_sandbox",
"//components/privacy_sandbox:privacy_sandbox_prefs",
"//components/privacy_sandbox:test_support",
+ "//components/privacy_sandbox:tpcd",
"//components/privacy_sandbox:tracking_protection_onboarding",
"//components/privacy_sandbox:tracking_protection_prefs",
"//components/privacy_sandbox:tracking_protection_settings",
@@ -7108,6 +7109,7 @@
"//components/policy/test_support:unittests",
"//components/privacy_sandbox:privacy_sandbox",
"//components/privacy_sandbox:privacy_sandbox_prefs",
+ "//components/privacy_sandbox:tpcd",
"//components/privacy_sandbox:tracking_protection_onboarding",
"//components/privacy_sandbox:tracking_protection_prefs",
"//components/privacy_sandbox:tracking_protection_settings",
diff --git a/components/privacy_sandbox/BUILD.gn b/components/privacy_sandbox/BUILD.gn
index b354a29..1b1869e 100644
--- a/components/privacy_sandbox/BUILD.gn
+++ b/components/privacy_sandbox/BUILD.gn
@@ -136,6 +136,21 @@
public_deps = [ "//base" ]
}
+source_set("tpcd") {
+ sources = [
+ "tpcd_pref_names.cc",
+ "tpcd_pref_names.h",
+ "tpcd_utils.h",
+ ]
+
+ deps = [
+ "//components/pref_registry:pref_registry",
+ "//components/prefs",
+ ]
+
+ public_deps = [ "//base" ]
+}
+
# These sources depend on targets from "//content/browser", which means they can't be
# loaded on ios.
# TOOD(b/301947962): Delete this check after CookieSettings is removed from iOS.
diff --git a/chrome/browser/tpcd/experiment/tpcd_pref_names.cc b/components/privacy_sandbox/tpcd_pref_names.cc
similarity index 86%
rename from chrome/browser/tpcd/experiment/tpcd_pref_names.cc
rename to components/privacy_sandbox/tpcd_pref_names.cc
index 0e5577f..99dcdd7 100644
--- a/chrome/browser/tpcd/experiment/tpcd_pref_names.cc
+++ b/components/privacy_sandbox/tpcd_pref_names.cc
@@ -1,11 +1,11 @@
-// Copyright 2023 The Chromium Authors
+// Copyright 2024 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
+#include "components/privacy_sandbox/tpcd_pref_names.h"
-#include "chrome/browser/tpcd/experiment/tpcd_utils.h"
#include "components/prefs/pref_registry_simple.h"
+#include "components/privacy_sandbox/tpcd_utils.h"
namespace tpcd::experiment {
namespace prefs {
diff --git a/chrome/browser/tpcd/experiment/tpcd_pref_names.h b/components/privacy_sandbox/tpcd_pref_names.h
similarity index 82%
rename from chrome/browser/tpcd/experiment/tpcd_pref_names.h
rename to components/privacy_sandbox/tpcd_pref_names.h
index 26ee334..78f7b64 100644
--- a/chrome/browser/tpcd/experiment/tpcd_pref_names.h
+++ b/components/privacy_sandbox/tpcd_pref_names.h
@@ -1,9 +1,9 @@
-// Copyright 2023 The Chromium Authors
+// Copyright 2024 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_TPCD_EXPERIMENT_TPCD_PREF_NAMES_H_
-#define CHROME_BROWSER_TPCD_EXPERIMENT_TPCD_PREF_NAMES_H_
+#ifndef COMPONENTS_PRIVACY_SANDBOX_TPCD_PREF_NAMES_H_
+#define COMPONENTS_PRIVACY_SANDBOX_TPCD_PREF_NAMES_H_
class PrefRegistrySimple;
@@ -35,4 +35,4 @@
} // namespace tpcd::experiment
-#endif // CHROME_BROWSER_TPCD_EXPERIMENT_TPCD_PREF_NAMES_H_
+#endif // COMPONENTS_PRIVACY_SANDBOX_TPCD_PREF_NAMES_H_
diff --git a/chrome/browser/tpcd/experiment/tpcd_utils.h b/components/privacy_sandbox/tpcd_utils.h
similarity index 81%
rename from chrome/browser/tpcd/experiment/tpcd_utils.h
rename to components/privacy_sandbox/tpcd_utils.h
index d62f6e75..dbd4878 100644
--- a/chrome/browser/tpcd/experiment/tpcd_utils.h
+++ b/components/privacy_sandbox/tpcd_utils.h
@@ -1,9 +1,9 @@
-// Copyright 2023 The Chromium Authors
+// Copyright 2024 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_TPCD_EXPERIMENT_TPCD_UTILS_H_
-#define CHROME_BROWSER_TPCD_EXPERIMENT_TPCD_UTILS_H_
+#ifndef COMPONENTS_PRIVACY_SANDBOX_TPCD_UTILS_H_
+#define COMPONENTS_PRIVACY_SANDBOX_TPCD_UTILS_H_
namespace tpcd::experiment::utils {
@@ -32,4 +32,4 @@
} // namespace tpcd::experiment::utils
-#endif // CHROME_BROWSER_TPCD_EXPERIMENT_TPCD_UTILS_H_
+#endif // COMPONENTS_PRIVACY_SANDBOX_TPCD_UTILS_H_
