[iOS] Standardize on 'feature_flags' gn source set name.
This CL standardizes all gn files to use 'feature_flags' as the name
for a source set containing feature flag definitions, instead of the
more ambiguous 'features'.
This CL also renames the history_base_feature and toolbar_controller_base_feature targets (also to 'feature_flags"). Additionally, it renames the source files for those targets to just be 'feature.h' and 'feature.cc'.
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I9da62d220c4c38ac817b3ff50ec116452ed50957
Reviewed-on: https://chromium-review.googlesource.com/1080629
Commit-Queue: Mark Cogan <[email protected]>
Commit-Queue: Gauthier Ambard <[email protected]>
Reviewed-by: Gauthier Ambard <[email protected]>
Cr-Commit-Position: refs/heads/master@{#563280}diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn
index d547cfe..77b29f2fa 100644
--- a/ios/chrome/browser/BUILD.gn
+++ b/ios/chrome/browser/BUILD.gn
@@ -113,22 +113,22 @@
"//google_apis",
"//ios/chrome/app/strings",
"//ios/chrome/browser/browser_state",
- "//ios/chrome/browser/browsing_data:features",
+ "//ios/chrome/browser/browsing_data:feature_flags",
"//ios/chrome/browser/download",
"//ios/chrome/browser/drag_and_drop",
"//ios/chrome/browser/itunes_urls",
- "//ios/chrome/browser/mailto:features",
+ "//ios/chrome/browser/mailto:feature_flags",
"//ios/chrome/browser/payments:constants",
- "//ios/chrome/browser/ssl:features",
+ "//ios/chrome/browser/ssl:feature_flags",
"//ios/chrome/browser/sync/glue",
"//ios/chrome/browser/ui:feature_flags",
"//ios/chrome/browser/ui/coordinators:chrome_coordinators",
- "//ios/chrome/browser/ui/external_search:features",
- "//ios/chrome/browser/ui/fullscreen:features",
- "//ios/chrome/browser/ui/history:history_base_feature",
+ "//ios/chrome/browser/ui/external_search:feature_flags",
+ "//ios/chrome/browser/ui/fullscreen:feature_flags",
+ "//ios/chrome/browser/ui/history:feature_flags",
"//ios/chrome/browser/ui/main:feature_flags",
"//ios/chrome/browser/ui/omnibox",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/common",
"//ios/components/io_thread",
"//ios/net",
diff --git a/ios/chrome/browser/about_flags.mm b/ios/chrome/browser/about_flags.mm
index 2e7acbb..7b11d37 100644
--- a/ios/chrome/browser/about_flags.mm
+++ b/ios/chrome/browser/about_flags.mm
@@ -48,9 +48,9 @@
#include "ios/chrome/browser/ssl/captive_portal_features.h"
#include "ios/chrome/browser/ui/external_search/features.h"
#import "ios/chrome/browser/ui/fullscreen/fullscreen_features.h"
-#import "ios/chrome/browser/ui/history/history_base_feature.h"
+#import "ios/chrome/browser/ui/history/features.h"
#include "ios/chrome/browser/ui/main/main_feature_flags.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "ios/chrome/browser/ui/ui_feature_flags.h"
#include "ios/chrome/browser/ui/user_feedback_features.h"
#include "ios/chrome/grit/ios_strings.h"
diff --git a/ios/chrome/browser/browsing_data/BUILD.gn b/ios/chrome/browser/browsing_data/BUILD.gn
index a125c8a8..c16abd93 100644
--- a/ios/chrome/browser/browsing_data/BUILD.gn
+++ b/ios/chrome/browser/browsing_data/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-source_set("features") {
+source_set("feature_flags") {
sources = [
"browsing_data_features.cc",
"browsing_data_features.h",
diff --git a/ios/chrome/browser/mailto/BUILD.gn b/ios/chrome/browser/mailto/BUILD.gn
index 9af0174..70b81971 100644
--- a/ios/chrome/browser/mailto/BUILD.gn
+++ b/ios/chrome/browser/mailto/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-source_set("features") {
+source_set("feature_flags") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"features.h",
diff --git a/ios/chrome/browser/ssl/BUILD.gn b/ios/chrome/browser/ssl/BUILD.gn
index 5dbe830..2f48086 100644
--- a/ios/chrome/browser/ssl/BUILD.gn
+++ b/ios/chrome/browser/ssl/BUILD.gn
@@ -23,7 +23,7 @@
"ios_ssl_error_handler.mm",
]
deps = [
- ":features",
+ ":feature_flags",
"//base",
"//base:i18n",
"//components/captive_portal",
@@ -45,7 +45,7 @@
]
}
-source_set("features") {
+source_set("feature_flags") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"captive_portal_features.cc",
@@ -65,10 +65,10 @@
"ios_ssl_error_handler_unittest.mm",
]
deps = [
+ ":feature_flags",
":ssl",
"//components/security_state/core",
"//ios/chrome/browser/browser_state:test_support",
- "//ios/chrome/browser/ssl:features",
"//ios/chrome/browser/web:test_support",
"//ios/testing:ios_test_support",
"//ios/web",
diff --git a/ios/chrome/browser/tabs/BUILD.gn b/ios/chrome/browser/tabs/BUILD.gn
index cca1c88..b451440e 100644
--- a/ios/chrome/browser/tabs/BUILD.gn
+++ b/ios/chrome/browser/tabs/BUILD.gn
@@ -109,7 +109,7 @@
"//ios/chrome/browser/sessions:serialisation",
"//ios/chrome/browser/snapshots",
"//ios/chrome/browser/ssl",
- "//ios/chrome/browser/ssl:features",
+ "//ios/chrome/browser/ssl:feature_flags",
"//ios/chrome/browser/store_kit",
"//ios/chrome/browser/sync",
"//ios/chrome/browser/translate",
diff --git a/ios/chrome/browser/ui/BUILD.gn b/ios/chrome/browser/ui/BUILD.gn
index cd8f9a6..3a1c3e1 100644
--- a/ios/chrome/browser/ui/BUILD.gn
+++ b/ios/chrome/browser/ui/BUILD.gn
@@ -69,7 +69,7 @@
"//base:i18n",
"//ios/chrome/app:tests_hook",
"//ios/chrome/browser",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/web",
"//ui/base",
"//ui/gfx",
@@ -364,7 +364,7 @@
"//ios/chrome/browser/ui/find_bar",
"//ios/chrome/browser/ui/first_run",
"//ios/chrome/browser/ui/fullscreen",
- "//ios/chrome/browser/ui/fullscreen:features",
+ "//ios/chrome/browser/ui/fullscreen:feature_flags",
"//ios/chrome/browser/ui/fullscreen:ui",
"//ios/chrome/browser/ui/history",
"//ios/chrome/browser/ui/history_popup:coordinator",
@@ -408,7 +408,7 @@
"//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
"//ios/chrome/browser/ui/toolbar/legacy",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/tools_menu",
"//ios/chrome/browser/ui/tools_menu:configuration",
"//ios/chrome/browser/ui/tools_menu/public",
diff --git a/ios/chrome/browser/ui/app_launcher/BUILD.gn b/ios/chrome/browser/ui/app_launcher/BUILD.gn
index 6ce48aec..61fac104 100644
--- a/ios/chrome/browser/ui/app_launcher/BUILD.gn
+++ b/ios/chrome/browser/ui/app_launcher/BUILD.gn
@@ -20,7 +20,7 @@
"//ios/chrome/app/strings:ios_strings_grit",
"//ios/chrome/browser",
"//ios/chrome/browser/app_launcher",
- "//ios/chrome/browser/mailto:features",
+ "//ios/chrome/browser/mailto:feature_flags",
"//ios/chrome/browser/ui/collection_view",
"//ios/chrome/browser/web",
"//ios/public/provider/chrome/browser",
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 65a9330..524fc4b3 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -203,8 +203,8 @@
#import "ios/chrome/browser/ui/toolbar/clean/toolbar_coordinator.h"
#import "ios/chrome/browser/ui/toolbar/legacy/toolbar_controller_constants.h"
#import "ios/chrome/browser/ui/toolbar/legacy_toolbar_ui_updater.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/toolbar/public/primary_toolbar_coordinator.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
#include "ios/chrome/browser/ui/toolbar/toolbar_model_delegate_ios.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_snapshot_providing.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_ui.h"
diff --git a/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm b/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm
index 7f20da6..75a7bcb 100644
--- a/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm
+++ b/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm
@@ -9,7 +9,7 @@
#import "ios/chrome/browser/ui/alert_coordinator/alert_coordinator.h"
#import "ios/chrome/browser/ui/browser_view_controller_helper.h"
#import "ios/chrome/browser/ui/key_commands_provider.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "ui/base/l10n/l10n_util_mac.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/external_search/BUILD.gn b/ios/chrome/browser/ui/external_search/BUILD.gn
index 8b04969..8419292 100644
--- a/ios/chrome/browser/ui/external_search/BUILD.gn
+++ b/ios/chrome/browser/ui/external_search/BUILD.gn
@@ -19,7 +19,7 @@
]
}
-source_set("features") {
+source_set("feature_flags") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"features.cc",
diff --git a/ios/chrome/browser/ui/fullscreen/BUILD.gn b/ios/chrome/browser/ui/fullscreen/BUILD.gn
index 73bad64..e09e7d8 100644
--- a/ios/chrome/browser/ui/fullscreen/BUILD.gn
+++ b/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -29,7 +29,7 @@
]
}
-source_set("features") {
+source_set("feature_flags") {
sources = [
"fullscreen_features.h",
"fullscreen_features.mm",
@@ -84,7 +84,7 @@
configs += [ "//build/config/compiler:enable_arc" ]
deps = [
- ":features",
+ ":feature_flags",
":ui",
"//base",
"//components/keyed_service/ios",
diff --git a/ios/chrome/browser/ui/history/BUILD.gn b/ios/chrome/browser/ui/history/BUILD.gn
index 127fdfc..7e656db 100644
--- a/ios/chrome/browser/ui/history/BUILD.gn
+++ b/ios/chrome/browser/ui/history/BUILD.gn
@@ -29,7 +29,7 @@
"legacy_history_entry_item.mm",
]
deps = [
- ":history_base_feature",
+ ":feature_flags",
":history_ui",
"//base",
"//base:i18n",
@@ -132,11 +132,11 @@
]
}
-source_set("history_base_feature") {
+source_set("feature_flags") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
- "history_base_feature.h",
- "history_base_feature.mm",
+ "features.cc",
+ "features.h",
]
deps = [
"//base",
diff --git a/ios/chrome/browser/ui/history/history_base_feature.mm b/ios/chrome/browser/ui/history/features.cc
similarity index 62%
rename from ios/chrome/browser/ui/history/history_base_feature.mm
rename to ios/chrome/browser/ui/history/features.cc
index 65cfd7b..3e66cc0 100644
--- a/ios/chrome/browser/ui/history/history_base_feature.mm
+++ b/ios/chrome/browser/ui/history/features.cc
@@ -2,11 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "ios/chrome/browser/ui/history/history_base_feature.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
+#import "ios/chrome/browser/ui/history/features.h"
const base::Feature kHistoryBatchUpdatesFilter{
"HistoryBatchUpdatesFilter", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/ios/chrome/browser/ui/history/history_base_feature.h b/ios/chrome/browser/ui/history/features.h
similarity index 63%
rename from ios/chrome/browser/ui/history/history_base_feature.h
rename to ios/chrome/browser/ui/history/features.h
index fe2984b1..902b0e4 100644
--- a/ios/chrome/browser/ui/history/history_base_feature.h
+++ b/ios/chrome/browser/ui/history/features.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef IOS_CHROME_BROWSER_UI_HISTORY_HISTORY_BASE_FEATURE_H_
-#define IOS_CHROME_BROWSER_UI_HISTORY_HISTORY_BASE_FEATURE_H_
+#ifndef IOS_CHROME_BROWSER_UI_HISTORY_FEATURES_H_
+#define IOS_CHROME_BROWSER_UI_HISTORY_FEATURES_H_
#include "base/feature_list.h"
// Feature to choose wether history filtering will use one BatchUpdates block.
extern const base::Feature kHistoryBatchUpdatesFilter;
-#endif // IOS_CHROME_BROWSER_UI_HISTORY_HISTORY_BASE_FEATURE_H_
+#endif // IOS_CHROME_BROWSER_UI_HISTORY_FEATURES_H_
diff --git a/ios/chrome/browser/ui/history/legacy_history_collection_view_controller.mm b/ios/chrome/browser/ui/history/legacy_history_collection_view_controller.mm
index b2c7ace..15526e0 100644
--- a/ios/chrome/browser/ui/history/legacy_history_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/history/legacy_history_collection_view_controller.mm
@@ -30,7 +30,7 @@
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
#import "ios/chrome/browser/ui/context_menu/context_menu_coordinator.h"
-#import "ios/chrome/browser/ui/history/history_base_feature.h"
+#import "ios/chrome/browser/ui/history/features.h"
#import "ios/chrome/browser/ui/history/history_entries_status_item_delegate.h"
#include "ios/chrome/browser/ui/history/history_entry_inserter.h"
#import "ios/chrome/browser/ui/history/history_entry_item_delegate.h"
diff --git a/ios/chrome/browser/ui/history_popup/BUILD.gn b/ios/chrome/browser/ui/history_popup/BUILD.gn
index 8300826..c0a3380 100644
--- a/ios/chrome/browser/ui/history_popup/BUILD.gn
+++ b/ios/chrome/browser/ui/history_popup/BUILD.gn
@@ -44,7 +44,7 @@
"//ios/chrome/browser/ui/fullscreen",
"//ios/chrome/browser/ui/fullscreen:coordinators",
"//ios/chrome/browser/ui/history_popup/requirements",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/util",
]
}
diff --git a/ios/chrome/browser/ui/history_popup/tab_history_legacy_coordinator.mm b/ios/chrome/browser/ui/history_popup/tab_history_legacy_coordinator.mm
index 29be17492..575f83e0 100644
--- a/ios/chrome/browser/ui/history_popup/tab_history_legacy_coordinator.mm
+++ b/ios/chrome/browser/ui/history_popup/tab_history_legacy_coordinator.mm
@@ -16,7 +16,7 @@
#import "ios/chrome/browser/ui/history_popup/requirements/tab_history_ui_updater.h"
#import "ios/chrome/browser/ui/history_popup/tab_history_popup_controller.h"
#include "ios/chrome/browser/ui/rtl_geometry.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "ios/chrome/browser/ui/ui_util.h"
#import "ios/chrome/browser/ui/util/named_guide.h"
#include "ios/web/public/navigation_item.h"
diff --git a/ios/chrome/browser/ui/location_bar/BUILD.gn b/ios/chrome/browser/ui/location_bar/BUILD.gn
index 6d11d62..771dc434 100644
--- a/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -57,7 +57,7 @@
"//ios/chrome/browser/ui/toolbar/buttons",
"//ios/chrome/browser/ui/toolbar/keyboard_assist:keyboard_assist",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/ui/voice",
"//ios/chrome/browser/web_state_list",
diff --git a/ios/chrome/browser/ui/ntp/BUILD.gn b/ios/chrome/browser/ui/ntp/BUILD.gn
index d65226c..84ac8b9 100644
--- a/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -43,7 +43,7 @@
"//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
"//ios/chrome/browser/ui/toolbar/legacy",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/common",
"//ui/base",
]
diff --git a/ios/chrome/browser/ui/omnibox/BUILD.gn b/ios/chrome/browser/ui/omnibox/BUILD.gn
index 05582c84..a225e6e9 100644
--- a/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -118,7 +118,7 @@
"//ios/chrome/browser/ui/omnibox/popup",
"//ios/chrome/browser/ui/toolbar/buttons",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/util",
"//ios/chrome/common",
"//ios/public/provider/chrome/browser",
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
index ae7c5c6..384bf40 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
@@ -22,7 +22,7 @@
#import "ios/chrome/browser/ui/reversed_animation.h"
#include "ios/chrome/browser/ui/rtl_geometry.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "ios/chrome/browser/ui/ui_util.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#import "ios/chrome/common/material_timing.h"
diff --git a/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 3c231e34..13b742fc 100644
--- a/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -31,8 +31,8 @@
"//ios/chrome/browser/ui/commands",
"//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
"//ios/chrome/browser/ui/omnibox:omnibox_util",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/toolbar/public:public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
"//ios/chrome/browser/ui/util:util",
"//ios/web/public:public",
"//net",
diff --git a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.mm b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.mm
index df2ff56..f2eb3c6 100644
--- a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.mm
+++ b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.mm
@@ -5,7 +5,7 @@
#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h"
#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_positioner.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "ios/chrome/browser/ui/ui_util.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#include "ios/chrome/browser/ui/util/constraints_ui_util.h"
diff --git a/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/ios/chrome/browser/ui/qr_scanner/BUILD.gn
index b04e2c6..debaa4ff 100644
--- a/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -91,7 +91,7 @@
"//ios/chrome/browser/ui/omnibox",
"//ios/chrome/browser/ui/toolbar",
"//ios/chrome/browser/ui/toolbar/clean:toolbar",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/test/app:test_support",
"//ios/chrome/test/base",
"//ios/chrome/test/earl_grey:test_support",
diff --git a/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm b/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm
index b2fee32..88c6d92 100644
--- a/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm
+++ b/ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_egtest.mm
@@ -22,7 +22,7 @@
#include "ios/chrome/browser/ui/qr_scanner/qr_scanner_view.h"
#include "ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller.h"
#import "ios/chrome/browser/ui/toolbar/clean/toolbar_coordinator.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "ios/chrome/browser/ui/ui_util.h"
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
diff --git a/ios/chrome/browser/ui/settings/BUILD.gn b/ios/chrome/browser/ui/settings/BUILD.gn
index 18efcef..a204b1fa 100644
--- a/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/ios/chrome/browser/ui/settings/BUILD.gn
@@ -130,7 +130,7 @@
"//ios/chrome/browser/content_settings",
"//ios/chrome/browser/feature_engagement",
"//ios/chrome/browser/history",
- "//ios/chrome/browser/mailto:features",
+ "//ios/chrome/browser/mailto:feature_flags",
"//ios/chrome/browser/passwords",
"//ios/chrome/browser/search_engines",
"//ios/chrome/browser/signin",
@@ -288,7 +288,7 @@
"//ios/chrome/browser/browsing_data",
"//ios/chrome/browser/browsing_data:counters",
"//ios/chrome/browser/content_settings",
- "//ios/chrome/browser/mailto:features",
+ "//ios/chrome/browser/mailto:feature_flags",
"//ios/chrome/browser/passwords",
"//ios/chrome/browser/prefs:browser_prefs",
"//ios/chrome/browser/search_engines",
@@ -360,7 +360,7 @@
"//ios/chrome/app/theme",
"//ios/chrome/browser",
"//ios/chrome/browser/browser_state",
- "//ios/chrome/browser/browsing_data:features",
+ "//ios/chrome/browser/browsing_data:feature_flags",
"//ios/chrome/browser/content_settings",
"//ios/chrome/browser/ntp_snippets",
"//ios/chrome/browser/passwords:passwords",
diff --git a/ios/chrome/browser/ui/stack_view/BUILD.gn b/ios/chrome/browser/ui/stack_view/BUILD.gn
index f104a95..d6c3179 100644
--- a/ios/chrome/browser/ui/stack_view/BUILD.gn
+++ b/ios/chrome/browser/ui/stack_view/BUILD.gn
@@ -65,7 +65,7 @@
"//ios/chrome/browser/ui/toolbar/buttons",
"//ios/chrome/browser/ui/toolbar/legacy",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/tools_menu",
"//ios/chrome/browser/ui/tools_menu:configuration",
"//ios/chrome/browser/ui/tools_menu/public",
diff --git a/ios/chrome/browser/ui/stack_view/stack_view_controller.mm b/ios/chrome/browser/ui/stack_view/stack_view_controller.mm
index 89bec93..2431916 100644
--- a/ios/chrome/browser/ui/stack_view/stack_view_controller.mm
+++ b/ios/chrome/browser/ui/stack_view/stack_view_controller.mm
@@ -53,7 +53,7 @@
#import "ios/chrome/browser/ui/stack_view/title_label.h"
#import "ios/chrome/browser/ui/toolbar/legacy/toolbar_controller_constants.h"
#import "ios/chrome/browser/ui/toolbar/legacy/toolbar_utils.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_owner.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_snapshot_providing.h"
#import "ios/chrome/browser/ui/tools_menu/public/tools_menu_configuration_provider.h"
diff --git a/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn b/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
index ccf8a21..fa0f83f 100644
--- a/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
+++ b/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
@@ -77,7 +77,7 @@
"//ios/chrome/browser/ui/toolbar/buttons",
"//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/ui/util:constraints_ui",
"//ios/third_party/material_components_ios",
diff --git a/ios/chrome/browser/ui/toolbar/adaptive/adaptive_toolbar_view_controller.mm b/ios/chrome/browser/ui/toolbar/adaptive/adaptive_toolbar_view_controller.mm
index fa823e9..a9a3232f 100644
--- a/ios/chrome/browser/ui/toolbar/adaptive/adaptive_toolbar_view_controller.mm
+++ b/ios/chrome/browser/ui/toolbar/adaptive/adaptive_toolbar_view_controller.mm
@@ -14,8 +14,8 @@
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tools_menu_button.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/toolbar/public/omnibox_focuser.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
#import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
diff --git a/ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view.mm b/ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view.mm
index 5580c01..f6306444 100644
--- a/ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view.mm
+++ b/ios/chrome/browser/ui/toolbar/adaptive/primary_toolbar_view.mm
@@ -11,7 +11,7 @@
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tools_menu_button.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#import "ios/chrome/browser/ui/util/constraints_ui_util.h"
#import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
diff --git a/ios/chrome/browser/ui/toolbar/adaptive/secondary_toolbar_view.mm b/ios/chrome/browser/ui/toolbar/adaptive/secondary_toolbar_view.mm
index badd963..d6537b03 100644
--- a/ios/chrome/browser/ui/toolbar/adaptive/secondary_toolbar_view.mm
+++ b/ios/chrome/browser/ui/toolbar/adaptive/secondary_toolbar_view.mm
@@ -10,7 +10,7 @@
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_configuration.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tools_menu_button.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/util/constraints_ui_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
index 052b74c..5fbe8130 100644
--- a/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
+++ b/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
@@ -48,7 +48,7 @@
"//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
"//ios/chrome/browser/ui/toolbar:resource_macros",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/util",
"//ios/public/provider/chrome/browser",
"//ios/public/provider/chrome/browser/images",
diff --git a/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm b/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm
index 0eef7e0f..7eb5ec2 100644
--- a/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm
+++ b/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_factory.mm
@@ -14,8 +14,8 @@
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tools_menu_button.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/toolbar/public/omnibox_focuser.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
#include "ios/chrome/browser/ui/toolbar/toolbar_resource_macros.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#import "ios/chrome/browser/ui/util/constraints_ui_util.h"
diff --git a/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.mm b/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.mm
index 320eacef..34895fa 100644
--- a/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.mm
+++ b/ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.mm
@@ -4,7 +4,7 @@
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
diff --git a/ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.mm b/ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.mm
index 3d1652e..cd8a484 100644
--- a/ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.mm
+++ b/ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.mm
@@ -5,7 +5,7 @@
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tab_grid_button.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "ios/chrome/browser/ui/ui_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/toolbar/clean/BUILD.gn b/ios/chrome/browser/ui/toolbar/clean/BUILD.gn
index a2eb6ca..608895b 100644
--- a/ios/chrome/browser/ui/toolbar/clean/BUILD.gn
+++ b/ios/chrome/browser/ui/toolbar/clean/BUILD.gn
@@ -78,7 +78,7 @@
"//ios/chrome/browser/ui/history_popup/requirements",
"//ios/chrome/browser/ui/toolbar/buttons",
"//ios/chrome/browser/ui/toolbar/public",
- "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+ "//ios/chrome/browser/ui/toolbar/public:feature_flags",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/ui/voice",
"//ios/chrome/common",
diff --git a/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm b/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm
index c9b93a9..1731510 100644
--- a/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm
+++ b/ios/chrome/browser/ui/toolbar/clean/toolbar_view_controller.mm
@@ -19,8 +19,8 @@
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_tools_menu_button.h"
#import "ios/chrome/browser/ui/toolbar/clean/toolbar_button_updater.h"
#import "ios/chrome/browser/ui/toolbar/clean/toolbar_view.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/toolbar/public/omnibox_focuser.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#import "ios/chrome/browser/ui/util/constraints_ui_util.h"
#import "ios/chrome/browser/ui/util/named_guide.h"
diff --git a/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn b/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn
index 9f90123..8d52f43 100644
--- a/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn
+++ b/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn
@@ -27,7 +27,7 @@
"//ios/chrome/browser",
"//ios/chrome/browser/ui",
"//ios/chrome/browser/ui/commands",
- "//ios/chrome/browser/ui/external_search:features",
+ "//ios/chrome/browser/ui/external_search:feature_flags",
"//ios/chrome/browser/ui/location_bar:constants",
"//ios/chrome/browser/ui/omnibox:omnibox_internal",
"//ios/chrome/browser/ui/toolbar/public",
diff --git a/ios/chrome/browser/ui/toolbar/public/BUILD.gn b/ios/chrome/browser/ui/toolbar/public/BUILD.gn
index 472ea9e..76f876b 100644
--- a/ios/chrome/browser/ui/toolbar/public/BUILD.gn
+++ b/ios/chrome/browser/ui/toolbar/public/BUILD.gn
@@ -13,7 +13,7 @@
"toolbar_coordinating.h",
]
deps = [
- ":toolbar_base_feature",
+ ":feature_flags",
"//base",
"//ios/chrome/browser/ui",
"//ios/chrome/browser/ui/activity_services/requirements",
@@ -26,10 +26,10 @@
]
}
-source_set("toolbar_base_feature") {
+source_set("feature_flags") {
sources = [
- "toolbar_controller_base_feature.h",
- "toolbar_controller_base_feature.mm",
+ "features.cc",
+ "features.h",
]
deps = [
"//base",
diff --git a/ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.mm b/ios/chrome/browser/ui/toolbar/public/features.cc
similarity index 63%
rename from ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.mm
rename to ios/chrome/browser/ui/toolbar/public/features.cc
index 309eaf9..79623758 100644
--- a/ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.mm
+++ b/ios/chrome/browser/ui/toolbar/public/features.cc
@@ -2,13 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#include "base/command_line.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
const base::Feature kMemexTabSwitcher{"MemexTabSwitcher",
base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/ios/chrome/browser/ui/toolbar/public/features.h b/ios/chrome/browser/ui/toolbar/public/features.h
new file mode 100644
index 0000000..3211f4712
--- /dev/null
+++ b/ios/chrome/browser/ui/toolbar/public/features.h
@@ -0,0 +1,14 @@
+// Copyright 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_PUBLIC_FEATURES_H_
+#define IOS_CHROME_BROWSER_UI_TOOLBAR_PUBLIC_FEATURES_H_
+
+#include "base/feature_list.h"
+
+// Feature to choose whether to use the memex prototype tab switcher or the
+// regular native tab switcher.
+extern const base::Feature kMemexTabSwitcher;
+
+#endif // IOS_CHROME_BROWSER_UI_TOOLBAR_PUBLIC_FEATURES_H_
diff --git a/ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h b/ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h
deleted file mode 100644
index c7444ab6..0000000
--- a/ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_CONTROLLER_BASE_FEATURE_H_
-#define IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_CONTROLLER_BASE_FEATURE_H_
-
-#import <Foundation/Foundation.h>
-
-#include "base/feature_list.h"
-
-// Feature to choose whether to use the memex prototype tab switcher or the
-// regular native tab switcher.
-extern const base::Feature kMemexTabSwitcher;
-
-#endif // IOS_CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_CONTROLLER_BASE_FEATURE_H_
diff --git a/ios/chrome/browser/ui/ui_util.mm b/ios/chrome/browser/ui/ui_util.mm
index f0e36c6..54d39c1 100644
--- a/ios/chrome/browser/ui/ui_util.mm
+++ b/ios/chrome/browser/ui/ui_util.mm
@@ -10,7 +10,7 @@
#include "base/feature_list.h"
#include "base/logging.h"
#include "ios/chrome/app/tests_hook.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.h"
+#import "ios/chrome/browser/ui/toolbar/public/features.h"
#import "ios/chrome/browser/ui/ui_feature_flags.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
#include "ui/base/device_form_factor.h"
