Remove flag VmStatusPage

Fixed: 1252840 Change-Id: I601d70a58c3700312372fc40ab25805a77389440 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3219023 Auto-Submit: Jason Lin <lxj@google.com> Reviewed-by: Joel Hockey <joelhockey@chromium.org> Reviewed-by: calamity <calamity@chromium.org> Commit-Queue: Jason Lin <lxj@google.com> Cr-Commit-Position: refs/heads/main@{#931860}
marcosholgado · Oct 15, 2021 · 8ed8e26 · 8ed8e26
1 parent e0b58fd
commit 8ed8e26
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 21 deletions.
diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
@@ -1168,10 +1168,6 @@ const base::Feature kVirtualKeyboardMultipaste{
 const base::Feature kVirtualKeyboardMultipasteSuggestion{
     "VirtualKeyboardMultipasteSuggestion", base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Enable or disable the chrome://vm page
-const base::Feature kVmStatusPage{"VmStatusPage",
-                                  base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Controls whether to allow enabling wake on WiFi features in shill.
 const base::Feature kWakeOnWifiAllowed{"WakeOnWifiAllowed",
                                        base::FEATURE_DISABLED_BY_DEFAULT};

diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
@@ -439,7 +439,6 @@ COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kVirtualKeyboardMultipaste;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kVirtualKeyboardMultipasteSuggestion;
-COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kVmStatusPage;
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kWakeOnWifiAllowed;
 COMPONENT_EXPORT(ASH_CONSTANTS) extern const base::Feature kWallpaperWebUI;
 COMPONENT_EXPORT(ASH_CONSTANTS)

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -3583,9 +3583,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"pluginvm-fullscreen", flag_descriptions::kPluginVmFullscreenName,
      flag_descriptions::kPluginVmFullscreenDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(chromeos::features::kPluginVmFullscreen)},
-    {"vm-status-page", flag_descriptions::kVmStatusPageName,
-     flag_descriptions::kVmStatusPageDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(chromeos::features::kVmStatusPage)},
     {"crostini-reset-lxd-db", flag_descriptions::kCrostiniResetLxdDbName,
      flag_descriptions::kCrostiniResetLxdDbDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(chromeos::features::kCrostiniResetLxdDb)},

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -5504,11 +5504,6 @@
     "owners": [ "shaktisahu"],
     "expiry_milestone": 98
   },
-  {
-    "name": "vm-status-page",
-    "owners": [ "lxj@google.com", "joelhockey", "timloh" ],
-    "expiry_milestone": 94
-  },
   {
     "name": "voice-button-in-top-toolbar",
     "owners": [

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -5193,9 +5193,6 @@ const char kVirtualKeyboardMultipasteSuggestionDescription[] =
     "Show multipaste items in virtual keyboard suggestion bar if they are "
     "copied recently";
 
-const char kVmStatusPageName[] = "VM status page";
-const char kVmStatusPageDescription[] = "Enable VM status page";
-
 const char kWakeOnWifiAllowedName[] = "Allow enabling wake on WiFi features";
 const char kWakeOnWifiAllowedDescription[] =
     "Allows wake on WiFi features in shill to be enabled.";

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -2993,9 +2993,6 @@ extern const char kVirtualKeyboardMultipasteDescription[];
 extern const char kVirtualKeyboardMultipasteSuggestionName[];
 extern const char kVirtualKeyboardMultipasteSuggestionDescription[];
 
-extern const char kVmStatusPageName[];
-extern const char kVmStatusPageDescription[];
-
 extern const char kWakeOnWifiAllowedName[];
 extern const char kWakeOnWifiAllowedDescription[];
 

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -932,8 +932,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
       base::FeatureList::IsEnabled(chromeos::features::kEcheSWA)) {
     return &NewWebUI<chromeos::eche_app::EcheAppUI>;
   }
-  if (url.host_piece() == chrome::kChromeUIVmHost &&
-      base::FeatureList::IsEnabled(chromeos::features::kVmStatusPage)) {
+  if (url.host_piece() == chrome::kChromeUIVmHost) {
     return &NewWebUI<chromeos::VmUI>;
   }
   if (url.host_piece() == chromeos::kChromeUIPersonalizationAppHost &&