[Files]: Remove files-search-v2 flag.
This has been enabled by default since M116. Time to remove it. The flag
is also expired.
Bug: b:303717156
Change-Id: I2ba1bb68f5a97212e445742acedcb957376c626b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4951339
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Bo Majewski <majewski@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1213276}
diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
index 99c4e19..6c599093 100644
--- a/ash/constants/ash_features.cc
+++ b/ash/constants/ash_features.cc
@@ -1155,9 +1155,6 @@
"FilesNewDirectoryTree",
base::FEATURE_DISABLED_BY_DEFAULT);
-// Enables V2 of search functionality in files.
-BASE_FEATURE(kFilesSearchV2, "FilesSearchV2", base::FEATURE_ENABLED_BY_DEFAULT);
-
// Enables local image search by query in the Files app.
BASE_FEATURE(kFilesLocalImageSearch,
"FilesLocalImageSearch",
@@ -3357,10 +3354,6 @@
return base::FeatureList::IsEnabled(kFilesConflictDialog);
}
-bool IsFilesSearchV2Enabled() {
- return base::FeatureList::IsEnabled(kFilesSearchV2);
-}
-
bool IsFilesLocalImageSearchEnabled() {
return base::FeatureList::IsEnabled(kFilesLocalImageSearch);
}
diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
index a050447c..208d842 100644
--- a/ash/constants/ash_features.h
+++ b/ash/constants/ash_features.h
@@ -343,7 +343,6 @@
BASE_DECLARE_FEATURE(kFilesInlineSyncStatusProgressEvents);
COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kFilesLocalImageSearch);
COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kFilesNewDirectoryTree);
-COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kFilesSearchV2);
COMPONENT_EXPORT(ASH_CONSTANTS)
BASE_DECLARE_FEATURE(kFilesSinglePartitionFormat);
COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kFilesTrashDrive);
@@ -959,7 +958,6 @@
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsFileManagerFuseBoxDebugEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsFilesConflictDialogEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsFilesLocalImageSearchEnabled();
-COMPONENT_EXPORT(ASH_CONSTANTS) bool IsFilesSearchV2Enabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsFloatingWorkspaceEnabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsFloatingWorkspaceV2Enabled();
COMPONENT_EXPORT(ASH_CONSTANTS) bool IsFocusModeEnabled();
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 1f52038..db73758 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -5902,9 +5902,6 @@
flag_descriptions::kFilesSinglePartitionFormatName,
flag_descriptions::kFilesSinglePartitionFormatDescription, kOsCrOS,
FEATURE_VALUE_TYPE(ash::features::kFilesSinglePartitionFormat)},
- {"files-search-v2", flag_descriptions::kFilesSearchV2Name,
- flag_descriptions::kFilesSearchV2Description, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kFilesSearchV2)},
{"files-trash-drive", flag_descriptions::kFilesTrashDriveName,
flag_descriptions::kFilesTrashDriveDescription, kOsCrOS,
FEATURE_VALUE_TYPE(ash::features::kFilesTrashDrive)},
diff --git a/chrome/browser/ash/file_manager/file_manager_string_util.cc b/chrome/browser/ash/file_manager/file_manager_string_util.cc
index 9ca3b60..755cdfb 100644
--- a/chrome/browser/ash/file_manager/file_manager_string_util.cc
+++ b/chrome/browser/ash/file_manager/file_manager_string_util.cc
@@ -1328,8 +1328,6 @@
dict->Set("ARC_USB_STORAGE_UI_ENABLED",
base::FeatureList::IsEnabled(arc::kUsbStorageUIFeature));
dict->Set("ARC_VM_ENABLED", arc::IsArcVmEnabled());
- dict->Set("FILES_SEARCH_V2",
- base::FeatureList::IsEnabled(ash::features::kFilesSearchV2));
dict->Set("FILES_LOCAL_IMAGE_SEARCH",
ash::features::IsFilesLocalImageSearchEnabled());
dict->Set("FILES_TRASH_DRIVE_ENABLED",
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index eefc6c7..1d95b6fb 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -4214,11 +4214,6 @@
"expiry_milestone": 124
},
{
- "name": "files-search-v2",
- "owners": [ "majewski@chromium.org", "simmonsjosh@google.com" ],
- "expiry_milestone": 120
- },
- {
"name": "files-single-partition-format",
"owners": [ "austinct@chromium.org", "petermarshall@chromium.org" ],
"expiry_milestone": 104
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 7d80dbb..fdb6a04 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -6330,9 +6330,6 @@
const char kFilesNewDirectoryTreeDescription[] =
"Enable the new directory tree implementation in Files app.";
-const char kFilesSearchV2Name[] = "V2 generation of file search.";
-const char kFilesSearchV2Description[] = "Enable V2 generation of file search.";
-
const char kFilesLocalImageSearchName[] = "Search local images by query.";
const char kFilesLocalImageSearchDescription[] =
"Enable searching local images by query.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 15be341..9c2d68f 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -3649,9 +3649,6 @@
extern const char kFilesNewDirectoryTreeName[];
extern const char kFilesNewDirectoryTreeDescription[];
-extern const char kFilesSearchV2Name[];
-extern const char kFilesSearchV2Description[];
-
extern const char kFilesLocalImageSearchName[];
extern const char kFilesLocalImageSearchDescription[];
