0

rcaps: Update includes for switches::kSearchEngineChoiceCountry access

Its definition has moved from the `search_engines` component to the
`regional_capabilities` one. This CL updates include directives in files that require it and removes the include forwarding from
search_engines_switches.h

Fixed: 390993114
Change-Id: Ia4db75c65d40f1b7a650b4cf840f70ee6d6cf4f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6105432
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Commit-Queue: Nicolas Dossou-Gbété <dgn@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1422987}
This commit is contained in:
Nicolas Dossou-Gbete
2025-02-21 01:20:45 -08:00
committed by Chromium LUCI CQ
parent 218ef17e5b
commit 4ebafc44e4
32 changed files with 32 additions and 16 deletions

@ -126,6 +126,7 @@ if (!is_android) {
"//chrome/browser/ui:browser_element_identifiers",
"//chrome/test:test_support_ui",
"//components/country_codes",
"//components/regional_capabilities",
"//components/search_engines",
"//components/variations",
"//content/test:test_support",

@ -39,6 +39,7 @@
#include "components/keep_alive_registry/scoped_keep_alive.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/core/keyed_service.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/default_search_manager.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_utils.h"
#include "components/search_engines/search_engines_pref_names.h"

@ -16,6 +16,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "chrome/test/interaction/interactive_browser_test.h"
#include "components/country_codes/country_codes.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_utils.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/search_engines/template_url_service.h"

@ -17,6 +17,7 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/country_codes/country_codes.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/regional_capabilities/regional_capabilities_utils.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_utils.h"

@ -8,7 +8,7 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/template_url.h"
#include "content/public/test/browser_test.h"
#include "testing/gtest/include/gtest/gtest.h"

@ -19,6 +19,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/privacy_sandbox/privacy_sandbox_features.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/signin/public/base/signin_switches.h"
#include "components/sync/test/test_sync_service.h"

@ -18,6 +18,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/privacy_sandbox/privacy_sandbox_features.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/variations/service/variations_service.h"
#include "content/public/test/browser_test.h"

@ -41,6 +41,7 @@
#include "chrome/test/user_education/interactive_feature_promo_test.h"
#include "components/feature_engagement/public/feature_constants.h"
#include "components/privacy_sandbox/privacy_sandbox_features.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_utils.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/signin/public/base/consent_level.h"

@ -19,6 +19,7 @@
#include "chrome/browser/ui/views/profiles/profile_picker_view.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/interaction/interactive_browser_test.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engines_switches.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"

@ -24,6 +24,7 @@
#include "components/nacl/common/buildflags.h"
#include "components/optimization_guide/core/optimization_guide_features.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search/ntp_features.h"
#include "components/search_engines/search_engines_switches.h"
#include "content/public/browser/navigation_details.h"

@ -25,6 +25,7 @@
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/search_engines/template_url_data.h"
#include "components/search_engines/template_url_prepopulate_data.h"

@ -15,11 +15,11 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/country_codes/country_codes.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_utils.h"
#include "components/search_engines/search_engine_type.h"
#include "components/search_engines/search_engines_pref_names.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/search_engines/template_url.h"
#include "components/search_engines/template_url_service.h"
#include "components/signin/public/base/signin_switches.h"

@ -284,12 +284,7 @@ component("search_engines_switches") {
"search_engines_switches.h",
]
deps = [
"//base",
# TODO(crbug.com/390993114): Remove with the header forwarding.
"//components/regional_capabilities",
]
deps = [ "//base" ]
}
if (!is_android) {

@ -14,6 +14,7 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
#include "base/time/time.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
#include "components/search_engines/search_engine_type.h"
#include "components/search_engines/search_engines_pref_names.h"

@ -7,6 +7,7 @@
#include <memory>
#include "base/test/scoped_feature_list.h"
#include "components/regional_capabilities/regional_capabilities_switches.h"
#include "components/search_engines/search_engines_switches.h"
#include "components/search_engines/search_engines_test_environment.h"
#include "components/search_engines/search_engines_test_util.h"

@ -12,9 +12,6 @@
#include "base/metrics/field_trial_params.h"
#include "build/build_config.h"
// TODO(crbug.com/390993114): Remove, replace with direct includes.
#include "components/regional_capabilities/regional_capabilities_switches.h" // IWYU pragma: export
namespace switches {
COMPONENT_EXPORT(SEARCH_ENGINES_SWITCHES)

@ -168,6 +168,7 @@ source_set("eg2_tests") {
"//components/policy:policy_code_generate",
"//components/policy/core/common:common_constants",
"//components/policy/test_support:test_support",
"//components/regional_capabilities",
"//components/search_engines",
"//components/signin/internal/identity_manager",
"//components/signin/ios/browser:features",

@ -4,6 +4,7 @@
#import "base/strings/sys_string_conversions.h"
#import "components/policy/policy_constants.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/search_engines/search_engine_choice/search_engine_choice_utils.h"
#import "components/search_engines/search_engines_switches.h"
#import "components/strings/grit/components_strings.h"

@ -332,6 +332,7 @@ source_set("unit_tests") {
"//components/metrics:test_support",
"//components/ntp_tiles",
"//components/prefs",
"//components/regional_capabilities",
"//components/search_engines",
"//components/signin/public/identity_manager",
"//components/variations",

@ -11,7 +11,7 @@
#import "base/test/metrics/histogram_tester.h"
#import "base/test/scoped_feature_list.h"
#import "components/feed/core/v2/public/common_enums.h"
#import "components/search_engines/search_engines_switches.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/search_engines/template_url.h"
#import "components/search_engines/template_url_data.h"
#import "components/search_engines/template_url_service.h"

@ -32,6 +32,7 @@ source_set("unit_tests") {
"//components/metrics:metrics_pref_names",
"//components/policy/core/common:test_support",
"//components/prefs:test_support",
"//components/regional_capabilities",
"//components/search_engines",
"//components/sync_preferences:test_support",
"//ios/chrome/browser/policy/model:test_support",

@ -10,6 +10,7 @@
#import "base/test/metrics/histogram_tester.h"
#import "components/metrics/metrics_pref_names.h"
#import "components/policy/core/common/mock_policy_service.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/search_engines/search_engine_choice/search_engine_choice_service.h"
#import "components/search_engines/search_engines_pref_names.h"
#import "components/search_engines/search_engines_switches.h"

@ -109,6 +109,7 @@ source_set("eg2_tests") {
"//base",
"//base/test:test_support",
"//build:branding_buildflags",
"//components/regional_capabilities",
"//components/search_engines",
"//components/signin/public/base:signin_switches",
"//ios/chrome/browser/metrics/model:eg_test_support+eg2",

@ -3,6 +3,7 @@
// found in the LICENSE file.
#import "base/strings/sys_string_conversions.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/search_engines/search_engine_choice/search_engine_choice_utils.h"
#import "components/search_engines/search_engines_switches.h"
#import "ios/chrome/browser/metrics/model/metrics_app_interface.h"

@ -335,6 +335,7 @@ source_set("unit_tests") {
"//components/policy/core/common:test_support",
"//components/pref_registry",
"//components/prefs:test_support",
"//components/regional_capabilities",
"//components/search_engines",
"//components/signin/public/base",
"//components/strings",
@ -480,6 +481,7 @@ source_set("eg2_tests") {
"//build:branding_buildflags",
"//components/browsing_data/core",
"//components/policy:generated",
"//components/regional_capabilities",
"//components/search_engines",
"//components/signin/public/base:signin_switches",
"//components/strings",

@ -231,6 +231,7 @@ source_set("eg2_tests") {
"//components/password_manager/core/common",
"//components/policy:generated",
"//components/policy/core/common:common_constants",
"//components/regional_capabilities",
"//components/search_engines",
"//components/signin/internal/identity_manager:capabilities",
"//components/signin/public/base",

@ -5,7 +5,7 @@
#import "base/i18n/message_formatter.h"
#import "base/strings/sys_string_conversions.h"
#import "components/policy/policy_constants.h"
#import "components/search_engines/search_engines_switches.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/strings/grit/components_strings.h"
#import "components/sync/base/features.h"
#import "components/sync/base/user_selectable_type.h"

@ -9,7 +9,7 @@
#import "base/strings/sys_string_conversions.h"
#import "base/strings/utf_string_conversions.h"
#import "base/test/ios/wait_util.h"
#import "components/search_engines/search_engines_switches.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "ios/chrome/browser/search_engine_choice/ui_bundled/search_engine_choice_earl_grey_ui_test_util.h"
#import "ios/chrome/browser/settings/ui_bundled/search_engine_settings_test_case_base.h"
#import "ios/chrome/browser/settings/ui_bundled/settings_app_interface.h"

@ -3,8 +3,8 @@
// found in the LICENSE file.
#import "base/command_line.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/search_engines/search_engines_pref_names.h"
#import "components/search_engines/search_engines_switches.h"
#import "components/strings/grit/components_strings.h"
#import "ios/chrome/browser/settings/ui_bundled/search_engine_table_view_controller.h"
#import "ios/chrome/browser/settings/ui_bundled/search_engine_table_view_controller_unittest.h"

@ -4,7 +4,7 @@
#import "base/command_line.h"
#import "base/test/scoped_feature_list.h"
#import "components/search_engines/search_engines_switches.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/search_engines/template_url_data_util.h"
#import "components/search_engines/template_url_prepopulate_data.h"
#import "ios/chrome/browser/settings/ui_bundled/search_engine_table_view_controller.h"

@ -431,6 +431,7 @@ source_set("eg2_tests") {
"//components/feature_engagement/public",
"//components/feed/core/shared_prefs:feed_shared_prefs",
"//components/feed/core/v2/public/ios:feed_ios_public",
"//components/regional_capabilities",
"//components/search_engines",
"//components/segmentation_platform/public",
"//components/signin/internal/identity_manager",

@ -10,6 +10,7 @@
#import "build/branding_buildflags.h"
#import "components/feature_engagement/public/feature_constants.h"
#import "components/feed/core/v2/public/ios/pref_names.h"
#import "components/regional_capabilities/regional_capabilities_switches.h"
#import "components/search_engines/search_engines_switches.h"
#import "components/segmentation_platform/public/features.h"
#import "components/signin/internal/identity_manager/account_capabilities_constants.h"