Use FixedFlatMap instead of static NoDestructor FlatMap

Use constexpr maps when possible inside the browser/ui directories

R=chromium-chrome-browser-ui-views-reviews@google.com

Bug: 1150744
Change-Id: I2ecfc10c911d6242cf7bafafe9878673a9ba2c06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2642384Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846280}

chrome/browser/ui/tabs/tab_group_theme.cc

@@ -6,8 +6,7 @@
 
 #include <array>
 
-#include "base/containers/flat_map.h"
-#include "base/no_destructor.h"
+#include "base/containers/fixed_flat_map.h"
 #include "chrome/browser/themes/theme_properties.h"
 
 using TP = ThemeProperties;
@@ -15,9 +14,8 @@ using TabGroupColorId = tab_groups::TabGroupColorId;
 
 int GetTabGroupTabStripColorId(TabGroupColorId group_color_id,
                                bool active_frame) {
-  static const base::NoDestructor<
-      base::flat_map<TabGroupColorId, std::array<int, 2>>>
-      group_id_map({
+  static constexpr auto group_id_map =
+      base::MakeFixedFlatMap<TabGroupColorId, std::array<int, 2>>({
           {TabGroupColorId::kGrey,
            {TP::COLOR_TAB_GROUP_TABSTRIP_FRAME_INACTIVE_GREY,
             TP::COLOR_TAB_GROUP_TABSTRIP_FRAME_ACTIVE_GREY}},
@@ -43,12 +41,13 @@ int GetTabGroupTabStripColorId(TabGroupColorId group_color_id,
            {TP::COLOR_TAB_GROUP_TABSTRIP_FRAME_INACTIVE_CYAN,
             TP::COLOR_TAB_GROUP_TABSTRIP_FRAME_ACTIVE_CYAN}},
       });
-  return group_id_map->at(group_color_id)[active_frame];
+
+  return group_id_map.at(group_color_id)[active_frame];
 }
 
 int GetTabGroupDialogColorId(TabGroupColorId group_color_id) {
-  static const base::NoDestructor<base::flat_map<TabGroupColorId, int>>
-      group_id_map({
+  static constexpr auto group_id_map =
+      base::MakeFixedFlatMap<TabGroupColorId, int>({
           {TabGroupColorId::kGrey, TP::COLOR_TAB_GROUP_DIALOG_GREY},
           {TabGroupColorId::kBlue, TP::COLOR_TAB_GROUP_DIALOG_BLUE},
           {TabGroupColorId::kRed, TP::COLOR_TAB_GROUP_DIALOG_RED},
@@ -58,12 +57,13 @@ int GetTabGroupDialogColorId(TabGroupColorId group_color_id) {
           {TabGroupColorId::kPurple, TP::COLOR_TAB_GROUP_DIALOG_PURPLE},
           {TabGroupColorId::kCyan, TP::COLOR_TAB_GROUP_DIALOG_CYAN},
       });
-  return group_id_map->at(group_color_id);
+
+  return group_id_map.at(group_color_id);
 }
 
 int GetTabGroupContextMenuColorId(TabGroupColorId group_color_id) {
-  static const base::NoDestructor<base::flat_map<TabGroupColorId, int>>
-      group_id_map({
+  static constexpr auto group_id_map =
+      base::MakeFixedFlatMap<TabGroupColorId, int>({
           {TabGroupColorId::kGrey, TP::COLOR_TAB_GROUP_CONTEXT_MENU_GREY},
           {TabGroupColorId::kBlue, TP::COLOR_TAB_GROUP_CONTEXT_MENU_BLUE},
           {TabGroupColorId::kRed, TP::COLOR_TAB_GROUP_CONTEXT_MENU_RED},
@@ -73,5 +73,6 @@ int GetTabGroupContextMenuColorId(TabGroupColorId group_color_id) {
           {TabGroupColorId::kPurple, TP::COLOR_TAB_GROUP_CONTEXT_MENU_PURPLE},
           {TabGroupColorId::kCyan, TP::COLOR_TAB_GROUP_CONTEXT_MENU_CYAN},
       });
-  return group_id_map->at(group_color_id);
+
+  return group_id_map.at(group_color_id);
 }

chrome/browser/ui/views/download/download_item_view.cc

@@ -15,11 +15,10 @@
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "base/containers/flat_map.h"
+#include "base/containers/fixed_flat_map.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
-#include "base/no_destructor.h"
 #include "base/notreached.h"
 #include "base/numerics/math_constants.h"
 #include "base/ranges/algorithm.h"
@@ -852,13 +851,13 @@ void DownloadItemView::UpdateAccessibleAlertAndAnimationsForNormalMode() {
     // for "in progress but paused", as the button ends up being refocused in
     // the actual use case, and the name of the button reports that the download
     // has been paused.
-    static const base::NoDestructor<base::flat_map<State, int>> kMap({
+    static constexpr auto kMap = base::MakeFixedFlatMap<State, int>({
         {State::INTERRUPTED, IDS_DOWNLOAD_FAILED_ACCESSIBLE_ALERT},
         {State::COMPLETE, IDS_DOWNLOAD_COMPLETE_ACCESSIBLE_ALERT},
         {State::CANCELLED, IDS_DOWNLOAD_CANCELLED_ACCESSIBLE_ALERT},
     });
     const base::string16 alert_text = l10n_util::GetStringFUTF16(
-        kMap->at(state), model_->GetFileNameToReportUser().LossyDisplayName());
+        kMap.at(state), model_->GetFileNameToReportUser().LossyDisplayName());
     announce_accessible_alert_soon_ = true;
     UpdateAccessibleAlert(alert_text);
   }

chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -9,6 +9,7 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/containers/fixed_flat_map.h"
 #include "base/feature_list.h"
 #include "base/i18n/number_formatting.h"
 #include "base/metrics/user_metrics.h"
@@ -133,14 +134,14 @@ ToolbarView::DisplayMode GetDisplayMode(Browser* browser) {
   return ToolbarView::DisplayMode::LOCATION;
 }
 
-const base::flat_map<int, int>& GetViewCommandMap() {
-  static const base::NoDestructor<base::flat_map<int, int>> kViewCommandMap(
+auto GetViewCommandMap() {
+  static constexpr auto kViewCommandMap = base::MakeFixedFlatMap<int, int>(
       {{VIEW_ID_BACK_BUTTON, IDC_BACK},
        {VIEW_ID_FORWARD_BUTTON, IDC_FORWARD},
        {VIEW_ID_HOME_BUTTON, IDC_HOME},
        {VIEW_ID_RELOAD_BUTTON, IDC_RELOAD},
        {VIEW_ID_AVATAR_BUTTON, IDC_SHOW_AVATAR_MENU}});
-  return *kViewCommandMap;
+  return kViewCommandMap;
 }
 
 }  // namespace