DEPS

diff --git a/DEPS b/DEPS
index a814bac..fd9d36c4 100644
--- a/DEPS
+++ b/DEPS
@@ -285,19 +285,19 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': '32995e7b37841aec77968a387e615ab6d67f915a',
+  'skia_revision': 'bdbd155084ee81c06e5c853317a29101591f9314',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'ef5c55962b8617d18ea68cd9fbade45d0a9f6a67',
+  'v8_revision': '21b276e9b81b30b81f0ce7f97d68e0ab58c34093',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '4c8ab49da1f059677fefb49d156af3b00c49f679',
+  'angle_revision': '443ac5b483b071827c5ba911c74081aaec24df99',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
-  'swiftshader_revision': 'e81a1152c10c0ec44ff657706410289ef1800db4',
+  'swiftshader_revision': 'dd55e592406dc0bae219df11adec6363840aff4a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.
@@ -336,7 +336,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling freetype
   # and whatever else without interference from each other.
-  'freetype_revision': 'c4fe77c3f072fab930267f95510562e7aeb03302',
+  'freetype_revision': 'ea9fca0add69e1613eee3290e18c1f8cb4d17a43',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling freetype
   # and whatever else without interference from each other.
@@ -372,7 +372,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': '6337cf1fb486fc8b1a8531706ae393a17c8144af',
+  'devtools_frontend_revision': '2cdcd6da075b6813b3cdb048880a26130ac47ff9',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -412,7 +412,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': 'dc071b1098adfa849719ea87c6da254aef5fb200',
+  'dawn_revision': 'fa3c08d112bd138cb396df64f205366a98bae6f8',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -771,7 +771,7 @@
 
   'src/clank': {
     'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
-    '13a5b49540644bc5a7c5cc024c4999a22c85e308',
+    'a3172d482c03df90641412f5d57466eeae326ac2',
     'condition': 'checkout_android and checkout_src_internal',
   },
 
@@ -870,7 +870,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/linux-amd64',
-          'version': 'tSM8OLI9O-vzROwMfORm0mFHRGm6YcVC6Z0xO3EBIeMC',
+          'version': '-ZzDYaDKAAegot0k0BxwV6pbW90MYP5mcDOfVuvQudYC',
         },
       ],
       'dep_type': 'cipd',
@@ -881,7 +881,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/mac-amd64',
-          'version': 'azPgiYO8uGu89VHdHm5uNRFInQdu0FqUhWiqiXpvClkC',
+          'version': '8o-sJAb0Ao5kEaUw0zzYXGeOAH15nwZgh2S66hF7sckC',
         },
       ],
       'dep_type': 'cipd',
@@ -892,7 +892,7 @@
       'packages': [
         {
           'package': 'chromium/rts/model/windows-amd64',
-          'version': 'eDViJzGaPdxDxmxnDxztA4bzABX6IFJrIjW14Zga9bgC',
+          'version': 'y0fh0ECciob7yucm9q691p4u8xs_xhICW135zFDuKXcC',
         },
       ],
       'dep_type': 'cipd',
@@ -1195,13 +1195,13 @@
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '923f33d743367c44522418bde1cfc444df3ec18f',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '59ebbc12ebfbadb33c87365bb68c2fe9d838543a',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
 
   'src/third_party/devtools-frontend-internal': {
-      'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '3ceead8e27627d49691cf2f5eaaadb019799dc33',
+      'url': Var('chrome_git') + '/devtools/devtools-internal.git' + '@' + '5098d230bcc13df9ba43a0a94913ce797b01a412',
     'condition': 'checkout_src_internal',
   },
 
@@ -1676,7 +1676,7 @@
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + 'd4fef5be9b97f8fa00cb04a66949d8e1b27f03f9',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + 'ef2774e07ca5e6e6484c5dff043ebc331dd0de9d',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
@@ -1858,10 +1858,10 @@
     Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'd1b65aa5a88f6efd900604dfcda840154e9f16e2',
 
   'src/third_party/webgpu-cts/src':
-    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '9a964bd74fe1383f80d1f57362ab35856c6a2662',
+    Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'cefabb95fc47d2962fb14d46ffdf2b89326e860b',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + 'bbde8b60a3ef667e3189d5289ba0dd9cb26747f6',
+    Var('webrtc_git') + '/src.git' + '@' + '95e7a0398ca68fed86dfeed703bc051c1e44467d',
 
   # Wuffs' canonical repository is at github.com/google/wuffs, but we use
   # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file.
@@ -1981,7 +1981,7 @@
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': 'jV4lkZItTSsFDuYvDQmk1u57EGwJ0T7jVVM0EKRO-YoC',
+        'version': 'Ov77KOV6xaTjttn5N1QlQ6o5rjkNvrwfGPrSj654f60C',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',

android_webview/javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java
index 1d1e935..5951633 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java
@@ -121,6 +121,10 @@
         mBackgroundThread.getLooper();
         mActivityTestRule.createAwBrowserContext();
         mActivityTestRule.startBrowserProcess();
+
+        // Clearing the UI thread isn't really supported so we're not left in a state where we can
+        // cleanly finish the Activity after these tests.
+        mActivityTestRule.setFinishActivity(false);
     }
 
     @After
@@ -130,7 +134,6 @@
             backgroundThreadLooper.quitSafely();
         }
         mBackgroundThread.join();
-        ThreadUtils.clearUiThreadForTesting();
         Thread.setDefaultUncaughtExceptionHandler(mDefaultUncaughtExceptionHandler);
     }
 

ash/BUILD.gn

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 9538b428..b95713060 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -871,6 +871,8 @@
     "user_education/holding_space_tour/holding_space_tour_controller.h",
     "user_education/tutorial_controller.cc",
     "user_education/tutorial_controller.h",
+    "user_education/user_education_class_properties.cc",
+    "user_education/user_education_class_properties.h",
     "user_education/user_education_constants.cc",
     "user_education/user_education_constants.h",
     "user_education/user_education_controller.cc",
@@ -1456,6 +1458,8 @@
     "system/locale/unified_locale_detailed_view_controller.h",
     "system/lock_screen_notification_controller.cc",
     "system/lock_screen_notification_controller.h",
+    "system/media/media_color_theme.cc",
+    "system/media/media_color_theme.h",
     "system/media/media_notification_provider.cc",
     "system/media/media_notification_provider.h",
     "system/media/media_notification_provider_observer.h",
@@ -2000,6 +2004,8 @@
     "system/unified/feature_tile.h",
     "system/unified/feature_tiles_container_view.cc",
     "system/unified/feature_tiles_container_view.h",
+    "system/unified/glanceable_tray_bubble.cc",
+    "system/unified/glanceable_tray_bubble.h",
     "system/unified/ime_mode_view.cc",
     "system/unified/ime_mode_view.h",
     "system/unified/managed_device_tray_item_view.cc",

ash/app_list/views/app_list_toast_view.cc

diff --git a/ash/app_list/views/app_list_toast_view.cc b/ash/app_list/views/app_list_toast_view.cc
index 752a6f4..f3345f0 100644
--- a/ash/app_list/views/app_list_toast_view.cc
+++ b/ash/app_list/views/app_list_toast_view.cc
@@ -397,12 +397,9 @@
     return;
   }
 
-  // Default to dark_icon_ if dark/light mode feature is not enabled.
   const gfx::VectorIcon* themed_icon =
-      !features::IsDarkLightModeEnabled() ||
-              DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()
-          ? dark_icon_
-          : light_icon_;
+      DarkLightModeControllerImpl::Get()->IsDarkModeEnabled() ? dark_icon_
+                                                              : light_icon_;
   icon_->SetImage(ui::ImageModel::FromVectorIcon(
       *themed_icon, ui::kColorAshSystemUIMenuIcon,
       icon_size_.value_or(gfx::GetDefaultSizeOfVectorIcon(*themed_icon))));

ash/app_list/views/assistant/assistant_dialog_plate.cc

diff --git a/ash/app_list/views/assistant/assistant_dialog_plate.cc b/ash/app_list/views/assistant/assistant_dialog_plate.cc
index d0560a0f5..9cdb171d 100644
--- a/ash/app_list/views/assistant/assistant_dialog_plate.cc
+++ b/ash/app_list/views/assistant/assistant_dialog_plate.cc
@@ -14,7 +14,6 @@
 #include "ash/assistant/ui/base/assistant_button.h"
 #include "ash/assistant/ui/dialog_plate/mic_view.h"
 #include "ash/assistant/util/animation_util.h"
-#include "ash/constants/ash_features.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/public/cpp/assistant/controller/assistant_interaction_controller.h"
 #include "ash/public/cpp/assistant/controller/assistant_ui_controller.h"
@@ -85,24 +84,6 @@
     keyboard_controller->HideKeyboardImplicitlyByUser();
 }
 
-// Returns the primary color adjusted for enabled features.
-ui::ColorId GetPrimaryColor() {
-  if (features::IsDarkLightModeEnabled())
-    return cros_tokens::kColorPrimary;
-
-  // The dark color is used by default.
-  return cros_tokens::kColorPrimaryDark;
-}
-
-// Returns the secondary color adjusted for enabled features.
-ui::ColorId GetSecondaryColor() {
-  if (features::IsDarkLightModeEnabled())
-    return cros_tokens::kColorSecondary;
-
-  // The dark color is used by default.
-  return cros_tokens::kColorSecondaryDark;
-}
-
 }  // namespace
 
 // AssistantDialogPlate --------------------------------------------------------
@@ -316,9 +297,10 @@
 void AssistantDialogPlate::OnThemeChanged() {
   views::View::OnThemeChanged();
 
-  textfield_->SetTextColor(GetColorProvider()->GetColor(GetPrimaryColor()));
+  textfield_->SetTextColor(
+      GetColorProvider()->GetColor(cros_tokens::kColorPrimary));
   textfield_->set_placeholder_text_color(
-      GetColorProvider()->GetColor(GetSecondaryColor()));
+      GetColorProvider()->GetColor(cros_tokens::kColorSecondary));
 }
 
 views::View* AssistantDialogPlate::FindFirstFocusableView() {
@@ -463,7 +445,7 @@
   AssistantButton::InitParams params;
   params.size_in_dip = kButtonSizeDip;
   params.icon_size_in_dip = kIconSizeDip;
-  params.icon_color_type = GetPrimaryColor();
+  params.icon_color_type = cros_tokens::kColorPrimary;
   params.accessible_name_id = IDS_ASH_ASSISTANT_DIALOG_PLATE_KEYBOARD_ACCNAME;
   params.tooltip_id = IDS_ASH_ASSISTANT_DIALOG_PLATE_KEYBOARD_TOOLTIP;
   keyboard_input_toggle_ =

ash/app_list/views/assistant/assistant_dialog_plate_unittest.cc

diff --git a/ash/app_list/views/assistant/assistant_dialog_plate_unittest.cc b/ash/app_list/views/assistant/assistant_dialog_plate_unittest.cc
index ac9aee2..b16c670 100644
--- a/ash/app_list/views/assistant/assistant_dialog_plate_unittest.cc
+++ b/ash/app_list/views/assistant/assistant_dialog_plate_unittest.cc
@@ -16,7 +16,6 @@
 #include "ash/style/ash_color_id.h"
 #include "ash/style/dark_light_mode_controller_impl.h"
 #include "base/test/scoped_feature_list.h"
-#include "chromeos/constants/chromeos_features.h"
 #include "components/vector_icons/vector_icons.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/chromeos/styles/cros_tokens_color_mappings.h"
@@ -36,10 +35,6 @@
 using AssistantDialogPlateTest = AssistantAshTestBase;
 
 TEST_F(AssistantDialogPlateTest, DarkAndLightTheme) {
-  base::test::ScopedFeatureList scoped_feature_list(
-      chromeos::features::kDarkLightMode);
-  ASSERT_TRUE(chromeos::features::IsDarkLightModeEnabled());
-
   auto* dark_light_mode_controller = DarkLightModeControllerImpl::Get();
   dark_light_mode_controller->OnActiveUserPrefServiceChanged(
       Shell::Get()->session_controller()->GetActivePrefService());
@@ -85,33 +80,4 @@
       *keyboard_input_toggle->GetImage(views::Button::STATE_NORMAL).bitmap()));
 }
 
-TEST_F(AssistantDialogPlateTest, DarkAndLightModeFlagOff) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndDisableFeature(chromeos::features::kDarkLightMode);
-
-  ShowAssistantUi();
-
-  views::View* assistant_dialog_plate =
-      page_view()->GetViewByID(AssistantViewID::kDialogPlate);
-  views::Textfield* assistant_text_field = static_cast<views::Textfield*>(
-      assistant_dialog_plate->GetViewByID(AssistantViewID::kTextQueryField));
-  AssistantButton* keyboard_input_toggle =
-      static_cast<AssistantButton*>(assistant_dialog_plate->GetViewByID(
-          AssistantViewID::kKeyboardInputToggle));
-
-  EXPECT_EQ(assistant_text_field->GetTextColor(),
-            assistant_text_field->GetColorProvider()->GetColor(
-                cros_tokens::kColorPrimaryDark));
-
-  // When dark light mode is not on, the default color is dark.
-  EXPECT_TRUE(gfx::test::AreBitmapsEqual(
-      *gfx::CreateVectorIcon(vector_icons::kKeyboardIcon, kIconDipSize,
-                             gfx::kGoogleGrey200)
-           .bitmap(),
-      *keyboard_input_toggle->GetImage(views::Button::STATE_NORMAL).bitmap()));
-
-  // Avoid test teardown issues by explicitly closing the launcher.
-  CloseAssistantUi();
-}
-
 }  // namespace ash

ash/app_list/views/remove_query_confirmation_dialog.cc

diff --git a/ash/app_list/views/remove_query_confirmation_dialog.cc b/ash/app_list/views/remove_query_confirmation_dialog.cc
index bef7bcc..e76d8ba 100644
--- a/ash/app_list/views/remove_query_confirmation_dialog.cc
+++ b/ash/app_list/views/remove_query_confirmation_dialog.cc
@@ -12,12 +12,17 @@
 #include "ash/public/cpp/view_shadow.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/style/ash_color_id.h"
 #include "ash/style/ash_color_provider.h"
+#include "ash/style/dark_light_mode_controller_impl.h"
 #include "ash/style/pill_button.h"
+#include "ash/style/typography.h"
 #include "base/functional/bind.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/chromeos/styles/cros_tokens_color_mappings.h"
+#include "ui/color/color_id.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/strings/grit/ui_strings.h"
@@ -49,7 +54,8 @@
 RemoveQueryConfirmationDialog::RemoveQueryConfirmationDialog(
     RemovalConfirmationCallback confirm_callback,
     const std::u16string& result_title)
-    : confirm_callback_(std::move(confirm_callback)) {
+    : confirm_callback_(std::move(confirm_callback)),
+      is_jellyroll_enabled_(chromeos::features::IsJellyEnabled()) {
   SetModalType(ui::MODAL_TYPE_WINDOW);
 
   SetPaintToLayer();
@@ -62,11 +68,30 @@
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical, kDialogContentInsets));
 
+  SetBackground(views::CreateThemedRoundedRectBackground(
+      is_jellyroll_enabled_
+          ? static_cast<ui::ColorId>(cros_tokens::kCrosSysBaseElevated)
+          : kColorAshShieldAndBase80,
+      kDialogRoundedCornerRadius));
+
+  SetBorder(std::make_unique<views::HighlightBorder>(
+      kDialogRoundedCornerRadius,
+      is_jellyroll_enabled_
+          ? views::HighlightBorder::Type::kHighlightBorderOnShadow
+          : views::HighlightBorder::Type::kHighlightBorder1));
+
   // Add dialog title.
   title_ = AddChildView(std::make_unique<views::Label>(
       l10n_util::GetStringUTF16(IDS_REMOVE_ZERO_STATE_SUGGESTION_TITLE)));
-  title_->SetTextContext(views::style::CONTEXT_DIALOG_TITLE);
-  title_->SetTextStyle(views::style::STYLE_EMPHASIZED);
+  if (is_jellyroll_enabled_) {
+    TypographyProvider::Get()->StyleLabel(TypographyToken::kCrosTitle1,
+                                          *title_);
+    title_->SetEnabledColorId(cros_tokens::kCrosSysOnSurface);
+  } else {
+    title_->SetTextContext(views::style::CONTEXT_DIALOG_TITLE);
+    title_->SetTextStyle(views::style::STYLE_EMPHASIZED);
+    title_->SetEnabledColorId(kColorAshTextColorPrimary);
+  }
   title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_->SetAutoColorReadabilityEnabled(false);
   // Needs to paint to layer so it's stacked above `this` view.
@@ -83,7 +108,13 @@
   body_->SetProperty(views::kMarginsKey,
                      gfx::Insets::TLBR(kMarginBetweenTitleAndBody, 0,
                                        kMarginBetweenBodyAndButtons, 0));
-  body_->SetTextContext(views::style::CONTEXT_DIALOG_BODY_TEXT);
+  if (is_jellyroll_enabled_) {
+    TypographyProvider::Get()->StyleLabel(TypographyToken::kCrosBody1, *body_);
+    body_->SetEnabledColorId(cros_tokens::kCrosSysOnSurface);
+  } else {
+    body_->SetTextContext(views::style::CONTEXT_DIALOG_BODY_TEXT);
+    body_->SetEnabledColorId(kColorAshTextColorPrimary);
+  }
   body_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   body_->SetMultiLine(true);
   body_->SetAllowCharacterBreak(true);
@@ -144,24 +175,6 @@
   return gfx::Size(default_width, GetHeightForWidth(default_width));
 }
 
-void RemoveQueryConfirmationDialog::OnThemeChanged() {
-  views::WidgetDelegateView::OnThemeChanged();
-
-  SetBackground(views::CreateRoundedRectBackground(
-      AshColorProvider::Get()->GetBaseLayerColor(
-          AshColorProvider::BaseLayerType::kTransparent80),
-      kDialogRoundedCornerRadius));
-  SetBorder(std::make_unique<views::HighlightBorder>(
-      kDialogRoundedCornerRadius,
-      chromeos::features::IsJellyrollEnabled()
-          ? views::HighlightBorder::Type::kHighlightBorderOnShadow
-          : views::HighlightBorder::Type::kHighlightBorder1));
-  title_->SetEnabledColor(AshColorProvider::Get()->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorPrimary));
-  body_->SetEnabledColor(AshColorProvider::Get()->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorPrimary));
-}
-
 void RemoveQueryConfirmationDialog::GetAccessibleNodeData(
     ui::AXNodeData* node_data) {
   if (!GetVisible())

ash/app_list/views/remove_query_confirmation_dialog.h

diff --git a/ash/app_list/views/remove_query_confirmation_dialog.h b/ash/app_list/views/remove_query_confirmation_dialog.h
index 19738d9..ef1b0e5 100644
--- a/ash/app_list/views/remove_query_confirmation_dialog.h
+++ b/ash/app_list/views/remove_query_confirmation_dialog.h
@@ -42,7 +42,6 @@
   // views::View:
   const char* GetClassName() const override;
   gfx::Size CalculatePreferredSize() const override;
-  void OnThemeChanged() override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
   views::Button* cancel_button_for_test() { return cancel_button_; }
@@ -52,6 +51,9 @@
   RemovalConfirmationCallback confirm_callback_;
   std::unique_ptr<ViewShadow> view_shadow_;
 
+  // Whether Jelly style feature is enabled.
+  bool is_jellyroll_enabled_ = false;
+
   views::Label* title_ = nullptr;
   views::Label* body_ = nullptr;
   views::Button* cancel_button_ = nullptr;

ash/app_list/views/search_result_view.cc

diff --git a/ash/app_list/views/search_result_view.cc b/ash/app_list/views/search_result_view.cc
index 60219ee..2367d7d 100644
--- a/ash/app_list/views/search_result_view.cc
+++ b/ash/app_list/views/search_result_view.cc
@@ -35,6 +35,7 @@
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/chromeos/styles/cros_tokens_color_mappings.h"
+#include "ui/color/color_id.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
@@ -1172,10 +1173,16 @@
 
   gfx::Rect content_rect(rect);
 
-  const SkColor focus_bar_color =
-      GetColorProvider()->GetColor(ui::kColorAshFocusRing);
-  const SkColor highlight_color =
-      GetColorProvider()->GetColor(kColorAshHighlightColorHover);
+  bool is_jelly_enabled = chromeos::features::IsJellyEnabled();
+
+  const SkColor focus_bar_color = GetColorProvider()->GetColor(
+      is_jelly_enabled
+          ? static_cast<ui::ColorId>(cros_tokens::kCrosSysFocusRing)
+          : ui::kColorAshFocusRing);
+  const SkColor highlight_color = GetColorProvider()->GetColor(
+      is_jelly_enabled
+          ? static_cast<ui::ColorId>(cros_tokens::kCrosSysHoverOnSubtle)
+          : kColorAshHighlightColorHover);
   switch (view_type_) {
     case SearchResultViewType::kDefault:
       if (selected() && !actions_view()->HasSelectedAction()) {

ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.cc

diff --git a/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.cc b/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.cc
index 4a08e98..bb28a3a 100644
--- a/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.cc
+++ b/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.cc
@@ -8,7 +8,6 @@
 #include "ash/assistant/ui/assistant_view_delegate.h"
 #include "ash/assistant/ui/assistant_view_ids.h"
 #include "ash/assistant/util/resource_util.h"
-#include "ash/constants/ash_features.h"
 #include "ash/style/dark_light_mode_controller_impl.h"
 #include "base/functional/bind.h"
 #include "base/strings/utf_string_conversions.h"
@@ -71,12 +70,9 @@
   DCHECK_GE(index, 0);
   DCHECK_LT(index, static_cast<int>(std::size(kBackgroundColors)));
 
-  if (features::IsDarkLightModeEnabled()) {
-    return DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()
-               ? kBackgroundColors[index].dark
-               : kBackgroundColors[index].light;
-  }
-  return kBackgroundColors[index].flag_off;
+  return DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()
+             ? kBackgroundColors[index].dark
+             : kBackgroundColors[index].light;
 }
 
 SkColor GetForegroundColor(int index) {
@@ -93,12 +89,9 @@
   DCHECK_GE(index, 0);
   DCHECK_LT(index, static_cast<int>(std::size(kForegroundColors)));
 
-  if (features::IsDarkLightModeEnabled()) {
-    return DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()
-               ? kForegroundColors[index].dark
-               : kForegroundColors[index].light;
-  }
-  return kForegroundColors[index].flag_off;
+  return DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()
+             ? kForegroundColors[index].dark
+             : kForegroundColors[index].light;
 }
 
 }  // namespace

ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view_unittest.cc

diff --git a/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view_unittest.cc b/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view_unittest.cc
index cad79904..8c472b3 100644
--- a/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view_unittest.cc
+++ b/ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.h"
 #include "ash/assistant/ui/assistant_view_ids.h"
-#include "ash/constants/ash_features.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
@@ -12,7 +11,6 @@
 #include "ash/test/ash_test_base.h"
 #include "base/test/scoped_feature_list.h"
 #include "chromeos/ash/services/libassistant/public/cpp/assistant_suggestion.h"
-#include "chromeos/constants/chromeos_features.h"
 #include "components/prefs/pref_service.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/views/background.h"
@@ -42,12 +40,9 @@
 using AssistantOnboardingSuggestionViewTest = AshTestBase;
 
 TEST_F(AssistantOnboardingSuggestionViewTest, DarkAndLightTheme) {
-  base::test::ScopedFeatureList scoped_feature_list(
-      chromeos::features::kDarkLightMode);
   auto* dark_light_mode_controller = DarkLightModeControllerImpl::Get();
   dark_light_mode_controller->OnActiveUserPrefServiceChanged(
       Shell::Get()->session_controller()->GetActivePrefService());
-  ASSERT_TRUE(features::IsDarkLightModeEnabled());
   Shell::Get()->session_controller()->GetActivePrefService()->SetBoolean(
       prefs::kDarkModeEnabled, false);
   ASSERT_FALSE(dark_light_mode_controller->IsDarkModeEnabled());
@@ -132,53 +127,4 @@
             gfx::kGoogleBlue200);
 }
 
-TEST_F(AssistantOnboardingSuggestionViewTest, DarkAndLightModeFlagOff) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndDisableFeature(chromeos::features::kDarkLightMode);
-
-  std::unique_ptr<views::Widget> widget = CreateTestWidget();
-
-  AssistantOnboardingSuggestionView* suggestion_view_0 =
-      CreateSuggestionViewAt(0, widget.get());
-  AssistantOnboardingSuggestionView* suggestion_view_1 =
-      CreateSuggestionViewAt(1, widget.get());
-  AssistantOnboardingSuggestionView* suggestion_view_2 =
-      CreateSuggestionViewAt(2, widget.get());
-  AssistantOnboardingSuggestionView* suggestion_view_3 =
-      CreateSuggestionViewAt(3, widget.get());
-  AssistantOnboardingSuggestionView* suggestion_view_4 =
-      CreateSuggestionViewAt(4, widget.get());
-  AssistantOnboardingSuggestionView* suggestion_view_5 =
-      CreateSuggestionViewAt(5, widget.get());
-
-  EXPECT_EQ(suggestion_view_0->GetBackground()->get_color(),
-            gfx::kGoogleBlue050);
-  EXPECT_EQ(GetLabel(suggestion_view_0)->GetEnabledColor(),
-            gfx::kGoogleBlue800);
-
-  EXPECT_EQ(suggestion_view_1->GetBackground()->get_color(),
-            gfx::kGoogleRed050);
-  EXPECT_EQ(GetLabel(suggestion_view_1)->GetEnabledColor(), gfx::kGoogleRed800);
-
-  EXPECT_EQ(suggestion_view_2->GetBackground()->get_color(),
-            gfx::kGoogleYellow050);
-  EXPECT_EQ(GetLabel(suggestion_view_2)->GetEnabledColor(),
-            SkColorSetRGB(0xBF, 0x50, 0x00));
-
-  EXPECT_EQ(suggestion_view_3->GetBackground()->get_color(),
-            gfx::kGoogleGreen050);
-  EXPECT_EQ(GetLabel(suggestion_view_3)->GetEnabledColor(),
-            gfx::kGoogleGreen800);
-
-  EXPECT_EQ(suggestion_view_4->GetBackground()->get_color(),
-            SkColorSetRGB(0xF6, 0xE9, 0xF8));
-  EXPECT_EQ(GetLabel(suggestion_view_4)->GetEnabledColor(),
-            SkColorSetRGB(0x8A, 0x0E, 0x9E));
-
-  EXPECT_EQ(suggestion_view_5->GetBackground()->get_color(),
-            gfx::kGoogleBlue050);
-  EXPECT_EQ(GetLabel(suggestion_view_5)->GetEnabledColor(),
-            gfx::kGoogleBlue800);
-}
-
 }  // namespace ash

ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc

diff --git a/ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc b/ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc
index 5735da5..429c47c 100644
--- a/ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc
+++ b/ash/assistant/ui/main_stage/assistant_onboarding_view_unittest.cc
@@ -17,7 +17,6 @@
 #include "ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.h"
 #include "ash/assistant/ui/test_support/mock_assistant_view_delegate.h"
 #include "ash/assistant/util/test_support/macros.h"
-#include "ash/constants/ash_features.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/public/cpp/assistant/controller/assistant_suggestions_controller.h"
 #include "ash/public/cpp/assistant/controller/assistant_ui_controller.h"
@@ -32,7 +31,6 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/unguessable_token.h"
 #include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
-#include "chromeos/constants/chromeos_features.h"
 #include "chromeos/ui/vector_icons/vector_icons.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -305,11 +303,8 @@
         {SkColorSetRGB(0x8A, 0x0E, 0x9E), SkColorSetRGB(0xf8, 0x82, 0xff),
          SkColorSetRGB(0xaa, 0x00, 0xb8)},
         {gfx::kGoogleBlue800, gfx::kGoogleBlue200, gfx::kGoogleBlue800}};
-    const bool is_dark_light_enabled = features::IsDarkLightModeEnabled();
-    const bool is_dark_mode_status =
-        DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
     const int color_index =
-        is_dark_light_enabled ? (is_dark_mode_status ? 1 : 2) : 0;
+        DarkLightModeControllerImpl::Get()->IsDarkModeEnabled() ? 1 : 2;
     return kForegroundColors[index][color_index];
   };
 
@@ -484,13 +479,10 @@
 }
 
 TEST_F(AssistantOnboardingViewTest, DarkAndLightTheme) {
-  base::test::ScopedFeatureList scoped_feature_list(
-      chromeos::features::kDarkLightMode);
   AshColorProvider* color_provider = AshColorProvider::Get();
   auto* dark_light_mode_controller = DarkLightModeControllerImpl::Get();
   dark_light_mode_controller->OnActiveUserPrefServiceChanged(
       Shell::Get()->session_controller()->GetActivePrefService());
-  ASSERT_TRUE(chromeos::features::IsDarkLightModeEnabled());
 
   ShowAssistantUi();
 

ash/capture_mode/capture_label_view.cc

diff --git a/ash/capture_mode/capture_label_view.cc b/ash/capture_mode/capture_label_view.cc
index 92da696..1c1e953 100644
--- a/ash/capture_mode/capture_label_view.cc
+++ b/ash/capture_mode/capture_label_view.cc
@@ -177,7 +177,7 @@
   label_->SetEnabledColorId(kColorAshTextColorPrimary);
   label_->SetBackgroundColor(SK_ColorTRANSPARENT);
 
-  capture_mode_util::MaybeSetHighlightBorder(
+  capture_mode_util::SetHighlightBorder(
       this, kCaptureLabelRadius,
       chromeos::features::IsJellyrollEnabled()
           ? views::HighlightBorder::Type::kHighlightBorderNoShadow

ash/capture_mode/capture_mode_bar_view.cc

diff --git a/ash/capture_mode/capture_mode_bar_view.cc b/ash/capture_mode/capture_mode_bar_view.cc
index b718d9a..9ea9b52 100644
--- a/ash/capture_mode/capture_mode_bar_view.cc
+++ b/ash/capture_mode/capture_mode_bar_view.cc
@@ -114,7 +114,7 @@
   separator_2_->SetColorId(ui::kColorAshSystemUIMenuSeparator);
   separator_2_->SetPreferredLength(kSeparatorHeight);
 
-  capture_mode_util::MaybeSetHighlightBorder(
+  capture_mode_util::SetHighlightBorder(
       this, kBorderRadius,
       chromeos::features::IsJellyrollEnabled()
           ? views::HighlightBorder::Type::kHighlightBorderOnShadow

ash/capture_mode/capture_mode_settings_view.cc

diff --git a/ash/capture_mode/capture_mode_settings_view.cc b/ash/capture_mode/capture_mode_settings_view.cc
index dc9a367..c71deef 100644
--- a/ash/capture_mode/capture_mode_settings_view.cc
+++ b/ash/capture_mode/capture_mode_settings_view.cc
@@ -163,7 +163,7 @@
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical));
 
-  capture_mode_util::MaybeSetHighlightBorder(
+  capture_mode_util::SetHighlightBorder(
       this, kCornerRadius,
       chromeos::features::IsJellyrollEnabled()
           ? views::HighlightBorder::Type::kHighlightBorderOnShadow

ash/capture_mode/capture_mode_util.cc

diff --git a/ash/capture_mode/capture_mode_util.cc b/ash/capture_mode/capture_mode_util.cc
index 2e48f8b7..f4c55f2e 100644
--- a/ash/capture_mode/capture_mode_util.cc
+++ b/ash/capture_mode/capture_mode_util.cc
@@ -564,13 +564,9 @@
   return total;
 }
 
-void MaybeSetHighlightBorder(views::View* view,
-                             int corner_radius,
-                             views::HighlightBorder::Type type) {
-  if (!features::IsDarkLightModeEnabled()) {
-    return;
-  }
-
+void SetHighlightBorder(views::View* view,
+                        int corner_radius,
+                        views::HighlightBorder::Type type) {
   view->SetBorder(
       std::make_unique<views::HighlightBorder>(corner_radius, type));
 }

ash/capture_mode/capture_mode_util.h

diff --git a/ash/capture_mode/capture_mode_util.h b/ash/capture_mode/capture_mode_util.h
index ce04ca6f..c72679b 100644
--- a/ash/capture_mode/capture_mode_util.h
+++ b/ash/capture_mode/capture_mode_util.h
@@ -211,9 +211,9 @@
 
 // Sets a highlight border to the `view` with given rounded corner radius and
 // type.
-void MaybeSetHighlightBorder(views::View* view,
-                             int corner_radius,
-                             views::HighlightBorder::Type type);
+void SetHighlightBorder(views::View* view,
+                        int corner_radius,
+                        views::HighlightBorder::Type type);
 
 }  // namespace capture_mode_util
 

ash/capture_mode/key_item_view.cc

diff --git a/ash/capture_mode/key_item_view.cc b/ash/capture_mode/key_item_view.cc
index 847a179..6d39684 100644
--- a/ash/capture_mode/key_item_view.cc
+++ b/ash/capture_mode/key_item_view.cc
@@ -49,7 +49,7 @@
       views::CreateRoundedRectBackground(GetColor(), kKeyItemHeight / 2));
   layer()->SetFillsBoundsOpaquely(false);
 
-  capture_mode_util::MaybeSetHighlightBorder(
+  capture_mode_util::SetHighlightBorder(
       this, kKeyItemHeight / 2,
       chromeos::features::IsJellyrollEnabled()
           ? views::HighlightBorder::Type::kHighlightBorderOnShadow

ash/capture_mode/recording_type_menu_view.cc

diff --git a/ash/capture_mode/recording_type_menu_view.cc b/ash/capture_mode/recording_type_menu_view.cc
index ecbdb13..887106d 100644
--- a/ash/capture_mode/recording_type_menu_view.cc
+++ b/ash/capture_mode/recording_type_menu_view.cc
@@ -73,7 +73,7 @@
             l10n_util::GetStringUTF16(IDS_ASH_SCREEN_CAPTURE_LABEL_GIF_RECORD),
             ToInt(RecordingType::kGif));
 
-  capture_mode_util::MaybeSetHighlightBorder(
+  capture_mode_util::SetHighlightBorder(
       this, kCornerRadius,
       chromeos::features::IsJellyrollEnabled()
           ? views::HighlightBorder::Type::kHighlightBorderOnShadow

ash/clipboard/views/clipboard_history_main_button.cc

diff --git a/ash/clipboard/views/clipboard_history_main_button.cc b/ash/clipboard/views/clipboard_history_main_button.cc
index 7db8029..2b49f43 100644
--- a/ash/clipboard/views/clipboard_history_main_button.cc
+++ b/ash/clipboard/views/clipboard_history_main_button.cc
@@ -102,11 +102,6 @@
   cc::PaintFlags flags;
   flags.setAntiAlias(true);
 
-  // Use the color in light mode when dark/light mode is not enabled. As the
-  // background color of the context menu is from NativeTheme when the feature
-  // is not enabled, and light mode is the default color of NativeTheme. If
-  // dark/light mode is enabled, the background color of the context menus
-  // inside SystemUI will be overridden to align with current system color mode.
   const auto color_id =
       chromeos::features::IsJellyEnabled()
           ? static_cast<ui::ColorId>(cros_tokens::kCrosSysHoverOnSubtle)

ash/components/arc/compat_mode/style/arc_color_provider.cc

diff --git a/ash/components/arc/compat_mode/style/arc_color_provider.cc b/ash/components/arc/compat_mode/style/arc_color_provider.cc
index 3b29fe5..486d173e 100644
--- a/ash/components/arc/compat_mode/style/arc_color_provider.cc
+++ b/ash/components/arc/compat_mode/style/arc_color_provider.cc
@@ -4,7 +4,6 @@
 
 #include "ash/components/arc/compat_mode/style/arc_color_provider.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/style/dark_light_mode_controller_impl.h"
 
 namespace arc {
@@ -14,8 +13,7 @@
   // |dark_light_mode_controller| may return null in unit testing.
   if (!dark_light_mode_controller)
     return false;
-  return ash::features::IsDarkLightModeEnabled() &&
-         dark_light_mode_controller->IsDarkModeEnabled();
+  return dark_light_mode_controller->IsDarkModeEnabled();
 }
 
 }  // namespace arc

ash/constants/ash_features.cc

diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
index ef683c8..5f514c0 100644
--- a/ash/constants/ash_features.cc
+++ b/ash/constants/ash_features.cc
@@ -1537,6 +1537,10 @@
              "OobeTouchpadScrollDirection",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
+BASE_FEATURE(kOobeDisplaySize,
+             "OobeDisplaySize",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
 // Enables or disables the ChromeOS OOBE HID Detection Revamp, which updates
 // the OOBE HID detection screen UI and related infrastructure. See
 // https://crbug.com/1299099.
@@ -1697,6 +1701,11 @@
              "PrintManagementJelly",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
+// Enables the new OS Printer Settings UI.
+BASE_FEATURE(kPrinterSettingsRevamp,
+             "PrinterSettingsRevamp",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
 // Enables to allocate more video capture buffers.
 BASE_FEATURE(kMoreVideoCaptureBuffers,
              "MoreVideoCaptureBuffers",
@@ -2053,7 +2062,7 @@
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 // Enables the ability to play sounds for system services.
-BASE_FEATURE(kSystemSounds, "SystemSounds", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kSystemSounds, "SystemSounds", base::FEATURE_DISABLED_BY_DEFAULT);
 
 // Enables or disables the shadows of system tray bubbles.
 BASE_FEATURE(kSystemTrayShadow,
@@ -3068,6 +3077,10 @@
   return base::FeatureList::IsEnabled(kOobeTouchpadScroll);
 }
 
+bool IsOobeDisplaySizeEnabled() {
+  return base::FeatureList::IsEnabled(kOobeDisplaySize);
+}
+
 bool IsOsSettingsAppBadgingToggleEnabled() {
   return base::FeatureList::IsEnabled(kOsSettingsAppBadgingToggle);
 }
@@ -3142,6 +3155,10 @@
   return base::FeatureList::IsEnabled(kQuickUnlockPinAutosubmit);
 }
 
+bool IsPrinterSettingsRevampEnabled() {
+  return base::FeatureList::IsEnabled(kPrinterSettingsRevamp);
+}
+
 bool IsPrivacyIndicatorsEnabled() {
   // Privacy indicators should not be enabled when video conference is enabled.
   return base::FeatureList::IsEnabled(kPrivacyIndicators) &&

ash/constants/ash_features.h

diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
index a76185d2..1a68b7e 100644
--- a/ash/constants/ash_features.h
+++ b/ash/constants/ash_features.h
@@ -455,6 +455,7 @@
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kOobeSimon);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kOobeQuickStart);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kOobeTouchpadScroll);
+COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kOobeDisplaySize);
 COMPONENT_EXPORT(ASH_CONSTANTS)
 BASE_DECLARE_FEATURE(kOsFeedbackJelly);
 COMPONENT_EXPORT(ASH_CONSTANTS)
@@ -489,6 +490,7 @@
 COMPONENT_EXPORT(ASH_CONSTANTS)
 BASE_DECLARE_FEATURE(kPolicyProvidedTrustAnchorsAllowedAtLockScreen);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kPreferConstantFrameRate);
+COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kPrinterSettingsRevamp);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kPrintManagementJelly);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kPrivacyIndicators);
 COMPONENT_EXPORT(ASH_CONSTANTS) BASE_DECLARE_FEATURE(kProductivityLauncher);
@@ -831,6 +833,7 @@
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOobeRemoveShutdownButtonEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOobeThemeSelectionEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOobeTouchpadScrollEnabled();
+COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOobeDisplaySizeEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOsSettingsAppBadgingToggleEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOsSettingsSearchFeedbackEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsOsSyncConsentRevampEnabled();
@@ -853,6 +856,7 @@
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPinAutosubmitBackfillFeatureEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPinAutosubmitFeatureEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPrivacyIndicatorsEnabled();
+COMPONENT_EXPORT(ASH_CONSTANTS) bool IsPrinterSettingsRevampEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsProductivityLauncherEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsProductivityLauncherImageSearchEnabled();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool IsProjectorEnabled();

ash/frame/non_client_frame_view_ash.cc

diff --git a/ash/frame/non_client_frame_view_ash.cc b/ash/frame/non_client_frame_view_ash.cc
index 8af776d..f75dd23e 100644
--- a/ash/frame/non_client_frame_view_ash.cc
+++ b/ash/frame/non_client_frame_view_ash.cc
@@ -8,7 +8,6 @@
 #include <memory>
 #include <vector>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/tablet_mode_observer.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shell.h"
@@ -297,9 +296,6 @@
 }
 
 void NonClientFrameViewAsh::AddedToWidget() {
-  if (!features::IsDarkLightModeEnabled())
-    return;
-
   if (highlight_border_overlay_ ||
       !GetWidget()->GetNativeWindow()->GetProperty(
           chromeos::kShouldHaveHighlightBorderOverlay)) {
@@ -320,15 +316,9 @@
   if (!frame_window->GetProperty(kTrackDefaultFrameColors))
     return;
 
-  // Use the light mode colors when the DarkLightMode feature is disabled. Do
-  // this because we use dark mode colors by default when the feature is
-  // disabled currently (see crbug.com/1291354).
-  const bool is_dark_light_enabled = features::IsDarkLightModeEnabled();
   auto* color_provider = frame_->GetColorProvider();
   const SkColor dialog_title_bar_color =
-      is_dark_light_enabled
-          ? color_provider->GetColor(cros_tokens::kDialogTitleBarColor)
-          : color_provider->GetColor(cros_tokens::kDialogTitleBarColorLight);
+      color_provider->GetColor(cros_tokens::kDialogTitleBarColor);
 
   frame_window->SetProperty(kFrameActiveColorKey, dialog_title_bar_color);
   frame_window->SetProperty(kFrameInactiveColorKey, dialog_title_bar_color);

ash/login/ui/lock_screen_media_controls_view_unittest.cc

diff --git a/ash/login/ui/lock_screen_media_controls_view_unittest.cc b/ash/login/ui/lock_screen_media_controls_view_unittest.cc
index d22284e2..6ad2d6d 100644
--- a/ash/login/ui/lock_screen_media_controls_view_unittest.cc
+++ b/ash/login/ui/lock_screen_media_controls_view_unittest.cc
@@ -686,7 +686,6 @@
       media_session::mojom::MediaPlaybackState::kPlaying);
 
   const bool should_use_dark_color =
-      features::IsDarkLightModeEnabled() &&
       DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
   gfx::ImageSkia default_icon = gfx::CreateVectorIcon(
       message_center::kProductIcon, kAppIconSize,

ash/projector/projector_annotation_tray.cc

diff --git a/ash/projector/projector_annotation_tray.cc b/ash/projector/projector_annotation_tray.cc
index 939b4be4..ed43e95 100644
--- a/ash/projector/projector_annotation_tray.cc
+++ b/ash/projector/projector_annotation_tray.cc
@@ -4,7 +4,6 @@
 
 #include "ash/projector/projector_annotation_tray.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/constants/tray_background_view_catalog.h"
 #include "ash/projector/projector_controller_impl.h"
@@ -202,15 +201,6 @@
   bubble_view->SetBorder(views::CreateEmptyBorder(
       gfx::Insets::TLBR(0, 0, kPaddingBetweenBottomAndLastTrayItem, 0)));
 
-  auto setup_layered_view = [](views::View* view) {
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (features::IsDarkLightModeEnabled())
-      return;
-    view->SetPaintToLayer();
-    view->layer()->SetFillsBoundsOpaquely(false);
-  };
-
   // Add drawing tools
   {
     auto* marker_view_container =
@@ -233,7 +223,6 @@
               l10n_util::GetStringUTF16(GetAccessibleNameForColor(color))));
       color_button->SetToggled(current_pen_color_ == color);
     }
-    setup_layered_view(marker_view_container);
   }
 
   // Show the bubble.

ash/public/cpp/BUILD.gn

diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn
index ebeda476..bb0efb6 100644
--- a/ash/public/cpp/BUILD.gn
+++ b/ash/public/cpp/BUILD.gn
@@ -128,6 +128,8 @@
     "feature_discovery_duration_reporter.h",
     "feature_discovery_metric_util.cc",
     "feature_discovery_metric_util.h",
+    "file_preview/file_preview_image_skia_source.cc",
+    "file_preview/file_preview_image_skia_source.h",
     "fps_counter.cc",
     "fps_counter.h",
     "fwupd_download_client.cc",
@@ -474,6 +476,7 @@
     "ambient/ambient_prefs_unittest.cc",
     "android_intent_helper_unittest.cc",
     "app_list/app_list_config_provider_unittest.cc",
+    "file_preview/file_preview_image_skia_source_unittest.cc",
     "holding_space/holding_space_image_unittest.cc",
     "holding_space/holding_space_item_unittest.cc",
     "holding_space/holding_space_model_unittest.cc",
@@ -533,6 +536,8 @@
     "test/mock_projector_client.h",
     "test/mock_projector_controller.cc",
     "test/mock_projector_controller.h",
+    "test/test_image_decoder.cc",
+    "test/test_image_decoder.h",
     "test/test_image_downloader.cc",
     "test/test_image_downloader.h",
     "test/test_keyboard_controller_observer.cc",

ash/public/cpp/file_preview/file_preview_image_skia_source.cc

diff --git a/ash/public/cpp/file_preview/file_preview_image_skia_source.cc b/ash/public/cpp/file_preview/file_preview_image_skia_source.cc
new file mode 100644
index 0000000..4c38468
--- /dev/null
+++ b/ash/public/cpp/file_preview/file_preview_image_skia_source.cc
@@ -0,0 +1,113 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/public/cpp/file_preview/file_preview_image_skia_source.h"
+
+#include "ash/public/cpp/image_util.h"
+#include "base/task/delay_policy.h"
+#include "base/time/time.h"
+#include "ui/gfx/image/image_skia_rep.h"
+
+namespace ash {
+
+FilePreviewImageSkiaSource::FilePreviewImageSkiaSource(Controller* controller,
+                                                       base::FilePath file_path)
+    : controller_(controller), file_path_(std::move(file_path)) {}
+
+FilePreviewImageSkiaSource::~FilePreviewImageSkiaSource() = default;
+
+void FilePreviewImageSkiaSource::SetPlaybackMode(PlaybackMode mode) {
+  CHECK(controller_);
+  if (playback_mode_ == mode) {
+    return;
+  }
+  playback_mode_ = mode;
+
+  Update();
+}
+
+void FilePreviewImageSkiaSource::Shutdown() {
+  CHECK(controller_);
+  // Once shutdown, do no more work and simply await destruction. No more
+  // callbacks should execute.
+  weak_factory_.InvalidateWeakPtrs();
+
+  // Set the PlaybackMode to one that doesn't use `frame_timer_` to stop
+  // animation and prevent it from being restarted if `OnFramesFetched()` is
+  // called after `Shutdown()`.
+  SetPlaybackMode(PlaybackMode::kFirstFrame);
+
+  // The controller could be destroyed before `this`. To avoid use after free,
+  // this method allows the controller to remove its raw pointer here.
+  controller_ = nullptr;
+}
+
+void FilePreviewImageSkiaSource::FetchFrames() {
+  CHECK(controller_);
+  if (fetching_frames_) {
+    return;
+  }
+  fetching_frames_ = true;
+  image_util::DecodeAnimationFile(
+      base::BindOnce(&FilePreviewImageSkiaSource::OnFramesFetched,
+                     weak_factory_.GetWeakPtr()),
+      file_path_);
+}
+
+void FilePreviewImageSkiaSource::OnFramesFetched(
+    std::vector<image_util::AnimationFrame> frames) {
+  CHECK(controller_);
+  // TODO(http://b/277112811): Pass size down from caller and scale image here
+  // once this has been wrapped in `ui::ImageModel::ImageGenerator`, since that
+  // requires a known size before the file has been loaded.
+  // Total size in memory of all frames is limited by the image decoder to be
+  // less than `IPC::Channel::kMaximumMessageSize` (~134MB).
+  frames_ = std::move(frames);
+  Update();
+  fetching_frames_ = false;
+}
+
+void FilePreviewImageSkiaSource::OnFrameTimer() {
+  CHECK(controller_);
+  CHECK(!frames_.empty());
+
+  frame_index_ = (frame_index_ + 1) % frames_.size();
+  Update();
+}
+
+void FilePreviewImageSkiaSource::Update() {
+  CHECK(controller_);
+  if (playback_mode_ == PlaybackMode::kFirstFrame) {
+    frame_index_ = 0;
+    frame_timer_.Stop();
+  }
+
+  // If the animation is looping and it is possible to start the frame timer,
+  // and it isn't already running, then start it.
+  if (!frame_timer_.IsRunning() && playback_mode_ == PlaybackMode::kLoop &&
+      frames_.size() > 1) {
+    // TODO(http://b/272078926): Possibly use another (more accurate) method of
+    // timing frames.
+    // TODO(http://b/272137556): Handle frames with 0 (or very small) duration.
+    frame_timer_.Start(
+        FROM_HERE, base::TimeTicks::Now() + frames_.at(frame_index_).duration,
+        base::BindOnce(&FilePreviewImageSkiaSource::OnFrameTimer,
+                       weak_factory_.GetWeakPtr()),
+        base::subtle::DelayPolicy::kPrecise);
+  }
+
+  controller_->Invalidate();
+}
+
+gfx::ImageSkiaRep FilePreviewImageSkiaSource::GetImageForScale(float scale) {
+  if (frames_.empty()) {
+    // TODO(http://b/266000882): Add logic to create static thumbnails for
+    // non-gif files.
+    FetchFrames();
+    return gfx::ImageSkiaRep();
+  }
+  return frames_.at(frame_index_).image.GetRepresentation(scale);
+}
+
+}  // namespace ash

ash/public/cpp/file_preview/file_preview_image_skia_source.h

diff --git a/ash/public/cpp/file_preview/file_preview_image_skia_source.h b/ash/public/cpp/file_preview/file_preview_image_skia_source.h
new file mode 100644
index 0000000..928d17b
--- /dev/null
+++ b/ash/public/cpp/file_preview/file_preview_image_skia_source.h
@@ -0,0 +1,93 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_PUBLIC_CPP_FILE_PREVIEW_FILE_PREVIEW_IMAGE_SKIA_SOURCE_H_
+#define ASH_PUBLIC_CPP_FILE_PREVIEW_FILE_PREVIEW_IMAGE_SKIA_SOURCE_H_
+
+#include <vector>
+
+#include "ash/public/cpp/ash_public_export.h"
+#include "base/files/file_path.h"
+#include "base/timer/timer.h"
+#include "ui/gfx/image/image_skia_source.h"
+
+namespace ash {
+
+namespace image_util {
+struct AnimationFrame;
+}  // namespace image_util
+
+// The class responsible for the animation behavior that enables file previews.
+// Invalidation going (effectively) directly from this class to the caller is
+// what enables this behavior, circumventing the fact that `gfx::ImageSkia` and
+// `ui::ImageModel` do not currently support invalidation.
+// TODO(http://b/268372461): Add a `base::FilePathWatcher` (or other solution to
+// watch for file changes) to this class.
+class ASH_PUBLIC_EXPORT FilePreviewImageSkiaSource
+    : public gfx::ImageSkiaSource {
+ public:
+  enum class PlaybackMode {
+    // Does not animate, showing only the first frame.
+    kFirstFrame,
+    // Animates on a loop.
+    kLoop,
+  };
+
+  // TODO(http://b/278602934): Replace this testing interface with a full
+  // `FilePreviewController` implementation and test the implementation of file
+  // preview holisitically.
+  class Controller {
+   public:
+    // Triggers invalidation after the image has changed.
+    virtual void Invalidate() = 0;
+  };
+
+  FilePreviewImageSkiaSource(Controller* controller, base::FilePath file_path);
+
+  FilePreviewImageSkiaSource(const FilePreviewImageSkiaSource&) = delete;
+  FilePreviewImageSkiaSource& operator=(const FilePreviewImageSkiaSource&) =
+      delete;
+
+  ~FilePreviewImageSkiaSource() override;
+
+  // Changes the behavior of the animation through the frames. If there is a
+  // single frame, this is effectively ignored. No-op if the new `PlaybackMode`
+  // is the same as the current one.
+  void SetPlaybackMode(PlaybackMode mode);
+
+  // Invalidates all `base::WeakPtr`s and sets all raw pointers to `nullptr`.
+  // This avoids doing extra work after an owning controller has been shutdown.
+  void Shutdown();
+
+  // gfx::ImageSkiaSource:
+  gfx::ImageSkiaRep GetImageForScale(float scale) override;
+
+ private:
+  // Decodes the frames for the file at `file_path_`.
+  void FetchFrames();
+
+  // Stores the fetched frames and triggers an update.
+  void OnFramesFetched(std::vector<image_util::AnimationFrame> frames);
+
+  // Advances to the next frame and triggers an update.
+  void OnFrameTimer();
+
+  // Starts or stops the frame timer as necessary based on `playback_mode`, and
+  // triggers invalidation.
+  void Update();
+
+  base::raw_ptr<Controller> controller_;
+  const base::FilePath file_path_;
+  std::vector<image_util::AnimationFrame> frames_;
+  size_t frame_index_ = 0;
+  base::DeadlineTimer frame_timer_;
+  bool fetching_frames_ = false;
+  PlaybackMode playback_mode_ = PlaybackMode::kFirstFrame;
+
+  base::WeakPtrFactory<FilePreviewImageSkiaSource> weak_factory_{this};
+};
+
+}  // namespace ash
+
+#endif  // ASH_PUBLIC_CPP_FILE_PREVIEW_FILE_PREVIEW_IMAGE_SKIA_SOURCE_H_

ash/public/cpp/file_preview/file_preview_image_skia_source_unittest.cc

diff --git a/ash/public/cpp/file_preview/file_preview_image_skia_source_unittest.cc b/ash/public/cpp/file_preview/file_preview_image_skia_source_unittest.cc
new file mode 100644
index 0000000..f63a344
--- /dev/null
+++ b/ash/public/cpp/file_preview/file_preview_image_skia_source_unittest.cc
@@ -0,0 +1,174 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/public/cpp/file_preview/file_preview_image_skia_source.h"
+
+#include <array>
+#include <vector>
+
+#include "ash/public/cpp/test/test_image_decoder.h"
+#include "base/callback_list.h"
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/files/scoped_temp_dir.h"
+#include "base/test/bind.h"
+#include "base/test/mock_callback.h"
+#include "base/test/task_environment.h"
+#include "services/data_decoder/public/mojom/image_decoder.mojom.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/image/image_skia_rep.h"
+#include "ui/gfx/image/image_skia_source.h"
+
+namespace ash {
+
+namespace {
+
+constexpr std::array<SkColor, 4> kTestColors{SK_ColorRED, SK_ColorYELLOW,
+                                             SK_ColorBLUE, SK_ColorMAGENTA};
+constexpr base::TimeDelta kTestFrameDelay = base::Milliseconds(100);
+
+SkBitmap Create1xBitmap(SkColor color) {
+  SkBitmap bitmap;
+  bitmap.allocN32Pixels(1, 1);
+  bitmap.eraseColor(color);
+  return bitmap;
+}
+
+std::vector<data_decoder::mojom::AnimationFramePtr> TestFrames() {
+  std::vector<data_decoder::mojom::AnimationFramePtr> result;
+  for (auto color : kTestColors) {
+    result.push_back(data_decoder::mojom::AnimationFrame::New(
+        Create1xBitmap(color), kTestFrameDelay));
+  }
+  return result;
+}
+
+// Test implementation of `FilePreviewImageSkiaSource::Controller` that allows
+// callbacks to be added to be called on `Invalidate()`.
+class TestController : public FilePreviewImageSkiaSource::Controller {
+ public:
+  // Adds a callback to be called on `Invalidate()`. The callback will be
+  // removed from the list when the returned `base::CallbackListSubscription` is
+  // destroyed.
+  [[nodiscard]] base::CallbackListSubscription AddInvalidationCallback(
+      base::RepeatingClosure callback) {
+    return invalidation_callbacks_.Add(callback);
+  }
+
+  // FilePreviewImageSkiaSource::Controller:
+  void Invalidate() override { invalidation_callbacks_.Notify(); }
+
+ private:
+  base::RepeatingClosureList invalidation_callbacks_;
+};
+}  // namespace
+
+class FilePreviewImageSkiaSourceTest : public testing::Test {
+ public:
+  FilePreviewImageSkiaSourceTest()
+      : decoder_(base::BindRepeating(&TestFrames), mock_image_callback_.Get()) {
+    invalidation_subscription_ =
+        controller_.AddInvalidationCallback(base::BindLambdaForTesting([&]() {
+          SkBitmap bitmap = GetBitmap();
+          last_pixel_color_ =
+              bitmap.isNull() ? SK_ColorTRANSPARENT : bitmap.getColor(0, 0);
+        }));
+  }
+
+  base::raw_ptr<TestController> controller() { return &controller_; }
+  base::raw_ptr<FilePreviewImageSkiaSource> source() { return source_.get(); }
+  SkColor last_pixel_color() const { return last_pixel_color_; }
+
+  // testing::Test:
+  void SetUp() override {
+    ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
+    // Create a test file with dummy data in it. This data does not actually
+    // need to be valid gif data, because the `TestImageDecoder` will hijack
+    // decoding and return test frames. It must contain some data, though, to
+    // prevent the `image_util::DecodeAnimationData()` from exiting early.
+    ASSERT_TRUE(base::WriteFile(TestFilePath(), "foobar"));
+  }
+
+  base::FilePath TestFilePath() const {
+    return scoped_temp_dir_.GetPath().Append("test_file.gif");
+  }
+
+  void SetUpImageSkiaSource(base::FilePath path) {
+    source_ = std::make_unique<FilePreviewImageSkiaSource>(&controller_, path);
+  }
+
+  SkBitmap GetBitmap() { return source()->GetImageForScale(1.0f).GetBitmap(); }
+
+  void WaitForInvalidation() {
+    base::RunLoop run_loop;
+    auto subscription =
+        controller()->AddInvalidationCallback(run_loop.QuitClosure());
+    run_loop.Run();
+  }
+
+ private:
+  base::test::TaskEnvironment task_environment_;
+  base::ScopedTempDir scoped_temp_dir_;
+  TestController controller_;
+  base::MockRepeatingCallback<SkBitmap()> mock_image_callback_;
+  TestImageDecoder decoder_;
+  SkColor last_pixel_color_ = SK_ColorTRANSPARENT;
+  base::CallbackListSubscription invalidation_subscription_;
+  std::unique_ptr<FilePreviewImageSkiaSource> source_;
+};
+
+TEST_F(FilePreviewImageSkiaSourceTest, IsNullForBadPath) {
+  SetUpImageSkiaSource(base::FilePath("does_not_exist.gif"));
+  auto bitmap = GetBitmap();
+  EXPECT_TRUE(bitmap.isNull());
+
+  // Since this file does not exist, loading it should fail and the image
+  // should continue to be empty.
+  WaitForInvalidation();
+  bitmap = GetBitmap();
+  EXPECT_TRUE(bitmap.isNull());
+}
+
+TEST_F(FilePreviewImageSkiaSourceTest, PlaybackModeChange) {
+  SetUpImageSkiaSource(TestFilePath());
+
+  source()->SetPlaybackMode(FilePreviewImageSkiaSource::PlaybackMode::kLoop);
+
+  // Expect frames to automatically update.
+  for (auto expected_color : kTestColors) {
+    WaitForInvalidation();
+    EXPECT_EQ(last_pixel_color(), expected_color);
+  }
+
+  // Animation should now loop back to the beginning and continue.
+  WaitForInvalidation();
+  EXPECT_EQ(last_pixel_color(), kTestColors[0]);
+  WaitForInvalidation();
+  EXPECT_EQ(last_pixel_color(), kTestColors[1]);
+
+  source()->SetPlaybackMode(
+      FilePreviewImageSkiaSource::PlaybackMode::kFirstFrame);
+
+  EXPECT_EQ(last_pixel_color(), kTestColors[0]);
+
+  // Wait twice the frame delay, and be sure the frame has not changed and no
+  // invalidation events have happened in this time.
+  auto subscription =
+      controller()->AddInvalidationCallback(base::BindLambdaForTesting([&]() {
+        ADD_FAILURE() << "Invalidation event detected when playback mode was "
+                         "set to kFirstFrame";
+      }));
+
+  base::RunLoop run_loop;
+  base::OneShotTimer timer;
+
+  timer.Start(FROM_HERE, kTestFrameDelay * 2, run_loop.QuitClosure());
+  run_loop.Run();
+  auto pixel_color = GetBitmap().getColor(0, 0);
+  EXPECT_EQ(pixel_color, kTestColors[0]);
+}
+
+}  // namespace ash

ash/public/cpp/test/test_image_decoder.cc

diff --git a/ash/public/cpp/test/test_image_decoder.cc b/ash/public/cpp/test/test_image_decoder.cc
new file mode 100644
index 0000000..1d3c06d
--- /dev/null
+++ b/ash/public/cpp/test/test_image_decoder.cc
@@ -0,0 +1,122 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/public/cpp/test/test_image_decoder.h"
+
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
+#include "services/data_decoder/public/mojom/image_decoder.mojom.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace ash {
+
+namespace {
+
+// A test image decoder that allows the caller to pass in arbitrary callbacks
+// that generate images that will be returned in the respective Decode*Callback.
+class ImageDecoderImpl : public data_decoder::mojom::ImageDecoder {
+ public:
+  ImageDecoderImpl(TestImageDecoder::AnimationCallback animation_callback,
+                   TestImageDecoder::ImageCallback image_callback)
+      : animation_callback_(std::move(animation_callback)),
+        image_callback_(std::move(image_callback)) {}
+  ImageDecoderImpl(const ImageDecoderImpl&) = delete;
+  ImageDecoderImpl& operator=(const ImageDecoderImpl&) = delete;
+  ~ImageDecoderImpl() override = default;
+
+  // data_decoder::mojom::ImageDecoder:
+  void DecodeImage(mojo_base::BigBuffer encoded_data,
+                   data_decoder::mojom::ImageCodec codec,
+                   bool shrink_to_fit,
+                   int64_t max_size_in_bytes,
+                   const gfx::Size& desired_image_frame_size,
+                   DecodeImageCallback callback) override {
+    std::move(callback).Run(base::TimeDelta(), image_callback_.Run());
+  }
+
+  void DecodeAnimation(mojo_base::BigBuffer encoded_data,
+                       bool shrink_to_fit,
+                       int64_t max_size_in_bytes,
+                       DecodeAnimationCallback callback) override {
+    std::move(callback).Run(animation_callback_.Run());
+  }
+
+ private:
+  TestImageDecoder::AnimationCallback animation_callback_;
+  TestImageDecoder::ImageCallback image_callback_;
+};
+
+}  // namespace
+
+// Instantiates and binds the above `ImageDecoderImpl` to handle image decoding,
+// passing the given callbacks along to generate test images.
+// Everything not related to image decoding is left unimplemented.
+class TestImageDecoder::DataDecoderServiceImpl
+    : public data_decoder::mojom::DataDecoderService {
+ public:
+  DataDecoderServiceImpl(TestImageDecoder::AnimationCallback animation_callback,
+                         TestImageDecoder::ImageCallback image_callback)
+      : animation_callback_(std::move(animation_callback)),
+        image_callback_(std::move(image_callback)) {}
+  DataDecoderServiceImpl(const DataDecoderServiceImpl&) = delete;
+  DataDecoderServiceImpl& operator=(const DataDecoderServiceImpl&) = delete;
+  ~DataDecoderServiceImpl() override = default;
+
+  // data_decoder::mojom::DataDecoderService:
+  void BindImageDecoder(mojo::PendingReceiver<data_decoder::mojom::ImageDecoder>
+                            receiver) override {
+    mojo::MakeSelfOwnedReceiver(std::make_unique<ImageDecoderImpl>(
+                                    animation_callback_, image_callback_),
+                                std::move(receiver));
+  }
+  void BindJsonParser(mojo::PendingReceiver<data_decoder::mojom::JsonParser>
+                          receiver) override {
+    FAIL();
+  }
+  void BindStructuredHeadersParser(
+      mojo::PendingReceiver<data_decoder::mojom::StructuredHeadersParser>
+          receiver) override {
+    FAIL();
+  }
+  void BindXmlParser(
+      mojo::PendingReceiver<data_decoder::mojom::XmlParser> receiver) override {
+    FAIL();
+  }
+  void BindWebBundleParserFactory(
+      mojo::PendingReceiver<web_package::mojom::WebBundleParserFactory>
+          receiver) override {
+    FAIL();
+  }
+  void BindGzipper(
+      mojo::PendingReceiver<data_decoder::mojom::Gzipper> receiver) override {
+    FAIL();
+  }
+  void BindBleScanParser(
+      mojo::PendingReceiver<data_decoder::mojom::BleScanParser> receiver)
+      override {
+    FAIL();
+  }
+
+ private:
+  const TestImageDecoder::AnimationCallback animation_callback_;
+  const TestImageDecoder::ImageCallback image_callback_;
+};
+
+TestImageDecoder::TestImageDecoder(AnimationCallback animation_callback,
+                                   ImageCallback image_callback)
+    : service_(std::make_unique<DataDecoderServiceImpl>(
+          std::move(animation_callback),
+          std::move(image_callback))) {
+  ServiceProvider::Set(this);
+}
+
+TestImageDecoder::~TestImageDecoder() {
+  ServiceProvider::Set(nullptr);
+}
+
+void TestImageDecoder::BindDataDecoderService(
+    mojo::PendingReceiver<data_decoder::mojom::DataDecoderService> receiver) {
+  receivers_.Add(service_.get(), std::move(receiver));
+}
+
+}  // namespace ash

ash/public/cpp/test/test_image_decoder.h

diff --git a/ash/public/cpp/test/test_image_decoder.h b/ash/public/cpp/test/test_image_decoder.h
new file mode 100644
index 0000000..6d4842f2
--- /dev/null
+++ b/ash/public/cpp/test/test_image_decoder.h
@@ -0,0 +1,57 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_PUBLIC_CPP_TEST_TEST_IMAGE_DECODER_H_
+#define ASH_PUBLIC_CPP_TEST_TEST_IMAGE_DECODER_H_
+
+#include <memory>
+
+#include "mojo/public/cpp/bindings/receiver_set.h"
+#include "services/data_decoder/public/cpp/service_provider.h"
+#include "services/data_decoder/public/mojom/data_decoder_service.mojom.h"
+#include "third_party/skia/include/core/SkColor.h"
+
+class SkBitmap;
+
+namespace ash {
+
+// Instantiating `TestImageDecoder` anywhere in your test will make the
+// decoding functions in image_util.h use a stubbed decoder implementation. All
+// calls to decode images and animations after instantiation (and before
+// destruction) will instead call the given `ImageCallback` or
+// `AnimationCallback`, respectively.
+//
+// It also has the same benefits as
+// `InProcessImageDecoder`: it does not rely on blink or go out of process.
+//
+// Important: If calling `image_util::Decode*File()`, pass in an existing file,
+// or the logic will return early. The contents don't matter, as long as it
+// exists and isn't empty.
+class TestImageDecoder : public data_decoder::ServiceProvider {
+ public:
+  using AnimationCallback = base::RepeatingCallback<
+      std::vector<data_decoder::mojom::AnimationFramePtr>()>;
+  using ImageCallback = base::RepeatingCallback<SkBitmap()>;
+
+  TestImageDecoder(AnimationCallback test_frames_callback,
+                   ImageCallback test_image_callback);
+  TestImageDecoder(const TestImageDecoder&) = delete;
+  TestImageDecoder& operator=(const TestImageDecoder&) = delete;
+  ~TestImageDecoder() override;
+
+  // data_decoder::ServiceProvider:
+  void BindDataDecoderService(
+      mojo::PendingReceiver<data_decoder::mojom::DataDecoderService> receiver)
+      override;
+
+ private:
+  class DataDecoderServiceImpl;
+
+  const std::unique_ptr<DataDecoderServiceImpl> service_;
+  mojo::ReceiverSet<data_decoder::mojom::DataDecoderService> receivers_;
+};
+
+}  // namespace ash
+
+#endif  // ASH_PUBLIC_CPP_TEST_TEST_IMAGE_DECODER_H_

ash/resources/vector_icons/BUILD.gn

diff --git a/ash/resources/vector_icons/BUILD.gn b/ash/resources/vector_icons/BUILD.gn
index b26f069..45bfea05 100644
--- a/ash/resources/vector_icons/BUILD.gn
+++ b/ash/resources/vector_icons/BUILD.gn
@@ -256,6 +256,20 @@
     "privacy_indicators_microphone.icon",
     "privacy_indicators_screen_share.icon",
     "privacy_screen.icon",
+    "quick_settings_a11y_chromevox.icon",
+    "quick_settings_a11y_dictation.icon",
+    "quick_settings_a11y_docked_magnifier.icon",
+    "quick_settings_a11y_fullscreen_magnifier.icon",
+    "quick_settings_a11y_highlight_keyboard_focus.icon",
+    "quick_settings_a11y_highlight_mouse_cursor.icon",
+    "quick_settings_a11y_highlight_text_caret.icon",
+    "quick_settings_a11y_large_mouse_cursor.icon",
+    "quick_settings_a11y_live_caption.icon",
+    "quick_settings_a11y_mono_audio.icon",
+    "quick_settings_a11y_onscreen_keyboard.icon",
+    "quick_settings_a11y_select_to_speak.icon",
+    "quick_settings_a11y_sticky_keys.icon",
+    "quick_settings_a11y_switch_access.icon",
     "quick_settings_left_arrow.icon",
     "quick_settings_managed.icon",
     "quick_settings_nearby_share_off.icon",

ash/resources/vector_icons/quick_settings_a11y_chromevox.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_chromevox.icon b/ash/resources/vector_icons/quick_settings_a11y_chromevox.icon
new file mode 100644
index 0000000..04351f2
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_chromevox.icon
@@ -0,0 +1,46 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 18, 10,
+R_ARC_TO, 8, 8, 0, 1, 1, -16, 0,
+R_ARC_TO, 8, 8, 0, 0, 1, 16, 0,
+CLOSE,
+R_MOVE_TO, -5.33f, -3.55f,
+R_CUBIC_TO, -0.26f, 0.26f, -0.51f, 0.52f, -0.76f, 0.79f,
+R_LINE_TO, 0.04f, 0.04f,
+R_CUBIC_TO, 0.7f, 0.78f, 1.47f, 1.63f, 1.41f, 2.74f,
+R_CUBIC_TO, 0.07f, 1.13f, -0.67f, 2.05f, -1.43f, 2.81f,
+R_CUBIC_TO, 0.22f, 0.29f, 0.43f, 0.57f, 0.65f, 0.86f,
+R_CUBIC_TO, 1.26f, -0.84f, 2.04f, -2.31f, 1.94f, -3.81f,
+R_CUBIC_TO, -0.02f, -1.35f, -0.8f, -2.58f, -1.85f, -3.42f,
+CLOSE,
+R_MOVE_TO, 3.77f, 5.35f,
+R_ARC_TO, 6.56f, 6.56f, 0, 0, 1, -2.56f, 3.57f,
+R_CUBIC_TO, -0.23f, -0.31f, -0.46f, -0.62f, -0.68f, -0.94f,
+R_LINE_TO, 0.21f, -0.2f,
+R_CUBIC_TO, 0.52f, -0.52f, 1.05f, -1.04f, 1.4f, -1.69f,
+R_CUBIC_TO, 0.87f, -1.56f, 0.82f, -3.57f, -0.1f, -5.1f,
+R_CUBIC_TO, -0.31f, -0.51f, -0.73f, -0.94f, -1.16f, -1.37f,
+R_ARC_TO, 31.85f, 31.85f, 0, 0, 1, -0.31f, -0.31f,
+R_CUBIC_TO, 0.23f, -0.31f, 0.47f, -0.61f, 0.7f, -0.91f,
+R_CUBIC_TO, 2.26f, 1.47f, 3.19f, 4.45f, 2.49f, 6.97f,
+CLOSE,
+MOVE_TO, 8.77f, 3.68f,
+R_CUBIC_TO, -0.11f, 0, -0.22f, -0.01f, -0.34f, -0.01f,
+R_CUBIC_TO, -2.92f, 0.7f, -5.09f, 3.28f, -5.09f, 6.36f,
+R_CUBIC_TO, 0, 2.66f, 1.61f, 4.95f, 3.93f, 5.97f,
+R_ARC_TO, 23.23f, 23.23f, 0, 0, 1, 1.48f, -0.39f,
+R_CUBIC_TO, 0.21f, -1.04f, 0.33f, -2.1f, 0.38f, -3.16f,
+R_CUBIC_TO, -0.48f, -0.28f, -0.98f, -0.52f, -1.48f, -0.76f,
+R_CUBIC_TO, -0.23f, -0.11f, -0.46f, -0.22f, -0.68f, -0.33f,
+R_LINE_TO, 0.56f, -0.1f,
+R_CUBIC_TO, 0.65f, -0.12f, 1.31f, -0.24f, 1.95f, -0.42f,
+R_LINE_TO, 0.04f, -0.63f,
+R_CUBIC_TO, 0.02f, -0.29f, 0.04f, -0.59f, 0.06f, -0.89f,
+R_ARC_TO, 61.94f, 61.94f, 0, 0, 1, 1.55f, -0.98f,
+R_ARC_TO, 11.89f, 11.89f, 0, 0, 0, -0.81f, -1.77f,
+R_CUBIC_TO, -0.2f, -0.37f, -0.39f, -0.74f, -0.57f, -1.12f,
+R_CUBIC_TO, -0.3f, -0.6f, -0.6f, -1.2f, -0.96f, -1.77f,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_dictation.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_dictation.icon b/ash/resources/vector_icons/quick_settings_a11y_dictation.icon
new file mode 100644
index 0000000..fcb5c83a
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_dictation.icon
@@ -0,0 +1,44 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 10, 12,
+R_ARC_TO, 2.41f, 2.41f, 0, 0, 1, -1.77f, -0.73f,
+ARC_TO, 2.41f, 2.41f, 0, 0, 1, 7.5f, 9.5f,
+R_V_LINE_TO, -5,
+R_CUBIC_TO, 0, -0.69f, 0.24f, -1.28f, 0.73f, -1.77f,
+ARC_TO, 2.41f, 2.41f, 0, 0, 1, 10, 2,
+R_ARC_TO, 2.41f, 2.41f, 0, 0, 1, 1.77f, 0.73f,
+R_CUBIC_TO, 0.49f, 0.49f, 0.73f, 1.08f, 0.73f, 1.77f,
+R_V_LINE_TO, 5,
+R_CUBIC_TO, 0, 0.69f, -0.24f, 1.29f, -0.73f, 1.77f,
+ARC_TO, 2.41f, 2.41f, 0, 0, 1, 10, 12,
+CLOSE,
+R_MOVE_TO, -0.75f, 5,
+R_V_LINE_TO, -2.06f,
+R_CUBIC_TO, -1.37f, -0.18f, -2.51f, -0.78f, -3.42f, -1.81f,
+CUBIC_TO, 4.94f, 12.1f, 4.5f, 10.89f, 4.5f, 9.5f,
+H_LINE_TO, 6,
+R_CUBIC_TO, 0, 1.11f, 0.39f, 2.06f, 1.17f, 2.83f,
+R_CUBIC_TO, 0.78f, 0.78f, 1.72f, 1.17f, 2.83f, 1.17f,
+R_CUBIC_TO, 1.11f, 0, 2.06f, -0.39f, 2.83f, -1.17f,
+CUBIC_TO, 13.61f, 11.56f, 14, 10.61f, 14, 9.5f,
+R_H_LINE_TO, 1.5f,
+R_CUBIC_TO, 0, 1.39f, -0.45f, 2.6f, -1.35f, 3.63f,
+R_CUBIC_TO, -0.89f, 1.03f, -2.02f, 1.63f, -3.4f, 1.81f,
+V_LINE_TO, 17,
+R_H_LINE_TO, -1.5f,
+CLOSE,
+R_MOVE_TO, 0.75f, -6.5f,
+R_ARC_TO, 0.96f, 0.96f, 0, 0, 0, 0.71f, -0.29f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 11, 9.5f,
+R_V_LINE_TO, -5,
+R_ARC_TO, 0.96f, 0.96f, 0, 0, 0, -0.29f, -0.71f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 10, 3.5f,
+R_ARC_TO, 0.96f, 0.96f, 0, 0, 0, -0.71f, 0.29f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 9, 4.5f,
+R_V_LINE_TO, 5,
+R_CUBIC_TO, 0, 0.28f, 0.1f, 0.51f, 0.29f, 0.71f,
+R_CUBIC_TO, 0.19f, 0.2f, 0.43f, 0.29f, 0.71f, 0.29f,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_docked_magnifier.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_docked_magnifier.icon b/ash/resources/vector_icons/quick_settings_a11y_docked_magnifier.icon
new file mode 100644
index 0000000..8bf0769
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_docked_magnifier.icon
@@ -0,0 +1,36 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 16.5f, 4,
+R_H_LINE_TO, -13,
+CUBIC_TO, 2.67f, 4, 2, 4.67f, 2, 5.5f,
+R_V_LINE_TO, 9,
+R_CUBIC_TO, 0, 0.83f, 0.67f, 1.5f, 1.5f, 1.5f,
+R_H_LINE_TO, 13,
+R_CUBIC_TO, 0.83f, 0, 1.5f, -0.67f, 1.5f, -1.5f,
+R_V_LINE_TO, -9,
+R_CUBIC_TO, 0, -0.83f, -0.67f, -1.5f, -1.5f, -1.5f,
+CLOSE,
+R_MOVE_TO, 0, 1.5f,
+R_V_LINE_TO, 8,
+R_H_LINE_TO, -13,
+R_V_LINE_TO, -8,
+R_H_LINE_TO, 13,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 11.75f, 12,
+R_H_LINE_TO, 1.5f,
+R_V_LINE_TO, -1.75f,
+H_LINE_TO, 15,
+R_V_LINE_TO, -1.5f,
+R_H_LINE_TO, -1.75f,
+V_LINE_TO, 7,
+R_H_LINE_TO, -1.5f,
+R_V_LINE_TO, 1.75f,
+H_LINE_TO, 10,
+R_V_LINE_TO, 1.5f,
+R_H_LINE_TO, 1.75f,
+V_LINE_TO, 12,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_fullscreen_magnifier.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_fullscreen_magnifier.icon b/ash/resources/vector_icons/quick_settings_a11y_fullscreen_magnifier.icon
new file mode 100644
index 0000000..bdba32772
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_fullscreen_magnifier.icon
@@ -0,0 +1,36 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 16.5f, 4,
+R_H_LINE_TO, -13,
+CUBIC_TO, 2.67f, 4, 2, 4.67f, 2, 5.5f,
+R_V_LINE_TO, 9,
+R_CUBIC_TO, 0, 0.83f, 0.67f, 1.5f, 1.5f, 1.5f,
+R_H_LINE_TO, 13,
+R_CUBIC_TO, 0.83f, 0, 1.5f, -0.67f, 1.5f, -1.5f,
+R_V_LINE_TO, -9,
+R_CUBIC_TO, 0, -0.83f, -0.67f, -1.5f, -1.5f, -1.5f,
+CLOSE,
+R_MOVE_TO, 0, 10.5f,
+R_H_LINE_TO, -13,
+R_V_LINE_TO, -9,
+R_H_LINE_TO, 13,
+R_V_LINE_TO, 9,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 11.75f, 12,
+R_H_LINE_TO, 1.5f,
+R_V_LINE_TO, -1.75f,
+H_LINE_TO, 15,
+R_V_LINE_TO, -1.5f,
+R_H_LINE_TO, -1.75f,
+V_LINE_TO, 7,
+R_H_LINE_TO, -1.5f,
+R_V_LINE_TO, 1.75f,
+H_LINE_TO, 10,
+R_V_LINE_TO, 1.5f,
+R_H_LINE_TO, 1.75f,
+V_LINE_TO, 12,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_highlight_keyboard_focus.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_highlight_keyboard_focus.icon b/ash/resources/vector_icons/quick_settings_a11y_highlight_keyboard_focus.icon
new file mode 100644
index 0000000..b8222d6
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_highlight_keyboard_focus.icon
@@ -0,0 +1,20 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 10, 16.5f,
+R_ARC_TO, 6.5f, 6.5f, 0, 1, 0, 0, -13,
+R_ARC_TO, 6.5f, 6.5f, 0, 0, 0, 0, 13,
+CLOSE,
+R_MOVE_TO, 0, 1.5f,
+R_ARC_TO, 8, 8, 0, 1, 0, 0, -16,
+R_ARC_TO, 8, 8, 0, 0, 0, 0, 16,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 9, 6,
+R_H_LINE_TO, 2,
+R_V_LINE_TO, 8,
+H_LINE_TO, 9,
+V_LINE_TO, 6,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_highlight_mouse_cursor.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_highlight_mouse_cursor.icon b/ash/resources/vector_icons/quick_settings_a11y_highlight_mouse_cursor.icon
new file mode 100644
index 0000000..82d62146
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_highlight_mouse_cursor.icon
@@ -0,0 +1,35 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 16, 13.15f,
+LINE_TO, 9, 6.91f,
+R_V_LINE_TO, 9.69f,
+R_LINE_TO, 2.07f, -3.28f,
+R_LINE_TO, 1.59f, 3.78f,
+R_LINE_TO, 1.11f, -0.66f,
+R_LINE_TO, -1.59f, -3.61f,
+LINE_TO, 16, 13.15f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 13.2f, 10.65f,
+ARC_TO, 4.28f, 4.28f, 0, 0, 1, 9, 12.75f,
+R_V_LINE_TO, 1.23f,
+R_ARC_TO, 5.59f, 5.59f, 0, 0, 0, 1.72f, -0.11f,
+R_LINE_TO, 0.35f, -0.55f,
+R_LINE_TO, 0.17f, 0.41f,
+R_CUBIC_TO, 0.39f, -0.13f, 0.76f, -0.3f, 1.11f, -0.51f,
+R_LINE_TO, -0.17f, -0.38f,
+R_LINE_TO, 0.65f, 0.06f,
+R_ARC_TO, 5.53f, 5.53f, 0, 0, 0, 1.29f, -1.4f,
+R_LINE_TO, -0.93f, -0.82f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 8, 12.51f,
+R_ARC_TO, 4.28f, 4.28f, 0, 0, 1, 1.5f, -8.28f,
+R_ARC_TO, 4.28f, 4.28f, 0, 0, 1, 4.11f, 5.46f,
+R_LINE_TO, 0.99f, 0.88f,
+ARC_TO, 5.5f, 5.5f, 0, 1, 0, 8, 13.79f,
+R_V_LINE_TO, -1.29f,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_highlight_text_caret.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_highlight_text_caret.icon b/ash/resources/vector_icons/quick_settings_a11y_highlight_text_caret.icon
new file mode 100644
index 0000000..aff8d492
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_highlight_text_caret.icon
@@ -0,0 +1,28 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 8, 6.5f,
+R_H_LINE_TO, 1.25f,
+R_V_LINE_TO, 7,
+H_LINE_TO, 8,
+V_LINE_TO, 15,
+R_H_LINE_TO, 4,
+R_V_LINE_TO, -1.5f,
+R_H_LINE_TO, -1.25f,
+R_V_LINE_TO, -7,
+H_LINE_TO, 12,
+V_LINE_TO, 5,
+H_LINE_TO, 8,
+R_V_LINE_TO, 1.5f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 10, 16.5f,
+R_ARC_TO, 6.5f, 6.5f, 0, 1, 0, 0, -13,
+R_ARC_TO, 6.5f, 6.5f, 0, 0, 0, 0, 13,
+CLOSE,
+R_MOVE_TO, 0, 1.5f,
+R_ARC_TO, 8, 8, 0, 1, 0, 0, -16,
+R_ARC_TO, 8, 8, 0, 0, 0, 0, 16,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_large_mouse_cursor.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_large_mouse_cursor.icon b/ash/resources/vector_icons/quick_settings_a11y_large_mouse_cursor.icon
new file mode 100644
index 0000000..bb6207d
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_large_mouse_cursor.icon
@@ -0,0 +1,14 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 11.13f, 11,
+H_LINE_TO, 17,
+LINE_TO, 6, 2,
+R_V_LINE_TO, 14,
+R_LINE_TO, 3.32f, -4.15f,
+LINE_TO, 12.19f, 18,
+R_LINE_TO, 1.81f, -0.85f,
+LINE_TO, 11.13f, 11,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_live_caption.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_live_caption.icon b/ash/resources/vector_icons/quick_settings_a11y_live_caption.icon
new file mode 100644
index 0000000..2ec5213
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_live_caption.icon
@@ -0,0 +1,49 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 5, 8.5f,
+V_LINE_TO, 10,
+R_H_LINE_TO, 1.5f,
+V_LINE_TO, 8.5f,
+H_LINE_TO, 5,
+CLOSE,
+R_MOVE_TO, 8.5f, 3,
+V_LINE_TO, 13,
+H_LINE_TO, 15,
+R_V_LINE_TO, -1.5f,
+R_H_LINE_TO, -1.5f,
+CLOSE,
+MOVE_TO, 8, 8.5f,
+V_LINE_TO, 10,
+R_H_LINE_TO, 7,
+V_LINE_TO, 8.5f,
+H_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, -3, 3,
+V_LINE_TO, 13,
+R_H_LINE_TO, 7,
+R_V_LINE_TO, -1.5f,
+H_LINE_TO, 5,
+CLOSE,
+MOVE_TO, 3.5f, 16,
+R_CUBIC_TO, -0.42f, 0, -0.77f, -0.15f, -1.06f, -0.44f,
+ARC_TO, 1.45f, 1.45f, 0, 0, 1, 2, 14.5f,
+R_V_LINE_TO, -9,
+R_CUBIC_TO, 0, -0.42f, 0.15f, -0.77f, 0.44f, -1.06f,
+ARC_TO, 1.45f, 1.45f, 0, 0, 1, 3.5f, 4,
+R_H_LINE_TO, 13,
+R_CUBIC_TO, 0.42f, 0, 0.77f, 0.15f, 1.06f, 0.44f,
+R_CUBIC_TO, 0.29f, 0.29f, 0.44f, 0.65f, 0.44f, 1.06f,
+R_V_LINE_TO, 9,
+R_CUBIC_TO, 0, 0.42f, -0.15f, 0.77f, -0.44f, 1.06f,
+ARC_TO, 1.45f, 1.45f, 0, 0, 1, 16.5f, 16,
+R_H_LINE_TO, -13,
+CLOSE,
+R_MOVE_TO, 0, -1.5f,
+R_H_LINE_TO, 13,
+R_V_LINE_TO, -9,
+R_H_LINE_TO, -13,
+R_V_LINE_TO, 9,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_mono_audio.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_mono_audio.icon b/ash/resources/vector_icons/quick_settings_a11y_mono_audio.icon
new file mode 100644
index 0000000..8d321fc
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_mono_audio.icon
@@ -0,0 +1,55 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 14.04f, 18,
+R_CUBIC_TO, -0.92f, 0, -1.62f, -0.28f, -2.1f, -0.85f,
+R_ARC_TO, 5.76f, 5.76f, 0, 0, 1, -1.06f, -2,
+R_CUBIC_TO, -0.19f, -0.64f, -0.41f, -1.17f, -0.65f, -1.6f,
+R_CUBIC_TO, -0.22f, -0.43f, -0.67f, -0.83f, -1.33f, -1.19f,
+R_ARC_TO, 5.33f, 5.33f, 0, 0, 1, -2.15f, -2.04f,
+CUBIC_TO, 6.25f, 9.44f, 6, 8.49f, 6, 7.48f,
+R_CUBIC_TO, 0, -1.53f, 0.54f, -2.82f, 1.6f, -3.87f,
+CUBIC_TO, 8.67f, 2.53f, 9.97f, 2, 11.5f, 2,
+R_CUBIC_TO, 1.53f, 0, 2.83f, 0.54f, 3.9f, 1.6f,
+CUBIC_TO, 16.47f, 4.67f, 17, 5.97f, 17, 7.5f,
+R_H_LINE_TO, -1.5f,
+R_CUBIC_TO, 0, -1.11f, -0.39f, -2.06f, -1.17f, -2.83f,
+CUBIC_TO, 13.56f, 3.89f, 12.61f, 3.5f, 11.5f, 3.5f,
+R_CUBIC_TO, -1.11f, 0, -2.06f, 0.39f, -2.83f, 1.17f,
+CUBIC_TO, 7.89f, 5.43f, 7.5f, 6.37f, 7.5f, 7.48f,
+R_CUBIC_TO, 0, 0.74f, 0.19f, 1.42f, 0.56f, 2.06f,
+ARC_TO, 3.75f, 3.75f, 0, 0, 0, 9.58f, 11,
+R_CUBIC_TO, 0.86f, 0.44f, 1.45f, 0.93f, 1.75f, 1.46f,
+R_CUBIC_TO, 0.32f, 0.51f, 0.64f, 1.26f, 0.96f, 2.23f,
+R_CUBIC_TO, 0.22f, 0.67f, 0.48f, 1.14f, 0.77f, 1.42f,
+R_CUBIC_TO, 0.29f, 0.26f, 0.62f, 0.4f, 0.98f, 0.4f,
+R_CUBIC_TO, 0.4f, 0, 0.74f, -0.15f, 1.02f, -0.44f,
+R_CUBIC_TO, 0.29f, -0.3f, 0.44f, -0.66f, 0.44f, -1.06f,
+H_LINE_TO, 17,
+R_CUBIC_TO, 0, 0.82f, -0.29f, 1.53f, -0.87f, 2.13f,
+R_ARC_TO, 2.8f, 2.8f, 0, 0, 1, -2.08f, 0.88f,
+CLOSE,
+MOVE_TO, 5.5f, 13.5f,
+R_ARC_TO, 8.98f, 8.98f, 0, 0, 1, -1.85f, -2.75f,
+ARC_TO, 8.43f, 8.43f, 0, 0, 1, 3, 7.5f,
+R_CUBIC_TO, 0, -1.12f, 0.22f, -2.21f, 0.65f, -3.25f,
+ARC_TO, 8.9f, 8.9f, 0, 0, 1, 5.5f, 1.48f,
+R_LINE_TO, 1.04f, 1.06f,
+R_ARC_TO, 7.44f, 7.44f, 0, 0, 0, -1.5f, 2.29f,
+ARC_TO, 6.73f, 6.73f, 0, 0, 0, 4.5f, 7.5f,
+R_CUBIC_TO, 0, 0.93f, 0.18f, 1.83f, 0.54f, 2.69f,
+R_ARC_TO, 7.51f, 7.51f, 0, 0, 0, 1.5f, 2.27f,
+LINE_TO, 5.5f, 13.5f,
+CLOSE,
+R_MOVE_TO, 6, -4,
+R_ARC_TO, 1.93f, 1.93f, 0, 0, 1, -1.42f, -0.58f,
+ARC_TO, 1.93f, 1.93f, 0, 0, 1, 9.5f, 7.5f,
+R_CUBIC_TO, 0, -0.56f, 0.19f, -1.03f, 0.58f, -1.42f,
+ARC_TO, 1.93f, 1.93f, 0, 0, 1, 11.5f, 5.5f,
+R_CUBIC_TO, 0.56f, 0, 1.03f, 0.19f, 1.42f, 0.58f,
+R_CUBIC_TO, 0.39f, 0.39f, 0.58f, 0.86f, 0.58f, 1.42f,
+R_CUBIC_TO, 0, 0.56f, -0.19f, 1.03f, -0.58f, 1.42f,
+ARC_TO, 1.93f, 1.93f, 0, 0, 1, 11.5f, 9.5f,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_onscreen_keyboard.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_onscreen_keyboard.icon b/ash/resources/vector_icons/quick_settings_a11y_onscreen_keyboard.icon
new file mode 100644
index 0000000..9aa72f5
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_onscreen_keyboard.icon
@@ -0,0 +1,64 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 16.5f, 4,
+R_H_LINE_TO, -13,
+CUBIC_TO, 2.67f, 4, 2, 4.67f, 2, 5.5f,
+R_V_LINE_TO, 9,
+R_CUBIC_TO, 0, 0.83f, 0.67f, 1.5f, 1.5f, 1.5f,
+R_H_LINE_TO, 13,
+R_CUBIC_TO, 0.83f, 0, 1.5f, -0.67f, 1.5f, -1.5f,
+R_V_LINE_TO, -9,
+R_CUBIC_TO, 0, -0.83f, -0.67f, -1.5f, -1.5f, -1.5f,
+CLOSE,
+R_MOVE_TO, 0, 1.5f,
+V_LINE_TO, 7,
+R_H_LINE_TO, -13,
+V_LINE_TO, 5.5f,
+R_H_LINE_TO, 13,
+CLOSE,
+R_MOVE_TO, -13, 9,
+R_V_LINE_TO, -6,
+R_H_LINE_TO, 13,
+R_V_LINE_TO, 6,
+R_H_LINE_TO, -13,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 13, 12,
+H_LINE_TO, 7,
+R_V_LINE_TO, 1.5f,
+R_H_LINE_TO, 6,
+V_LINE_TO, 12,
+CLOSE,
+MOVE_TO, 6, 9.5f,
+H_LINE_TO, 4.5f,
+V_LINE_TO, 11,
+H_LINE_TO, 6,
+V_LINE_TO, 9.5f,
+CLOSE,
+MOVE_TO, 8.38f, 9.5f,
+R_H_LINE_TO, -1.5f,
+V_LINE_TO, 11,
+R_H_LINE_TO, 1.5f,
+V_LINE_TO, 9.5f,
+CLOSE,
+MOVE_TO, 10.75f, 9.5f,
+R_H_LINE_TO, -1.5f,
+V_LINE_TO, 11,
+R_H_LINE_TO, 1.5f,
+V_LINE_TO, 9.5f,
+CLOSE,
+MOVE_TO, 13.12f, 9.5f,
+R_H_LINE_TO, -1.5f,
+V_LINE_TO, 11,
+R_H_LINE_TO, 1.5f,
+V_LINE_TO, 9.5f,
+CLOSE,
+MOVE_TO, 15.5f, 9.5f,
+H_LINE_TO, 14,
+V_LINE_TO, 11,
+R_H_LINE_TO, 1.5f,
+V_LINE_TO, 9.5f,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_select_to_speak.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_select_to_speak.icon b/ash/resources/vector_icons/quick_settings_a11y_select_to_speak.icon
new file mode 100644
index 0000000..df39e37c
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_select_to_speak.icon
@@ -0,0 +1,52 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 16.5f, 10,
+R_CUBIC_TO, 0, -2.97f, -2.16f, -5.43f, -5, -5.91f,
+R_V_LINE_TO, 1.53f,
+R_CUBIC_TO, 2, 0.46f, 3.5f, 2.24f, 3.5f, 4.38f,
+R_CUBIC_TO, 0, 2.14f, -1.5f, 3.92f, -3.5f, 4.38f,
+R_V_LINE_TO, 1.53f,
+R_CUBIC_TO, 2.84f, -0.48f, 5, -2.94f, 5, -5.91f,
+CLOSE,
+NEW_PATH,
+MOVE_TO, 13.5f, 10,
+R_CUBIC_TO, 0, -1.3f, -0.84f, -2.4f, -2, -2.82f,
+R_V_LINE_TO, 5.63f,
+R_CUBIC_TO, 1.16f, -0.41f, 2, -1.51f, 2, -2.82f,
+V_LINE_TO, 10,
+CLOSE,
+MOVE_TO, 6.25f, 1.5f,
+R_H_LINE_TO, -5,
+R_V_LINE_TO, 5,
+R_H_LINE_TO, 1.5f,
+V_LINE_TO, 3,
+R_H_LINE_TO, 3.5f,
+V_LINE_TO, 1.5f,
+CLOSE,
+MOVE_TO, 17, 13.5f,
+V_LINE_TO, 17,
+R_H_LINE_TO, -3.5f,
+R_V_LINE_TO, 1.5f,
+R_H_LINE_TO, 5,
+R_V_LINE_TO, -5,
+H_LINE_TO, 17,
+CLOSE,
+MOVE_TO, 3, 8,
+R_V_LINE_TO, 4,
+R_H_LINE_TO, 3,
+R_LINE_TO, 4, 4,
+V_LINE_TO, 4,
+LINE_TO, 6, 8,
+H_LINE_TO, 3,
+CLOSE,
+R_MOVE_TO, 5.5f, -0.38f,
+R_V_LINE_TO, 4.76f,
+LINE_TO, 6.62f, 10.5f,
+H_LINE_TO, 4.5f,
+R_V_LINE_TO, -1,
+R_H_LINE_TO, 2.12f,
+LINE_TO, 8.5f, 7.62f,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_sticky_keys.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_sticky_keys.icon b/ash/resources/vector_icons/quick_settings_a11y_sticky_keys.icon
new file mode 100644
index 0000000..8d6dc12d
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_sticky_keys.icon
@@ -0,0 +1,43 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 6, 7.5f,
+R_H_LINE_TO, 6,
+V_LINE_TO, 6,
+H_LINE_TO, 6,
+R_V_LINE_TO, 1.5f,
+CLOSE,
+MOVE_TO, 6, 14,
+R_H_LINE_TO, 7,
+R_V_LINE_TO, -1.5f,
+H_LINE_TO, 6,
+V_LINE_TO, 14,
+CLOSE,
+R_MOVE_TO, 0, -3.25f,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, -1.5f,
+H_LINE_TO, 6,
+R_V_LINE_TO, 1.5f,
+CLOSE,
+MOVE_TO, 4.5f, 17,
+R_CUBIC_TO, -0.42f, 0, -0.77f, -0.15f, -1.06f, -0.44f,
+ARC_TO, 1.45f, 1.45f, 0, 0, 1, 3, 15.5f,
+R_V_LINE_TO, -11,
+R_CUBIC_TO, 0, -0.42f, 0.15f, -0.77f, 0.44f, -1.06f,
+ARC_TO, 1.45f, 1.45f, 0, 0, 1, 4.5f, 3,
+R_H_LINE_TO, 11,
+R_CUBIC_TO, 0.42f, 0, 0.77f, 0.15f, 1.06f, 0.44f,
+R_CUBIC_TO, 0.29f, 0.29f, 0.44f, 0.65f, 0.44f, 1.06f,
+R_V_LINE_TO, 11,
+R_CUBIC_TO, 0, 0.42f, -0.15f, 0.77f, -0.44f, 1.06f,
+ARC_TO, 1.45f, 1.45f, 0, 0, 1, 15.5f, 17,
+R_H_LINE_TO, -11,
+CLOSE,
+R_MOVE_TO, 0, -1.5f,
+R_H_LINE_TO, 11,
+R_V_LINE_TO, -11,
+R_H_LINE_TO, -11,
+R_V_LINE_TO, 11,
+CLOSE

ash/resources/vector_icons/quick_settings_a11y_switch_access.icon

diff --git a/ash/resources/vector_icons/quick_settings_a11y_switch_access.icon b/ash/resources/vector_icons/quick_settings_a11y_switch_access.icon
new file mode 100644
index 0000000..4f93ed9
--- /dev/null
+++ b/ash/resources/vector_icons/quick_settings_a11y_switch_access.icon
@@ -0,0 +1,30 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 18, 9,
+R_V_LINE_TO, 2,
+R_H_LINE_TO, -1.17f,
+R_ARC_TO, 3, 3, 0, 1, 1, 0, -2,
+H_LINE_TO, 18,
+CLOSE,
+MOVE_TO, 6, 7,
+R_CUBIC_TO, 0.46f, 0, 0.9f, 0.11f, 1.29f, 0.29f,
+LINE_TO, 10, 4.59f,
+LINE_TO, 11.41f, 6,
+LINE_TO, 8.71f, 8.71f,
+ARC_TO, 3, 3, 0, 1, 1, 3.17f, 11,
+H_LINE_TO, 2,
+V_LINE_TO, 9,
+R_H_LINE_TO, 1.17f,
+ARC_TO, 3, 3, 0, 0, 1, 6, 7,
+CLOSE,
+R_MOVE_TO, 0, 4,
+R_ARC_TO, 1, 1, 0, 1, 0, 0, -2,
+R_ARC_TO, 1, 1, 0, 0, 0, 0, 2,
+CLOSE,
+R_MOVE_TO, 8, 0,
+R_ARC_TO, 1, 1, 0, 1, 0, 0, -2,
+R_ARC_TO, 1, 1, 0, 0, 0, 0, 2,
+CLOSE

ash/shelf/hotseat_widget.cc

diff --git a/ash/shelf/hotseat_widget.cc b/ash/shelf/hotseat_widget.cc
index d098f6e..591676f4 100644
--- a/ash/shelf/hotseat_widget.cc
+++ b/ash/shelf/hotseat_widget.cc
@@ -516,12 +516,8 @@
   background_container_view->SetEnabled(false);
   translucent_background_ =
       background_container_view->AddChildView(std::make_unique<views::View>());
-  if (features::IsDarkLightModeEnabled()) {
-    translucent_background_->SetPaintToLayer();
-    translucent_background_->layer()->SetFillsBoundsOpaquely(false);
-  } else {
-    translucent_background_->SetPaintToLayer(ui::LAYER_SOLID_COLOR);
-  }
+  translucent_background_->SetPaintToLayer();
+  translucent_background_->layer()->SetFillsBoundsOpaquely(false);
   translucent_background_->layer()->SetName("hotseat/Background");
 
   // Create a shadow and stack at the bottom.
@@ -606,12 +602,8 @@
     ui::ScopedLayerAnimationSettings color_animation_setter(animator);
     DoScopedAnimationSetting(&color_animation_setter);
     target_color_ = ShelfConfig::Get()->GetDefaultShelfColor(widget);
-    if (features::IsDarkLightModeEnabled()) {
-      translucent_background_->SetBackground(
-          views::CreateSolidBackground(target_color_));
-    } else {
-      translucent_background_->layer()->SetColor(target_color_);
-    }
+    translucent_background_->SetBackground(
+        views::CreateSolidBackground(target_color_));
   }
 
   // Animate the bounds change if there's a change of width (for instance when

ash/shelf/shelf_config.cc

diff --git a/ash/shelf/shelf_config.cc b/ash/shelf/shelf_config.cc
index 25b62ae7d..6239544f 100644
--- a/ash/shelf/shelf_config.cc
+++ b/ash/shelf/shelf_config.cc
@@ -473,10 +473,6 @@
       session_state == session_manager::SessionState::ACTIVE) {
     return is_in_app_ ? SK_ColorTRANSPARENT : GetDefaultShelfColor(widget);
   }
-  if (!features::IsDarkLightModeEnabled() &&
-      session_state == session_manager::SessionState::OOBE) {
-    return SkColorSetA(SK_ColorBLACK, 16);  // 6% opacity
-  }
   return widget->GetColorProvider()->GetColor(
       kColorAshControlBackgroundColorInactive);
 }

ash/shelf/shelf_navigation_widget.cc

diff --git a/ash/shelf/shelf_navigation_widget.cc b/ash/shelf/shelf_navigation_widget.cc
index 12b9dce..6ab0f97 100644
--- a/ash/shelf/shelf_navigation_widget.cc
+++ b/ash/shelf/shelf_navigation_widget.cc
@@ -364,18 +364,13 @@
 };
 
 ShelfNavigationWidget::Delegate::Delegate(Shelf* shelf, ShelfView* shelf_view)
-    : opaque_background_(features::IsDarkLightModeEnabled()
-                             ? ui::LAYER_TEXTURED
-                             : ui::LAYER_SOLID_COLOR),
-      shelf_(shelf) {
+    : opaque_background_(ui::LAYER_TEXTURED), shelf_(shelf) {
   SetOwnedByWidget(true);
 
-  if (features::IsDarkLightModeEnabled()) {
-    background_delegate_ = std::make_unique<BackgroundLayerDelegate>(
-        &opaque_background_, shelf_view);
-    opaque_background_.set_delegate(background_delegate_.get());
-    opaque_background_.SetFillsBoundsOpaquely(false);
-  }
+  background_delegate_ = std::make_unique<BackgroundLayerDelegate>(
+      &opaque_background_, shelf_view);
+  opaque_background_.set_delegate(background_delegate_.get());
+  opaque_background_.SetFillsBoundsOpaquely(false);
 
   set_allow_deactivate_on_esc(true);
 

ash/shelf/shelf_view.cc

diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index d895991..56a2d7e 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -43,6 +43,7 @@
 #include "ash/style/ash_color_provider.h"
 #include "ash/style/rounded_label.h"
 #include "ash/system/status_area_widget.h"
+#include "ash/user_education/user_education_class_properties.h"
 #include "ash/user_education/user_education_constants.h"
 #include "ash/utility/haptics_util.h"
 #include "ash/wm/desks/desks_util.h"
@@ -370,6 +371,9 @@
   set_allow_deactivate_on_esc(true);
 
   if (features::IsUserEducationEnabled()) {
+    // NOTE: Set `kHelpBubbleContextKey` before `views::kElementIdentifierKey`
+    // in case registration causes a help bubble to be created synchronously.
+    SetProperty(kHelpBubbleContextKey, HelpBubbleContext::kAsh);
     SetProperty(views::kElementIdentifierKey, kShelfViewElementId);
   }
 

ash/shelf/shelf_widget.cc

diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 78d76f320..7e04033e 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -102,12 +102,8 @@
 class ShelfBackgroundLayerDelegate : public ui::LayerOwner,
                                      public ui::LayerDelegate {
  public:
-  ShelfBackgroundLayerDelegate(Shelf* shelf,
-                               views::View* owner_view,
-                               bool draw_highlight_border)
-      : shelf_(shelf),
-        owner_view_(owner_view),
-        draw_highlight_border_(draw_highlight_border) {}
+  ShelfBackgroundLayerDelegate(Shelf* shelf, views::View* owner_view)
+      : shelf_(shelf), owner_view_(owner_view) {}
 
   ShelfBackgroundLayerDelegate(const ShelfBackgroundLayerDelegate&) = delete;
   ShelfBackgroundLayerDelegate& operator=(const ShelfBackgroundLayerDelegate&) =
@@ -115,35 +111,20 @@
   ~ShelfBackgroundLayerDelegate() override {}
 
   void Initialize() {
-    // If the shelf does not have highlight border, it will be monochromatic, so
-    // it can use a solid color layer.
-    auto layer = std::make_unique<ui::Layer>(
-        draw_highlight_border_ ? ui::LAYER_TEXTURED : ui::LAYER_SOLID_COLOR);
+    auto layer = std::make_unique<ui::Layer>(ui::LAYER_TEXTURED);
     layer->SetName("shelf/Background");
-    if (draw_highlight_border_) {
-      layer->set_delegate(this);
-      layer->SetFillsBoundsOpaquely(false);
-    }
+    layer->set_delegate(this);
+    layer->SetFillsBoundsOpaquely(false);
     SetLayer(std::move(layer));
   }
 
   // Sets the shelf background color.
   void SetBackgroundColor(SkColor color) {
     background_color_ = color;
-
-    if (draw_highlight_border_) {
-      layer()->SchedulePaint(gfx::Rect(layer()->size()));
-    } else {
-      layer()->SetColor(color);
-    }
+    layer()->SchedulePaint(gfx::Rect(layer()->size()));
   }
 
-  // Sets the highlight border type to use if shelf uses highlight border.
-  // No-op if `draw_highlight_border_` is false.
   void SetBorderType(views::HighlightBorder::Type type) {
-    if (!draw_highlight_border_)
-      return;
-
     highlight_border_type_ = type;
     layer()->SchedulePaint(gfx::Rect(layer()->size()));
   }
@@ -158,9 +139,7 @@
         shelf_->SelectValueForShelfAlignment(0.0f, 0.0f, radius),
     });
 
-    // Schedule paint to repaint the highlight border.
-    if (draw_highlight_border_)
-      layer()->SchedulePaint(gfx::Rect(layer()->size()));
+    layer()->SchedulePaint(gfx::Rect(layer()->size()));
   }
 
   void SetLoginShelfFromShelfWidget(LoginShelfView* view) {
@@ -279,7 +258,6 @@
 
   Shelf* const shelf_;
   views::View* const owner_view_;
-  const bool draw_highlight_border_;
 
   // The pointer to the login shelf view that resides in the shelf widget. Set
   // only when the login shelf widget is not in use.
@@ -425,10 +403,7 @@
 
 ShelfWidget::DelegateView::DelegateView(ShelfWidget* shelf_widget, Shelf* shelf)
     : shelf_widget_(shelf_widget),
-      opaque_background_(
-          shelf,
-          this,
-          /*draw_highlight_border=*/features::IsDarkLightModeEnabled()),
+      opaque_background_(shelf, this),
       animating_background_(ui::LAYER_SOLID_COLOR),
       animating_drag_handle_(ui::LAYER_SOLID_COLOR) {
   animating_background_.SetName("shelf/Animation");

ash/shortcut_viewer/views/bubble_view.cc

diff --git a/ash/shortcut_viewer/views/bubble_view.cc b/ash/shortcut_viewer/views/bubble_view.cc
index ca280f4..511885e2 100644
--- a/ash/shortcut_viewer/views/bubble_view.cc
+++ b/ash/shortcut_viewer/views/bubble_view.cc
@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/style/color_provider.h"
 #include "ash/style/dark_light_mode_controller_impl.h"
 #include "cc/paint/paint_flags.h"
@@ -40,8 +39,7 @@
 constexpr SkColor kBackgroundColorDark = SkColorSetARGB(0xFF, 0x1A, 0x1A, 0x1D);
 
 bool ShouldUseDarkModeColors() {
-  return ash::features::IsDarkLightModeEnabled() &&
-         ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
+  return ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
 }
 
 }  // namespace

ash/shortcut_viewer/views/keyboard_shortcut_item_list_view.cc

diff --git a/ash/shortcut_viewer/views/keyboard_shortcut_item_list_view.cc b/ash/shortcut_viewer/views/keyboard_shortcut_item_list_view.cc
index fae8f3e..c88f309 100644
--- a/ash/shortcut_viewer/views/keyboard_shortcut_item_list_view.cc
+++ b/ash/shortcut_viewer/views/keyboard_shortcut_item_list_view.cc
@@ -4,7 +4,6 @@
 
 #include "ash/shortcut_viewer/views/keyboard_shortcut_item_list_view.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/style/color_provider.h"
 #include "ash/shortcut_viewer/views/keyboard_shortcut_item_view.h"
 #include "ash/style/dark_light_mode_controller_impl.h"
@@ -57,8 +56,7 @@
 
   bool ShouldUseDarkModeColors() {
     DCHECK(color_provider_);
-    return ash::features::IsDarkLightModeEnabled() &&
-           ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
+    return ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
   }
 
  private:

ash/shortcut_viewer/views/keyboard_shortcut_item_view.cc

diff --git a/ash/shortcut_viewer/views/keyboard_shortcut_item_view.cc b/ash/shortcut_viewer/views/keyboard_shortcut_item_view.cc
index d1065ca..797898211 100644
--- a/ash/shortcut_viewer/views/keyboard_shortcut_item_view.cc
+++ b/ash/shortcut_viewer/views/keyboard_shortcut_item_view.cc
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "ash/accelerators/keyboard_code_util.h"
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/keyboard_shortcut_item.h"
 #include "ash/public/cpp/style/color_provider.h"
 #include "ash/resources/vector_icons/vector_icons.h"
@@ -65,8 +64,7 @@
   void ConfigureImage() {
     DCHECK(color_provider_);
     SkColor kShortcutBubbleSeparatorColor = kShortcutBubbleSeparatorColorLight;
-    if (ash::features::IsDarkLightModeEnabled() &&
-        ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()) {
+    if (ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()) {
       kShortcutBubbleSeparatorColor = color_provider_->GetContentLayerColor(
           ash::ColorProvider::ContentLayerType::kTextColorSecondary);
     }

ash/shortcut_viewer/views/keyboard_shortcut_view.cc

diff --git a/ash/shortcut_viewer/views/keyboard_shortcut_view.cc b/ash/shortcut_viewer/views/keyboard_shortcut_view.cc
index d8fb969c..4cf1d373 100644
--- a/ash/shortcut_viewer/views/keyboard_shortcut_view.cc
+++ b/ash/shortcut_viewer/views/keyboard_shortcut_view.cc
@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "ash/constants/app_types.h"
-#include "ash/constants/ash_features.h"
 #include "ash/display/privacy_screen_controller.h"
 #include "ash/public/cpp/app_list/internal_app_id_constants.h"
 #include "ash/public/cpp/ash_typography.h"
@@ -74,8 +73,6 @@
 // Light mode colors:
 constexpr SkColor kSearchIllustrationIconColorLight =
     SkColorSetARGB(0xFF, 0xDA, 0xDC, 0xE0);
-constexpr SkColor kSearchIllustrationTextColorLight =
-    SkColorSetARGB(0xFF, 0x20, 0x21, 0x24);
 
 constexpr SkColor kSearchIllustrationIconColorDark =
     SkColorSetARGB(0xFF, 0x3C, 0x40, 0x43);
@@ -95,8 +92,7 @@
   void OnThemeChanged() override {
     ImageView::OnThemeChanged();
 
-    if (ash::features::IsDarkLightModeEnabled() &&
-        dark_light_mode_controller_->IsDarkModeEnabled()) {
+    if (dark_light_mode_controller_->IsDarkModeEnabled()) {
       SetImage(gfx::CreateVectorIcon(ash::kKsvSearchNoResultDarkIcon,
                                      kSearchIllustrationIconColorDark));
     } else {
@@ -114,13 +110,6 @@
   constexpr int kSearchIllustrationIconSize = 150;
   auto* color_provider = ash::ColorProvider::Get();
 
-  // TODO(ashleydp): Clean up check when flag removed.
-  SkColor kSearchIllustrationIconColor = kSearchIllustrationIconColorLight;
-  if (ash::features::IsDarkLightModeEnabled()) {
-    kSearchIllustrationIconColor = color_provider->GetContentLayerColor(
-        ash::ColorProvider::ContentLayerType::kIconColorPrimary);
-  }
-
   auto illustration_view = std::make_unique<views::View>();
   constexpr int kTopPadding = 98;
   views::BoxLayout* layout =
@@ -129,23 +118,18 @@
           gfx::Insets::TLBR(kTopPadding, 0, 0, 0)));
   layout->set_main_axis_alignment(views::BoxLayout::MainAxisAlignment::kStart);
   auto image_view = std::make_unique<KSVNoResultsImageView>();
-  image_view->SetImage(gfx::CreateVectorIcon(ash::kKsvSearchNoResultLightIcon,
-                                             kSearchIllustrationIconColor));
+  image_view->SetImage(gfx::CreateVectorIcon(
+      ash::kKsvSearchNoResultLightIcon,
+      color_provider->GetContentLayerColor(
+          ash::ColorProvider::ContentLayerType::kIconColorPrimary)));
   image_view->SetImageSize(
       gfx::Size(kSearchIllustrationIconSize, kSearchIllustrationIconSize));
   illustration_view->AddChildView(std::move(image_view));
 
-  SkColor kSearchIllustrationTextColor = kSearchIllustrationTextColorLight;
-
-  // TODO(ashleydp): Clean up check when flag removed.
-  if (ash::features::IsDarkLightModeEnabled()) {
-    kSearchIllustrationTextColor = color_provider->GetContentLayerColor(
-        ash::ColorProvider::ContentLayerType::kTextColorPrimary);
-  }
-
   auto text = std::make_unique<views::Label>(
       l10n_util::GetStringUTF16(IDS_KSV_SEARCH_NO_RESULT));
-  text->SetEnabledColor(kSearchIllustrationTextColor);
+  text->SetEnabledColor(color_provider->GetContentLayerColor(
+      ash::ColorProvider::ContentLayerType::kTextColorPrimary));
   constexpr int kLabelFontSizeDelta = 1;
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   text->SetFontList(rb.GetFontListWithDelta(kLabelFontSizeDelta));
@@ -175,9 +159,7 @@
   void OnThemeChanged() override {
     views::ScrollView::OnThemeChanged();
 
-    SetBackgroundColor(ash::features::IsDarkLightModeEnabled()
-                           ? GetColorProvider()->GetColor(cros_tokens::kBgColor)
-                           : SK_ColorWHITE);
+    SetBackgroundColor(GetColorProvider()->GetColor(cros_tokens::kBgColor));
   }
 
   void OnBlur() override { SetHasFocusIndicator(false); }
@@ -659,11 +641,8 @@
 }
 
 void KeyboardShortcutView::UpdateBackgroundColor() {
-  const SkColor background_color =
-      ash::features::IsDarkLightModeEnabled()
-          ? GetColorProvider()->GetColor(cros_tokens::kBgColor)
-          : SK_ColorWHITE;
-  SetBackground(views::CreateSolidBackground(background_color));
+  SetBackground(views::CreateSolidBackground(
+      GetColorProvider()->GetColor(cros_tokens::kBgColor)));
 }
 
 void KeyboardShortcutView::UpdateActiveAndInactiveFrameColor() {
@@ -671,9 +650,7 @@
   window->SetProperty(chromeos::kTrackDefaultFrameColors,
                       /*value=*/false);
   const SkColor background_color =
-      ash::features::IsDarkLightModeEnabled()
-          ? GetColorProvider()->GetColor(cros_tokens::kBgColor)
-          : SK_ColorWHITE;
+      GetColorProvider()->GetColor(cros_tokens::kBgColor);
   window->SetProperty(chromeos::kFrameActiveColorKey, background_color);
   window->SetProperty(chromeos::kFrameInactiveColorKey, background_color);
 }

ash/shortcut_viewer/views/ksv_search_box_view.cc

diff --git a/ash/shortcut_viewer/views/ksv_search_box_view.cc b/ash/shortcut_viewer/views/ksv_search_box_view.cc
index d683d29..80a51be4 100644
--- a/ash/shortcut_viewer/views/ksv_search_box_view.cc
+++ b/ash/shortcut_viewer/views/ksv_search_box_view.cc
@@ -192,8 +192,7 @@
 }
 
 bool KSVSearchBoxView::ShouldUseDarkThemeColors() {
-  return ash::features::IsDarkLightModeEnabled() &&
-         ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
+  return ash::DarkLightModeControllerImpl::Get()->IsDarkModeEnabled();
 }
 
 }  // namespace keyboard_shortcut_viewer

ash/style/rounded_label.cc

diff --git a/ash/style/rounded_label.cc b/ash/style/rounded_label.cc
index 9223681..b3748e5 100644
--- a/ash/style/rounded_label.cc
+++ b/ash/style/rounded_label.cc
@@ -4,7 +4,6 @@
 
 #include "ash/style/rounded_label.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/style/color_provider.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "ui/compositor/layer.h"
@@ -58,13 +57,11 @@
 }
 
 void RoundedLabel::OnPaintBorder(gfx::Canvas* canvas) {
-  if (features::IsDarkLightModeEnabled()) {
-    views::HighlightBorder::PaintBorderToCanvas(
-        canvas, *this, GetLocalBounds(), gfx::RoundedCornersF(rounding_dp_),
-        chromeos::features::IsJellyrollEnabled()
-            ? views::HighlightBorder::Type::kHighlightBorderNoShadow
-            : views::HighlightBorder::Type::kHighlightBorder2);
-  }
+  views::HighlightBorder::PaintBorderToCanvas(
+      canvas, *this, GetLocalBounds(), gfx::RoundedCornersF(rounding_dp_),
+      chromeos::features::IsJellyrollEnabled()
+          ? views::HighlightBorder::Type::kHighlightBorderNoShadow
+          : views::HighlightBorder::Type::kHighlightBorder2);
 }
 
 }  // namespace ash

ash/system/accessibility/accessibility_detailed_view.cc

diff --git a/ash/system/accessibility/accessibility_detailed_view.cc b/ash/system/accessibility/accessibility_detailed_view.cc
index 164e78c..600f17a 100644
--- a/ash/system/accessibility/accessibility_detailed_view.cc
+++ b/ash/system/accessibility/accessibility_detailed_view.cc
@@ -138,7 +138,8 @@
 
 AccessibilityDetailedView::AccessibilityDetailedView(
     DetailedViewDelegate* delegate)
-    : TrayDetailedView(delegate) {
+    : TrayDetailedView(delegate),
+      is_qs_revamp_enabled_(features::IsQsRevampEnabled()) {
   Reset();
   AppendAccessibilityList();
   CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE);
@@ -269,7 +270,7 @@
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
 
-  if (features::IsQsRevampEnabled()) {
+  if (is_qs_revamp_enabled_) {
     auto top_container = std::make_unique<RoundedContainer>();
     AddEnabledFeatures(top_container.get());
 
@@ -410,7 +411,7 @@
   }
 
   // QsRevamp does not use a separator or sub-header.
-  if (!features::IsQsRevampEnabled()) {
+  if (!is_qs_revamp_enabled_) {
     if (controller->IsAdditionalSettingsSeparatorVisibleInTray()) {
       container->AddChildView(TrayPopupUtils::CreateListSubHeaderSeparator());
     }
@@ -454,7 +455,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->spoken_feedback().enabled();
   return AddScrollListFeatureItem(
-      container, kSystemMenuAccessibilityChromevoxIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yChromevoxIcon
+                            : kSystemMenuAccessibilityChromevoxIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK),
       checked, controller->IsEnterpriseIconVisibleForSpokenFeedback());
@@ -465,7 +468,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->select_to_speak().enabled();
   return AddScrollListFeatureItem(
-      container, kSystemMenuAccessibilitySelectToSpeakIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11ySelectToSpeakIcon
+                            : kSystemMenuAccessibilitySelectToSpeakIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SELECT_TO_SPEAK),
       checked, controller->IsEnterpriseIconVisibleForSelectToSpeak());
@@ -476,7 +481,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->dictation().enabled();
   return AddScrollListFeatureItem(
-      container, kDictationMenuIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yDictationIcon
+                            : kDictationMenuIcon,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_DICTATION),
       checked, controller->IsEnterpriseIconVisibleForDictation());
 }
@@ -497,7 +504,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = Shell::Get()->accessibility_delegate()->IsMagnifierEnabled();
   return AddScrollListFeatureItem(
-      container, kSystemMenuAccessibilityFullscreenMagnifierIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yFullscreenMagnifierIcon
+                            : kSystemMenuAccessibilityFullscreenMagnifierIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SCREEN_MAGNIFIER),
       checked, controller->IsEnterpriseIconVisibleForFullScreenMagnifier());
@@ -508,7 +517,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = Shell::Get()->docked_magnifier_controller()->GetEnabled();
   return AddScrollListFeatureItem(
-      container, kSystemMenuAccessibilityDockedMagnifierIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yDockedMagnifierIcon
+                            : kSystemMenuAccessibilityDockedMagnifierIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_DOCKED_MAGNIFIER),
       checked, controller->IsEnterpriseIconVisibleForDockedMagnifier());
@@ -529,7 +540,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->virtual_keyboard().enabled();
   return AddScrollListFeatureItem(
-      container, kSystemMenuKeyboardLegacyIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yOnscreenKeyboardIcon
+                            : kSystemMenuKeyboardLegacyIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD),
       checked, controller->IsEnterpriseIconVisibleForVirtualKeyboard());
@@ -540,7 +553,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->switch_access().enabled();
   return AddScrollListFeatureItem(
-      container, kSwitchAccessIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11ySwitchAccessIcon
+                            : kSwitchAccessIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SWITCH_ACCESS),
       checked, controller->IsEnterpriseIconVisibleForSwitchAccess());
@@ -551,7 +566,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->live_caption().enabled();
   return AddScrollListFeatureItem(
-      container, vector_icons::kLiveCaptionOnIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yLiveCaptionIcon
+                            : vector_icons::kLiveCaptionOnIcon,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_LIVE_CAPTION), checked,
       controller->IsEnterpriseIconVisibleForLiveCaption());
 }
@@ -561,7 +578,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->large_cursor().enabled();
   return AddScrollListFeatureItem(
-      container, gfx::kNoneIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yLargeMouseCursorIcon
+                            : gfx::kNoneIcon,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_LARGE_CURSOR),
       checked, controller->IsEnterpriseIconVisibleForLargeCursor());
 }
@@ -571,7 +590,8 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->mono_audio().enabled();
   return AddScrollListFeatureItem(
-      container, gfx::kNoneIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yMonoAudioIcon : gfx::kNoneIcon,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_MONO_AUDIO),
       checked, controller->IsEnterpriseIconVisibleForMonoAudio());
 }
@@ -581,7 +601,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->caret_highlight().enabled();
   return AddScrollListFeatureItem(
-      container, gfx::kNoneIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yHighlightTextCaretIcon
+                            : gfx::kNoneIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_CARET_HIGHLIGHT),
       checked, controller->IsEnterpriseIconVisibleForCaretHighlight());
@@ -592,7 +614,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->cursor_highlight().enabled();
   return AddScrollListFeatureItem(
-      container, gfx::kNoneIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yHighlightMouseCursorIcon
+                            : gfx::kNoneIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGHLIGHT_MOUSE_CURSOR),
       checked, controller->IsEnterpriseIconVisibleForCursorHighlight());
@@ -603,7 +627,9 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->focus_highlight().enabled();
   return AddScrollListFeatureItem(
-      container, gfx::kNoneIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yHighlightKeyboardFocusIcon
+                            : gfx::kNoneIcon,
       l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGHLIGHT_KEYBOARD_FOCUS),
       checked, controller->IsEnterpriseIconVisibleForFocusHighlight());
@@ -614,7 +640,8 @@
   auto* controller = Shell::Get()->accessibility_controller();
   bool checked = controller->sticky_keys().enabled();
   return AddScrollListFeatureItem(
-      container, gfx::kNoneIcon,
+      container,
+      is_qs_revamp_enabled_ ? kQuickSettingsA11yStickyKeysIcon : gfx::kNoneIcon,
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_STICKY_KEYS),
       checked, controller->IsEnterpriseIconVisibleForStickyKeys());
 }
@@ -625,7 +652,7 @@
     const std::u16string& text,
     bool checked,
     bool enterprise_managed) {
-  if (features::IsQsRevampEnabled()) {
+  if (is_qs_revamp_enabled_) {
     // QsRevamp uses items with a toggle button on the right.
     return AddScrollListToggleItem(container, icon, text, checked,
                                    enterprise_managed);
@@ -656,11 +683,11 @@
   } else {
     // Create a non-clickable non-focusable toggle button on the right.
     std::unique_ptr<views::ToggleButton> toggle;
-    if (!features::IsQsRevampEnabled()) {
+    if (!is_qs_revamp_enabled_) {
       toggle = std::make_unique<TrayToggleButton>(
           views::Button::PressedCallback(),
           /*accessible_name_id=*/absl::nullopt,
-          /*use_empty_border=*/features::IsQsRevampEnabled());
+          /*use_empty_border=*/false);
     } else {
       toggle = std::make_unique<Switch>();
     }

ash/system/accessibility/accessibility_detailed_view.h

diff --git a/ash/system/accessibility/accessibility_detailed_view.h b/ash/system/accessibility/accessibility_detailed_view.h
index e8e5dbd9..1cdf726 100644
--- a/ash/system/accessibility/accessibility_detailed_view.h
+++ b/ash/system/accessibility/accessibility_detailed_view.h
@@ -168,6 +168,10 @@
   views::Button* settings_view_ = nullptr;
 
   LoginStatus login_;
+
+  // Whether `features::kQsRevamp` is enabled. Used to avoid redundant
+  // base::Feature lookups when building the view.
+  const bool is_qs_revamp_enabled_;
 };
 
 }  // namespace ash

ash/system/accessibility/autoclick_menu_bubble_controller.cc

diff --git a/ash/system/accessibility/autoclick_menu_bubble_controller.cc b/ash/system/accessibility/autoclick_menu_bubble_controller.cc
index 92e99680..f6919a08 100644
--- a/ash/system/accessibility/autoclick_menu_bubble_controller.cc
+++ b/ash/system/accessibility/autoclick_menu_bubble_controller.cc
@@ -167,13 +167,6 @@
       gfx::Insets::TLBR(kUnifiedTopShortcutSpacing, 0, 0, 0)));
   bubble_view_->AddChildView(menu_view_);
 
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    menu_view_->SetPaintToLayer();
-    menu_view_->layer()->SetFillsBoundsOpaquely(false);
-  }
-
   bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
   TrayBackgroundView::InitializeBubbleAnimations(bubble_widget_);
   CollisionDetectionUtils::MarkWindowPriorityForCollisionDetection(

ash/system/accessibility/autoclick_scroll_bubble_controller.cc

diff --git a/ash/system/accessibility/autoclick_scroll_bubble_controller.cc b/ash/system/accessibility/autoclick_scroll_bubble_controller.cc
index 120892d..7700b7c2 100644
--- a/ash/system/accessibility/autoclick_scroll_bubble_controller.cc
+++ b/ash/system/accessibility/autoclick_scroll_bubble_controller.cc
@@ -212,13 +212,6 @@
       gfx::Insets::TLBR(kUnifiedTopShortcutSpacing, 0, 0, 0)));
   bubble_view_->AddChildView(scroll_view_);
 
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    scroll_view_->SetPaintToLayer();
-    scroll_view_->layer()->SetFillsBoundsOpaquely(false);
-  }
-
   bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
   TrayBackgroundView::InitializeBubbleAnimations(bubble_widget_);
   CollisionDetectionUtils::MarkWindowPriorityForCollisionDetection(

ash/system/accessibility/floating_accessibility_controller.cc

diff --git a/ash/system/accessibility/floating_accessibility_controller.cc b/ash/system/accessibility/floating_accessibility_controller.cc
index d349270..135f18c0 100644
--- a/ash/system/accessibility/floating_accessibility_controller.cc
+++ b/ash/system/accessibility/floating_accessibility_controller.cc
@@ -81,13 +81,6 @@
   bubble_view_->SetFocusBehavior(
       ActionableView::FocusBehavior::ACCESSIBLE_ONLY);
 
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    menu_view_->SetPaintToLayer();
-    menu_view_->layer()->SetFillsBoundsOpaquely(false);
-  }
-
   bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
   bubble_view_->SetCanActivate(true);
   TrayBackgroundView::InitializeBubbleAnimations(bubble_widget_);

ash/system/accessibility/floating_accessibility_detailed_controller.cc

diff --git a/ash/system/accessibility/floating_accessibility_detailed_controller.cc b/ash/system/accessibility/floating_accessibility_detailed_controller.cc
index 9f7a572..9ec507b2 100644
--- a/ash/system/accessibility/floating_accessibility_detailed_controller.cc
+++ b/ash/system/accessibility/floating_accessibility_detailed_controller.cc
@@ -89,13 +89,6 @@
       gfx::Size(kTrayMenuWidth, kDetailedViewHeightDip));
   bubble_view_->SetFocusBehavior(ActionableView::FocusBehavior::ALWAYS);
 
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    detailed_view_->SetPaintToLayer();
-    detailed_view_->layer()->SetFillsBoundsOpaquely(false);
-  }
-
   bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
   bubble_view_->SetCanActivate(true);
   TrayBackgroundView::InitializeBubbleAnimations(bubble_widget_);

ash/system/accessibility/select_to_speak/select_to_speak_menu_bubble_controller.cc

diff --git a/ash/system/accessibility/select_to_speak/select_to_speak_menu_bubble_controller.cc b/ash/system/accessibility/select_to_speak/select_to_speak_menu_bubble_controller.cc
index 95cab3b..cc9f793 100644
--- a/ash/system/accessibility/select_to_speak/select_to_speak_menu_bubble_controller.cc
+++ b/ash/system/accessibility/select_to_speak/select_to_speak_menu_bubble_controller.cc
@@ -63,13 +63,6 @@
     bubble_view_->AddChildView(menu_view_);
     menu_view_->SetSpeedButtonToggled(false);
 
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (!features::IsDarkLightModeEnabled()) {
-      menu_view_->SetPaintToLayer();
-      menu_view_->layer()->SetFillsBoundsOpaquely(false);
-    }
-
     bubble_widget_ =
         views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
     TrayBackgroundView::InitializeBubbleAnimations(bubble_widget_);

ash/system/accessibility/select_to_speak/select_to_speak_speed_bubble_controller.cc

diff --git a/ash/system/accessibility/select_to_speak/select_to_speak_speed_bubble_controller.cc b/ash/system/accessibility/select_to_speak/select_to_speak_speed_bubble_controller.cc
index 3d5048d..0e697e3 100644
--- a/ash/system/accessibility/select_to_speak/select_to_speak_speed_bubble_controller.cc
+++ b/ash/system/accessibility/select_to_speak/select_to_speak_speed_bubble_controller.cc
@@ -65,13 +65,6 @@
     speed_view_ = new SelectToSpeakSpeedView(this, speech_rate);
     bubble_view_->AddChildView(speed_view_);
 
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (!features::IsDarkLightModeEnabled()) {
-      speed_view_->SetPaintToLayer();
-      speed_view_->layer()->SetFillsBoundsOpaquely(false);
-    }
-
     bubble_widget_ =
         views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
     bubble_widget_->GetNativeView()->SetName(

ash/system/accessibility/switch_access/switch_access_menu_bubble_controller.cc

diff --git a/ash/system/accessibility/switch_access/switch_access_menu_bubble_controller.cc b/ash/system/accessibility/switch_access/switch_access_menu_bubble_controller.cc
index d64bf6b..9614d46 100644
--- a/ash/system/accessibility/switch_access/switch_access_menu_bubble_controller.cc
+++ b/ash/system/accessibility/switch_access/switch_access_menu_bubble_controller.cc
@@ -56,13 +56,6 @@
     menu_view_->SetBorder(views::CreateEmptyBorder(kBubbleMenuPadding));
     bubble_view_->AddChildView(menu_view_);
 
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (!features::IsDarkLightModeEnabled()) {
-      menu_view_->SetPaintToLayer();
-      menu_view_->layer()->SetFillsBoundsOpaquely(false);
-    }
-
     widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
     TrayBackgroundView::InitializeBubbleAnimations(widget_);
     bubble_view_->InitializeAndShowBubble();

ash/system/eche/eche_tray.cc

diff --git a/ash/system/eche/eche_tray.cc b/ash/system/eche/eche_tray.cc
index 9491452e..763ecb5 100644
--- a/ash/system/eche/eche_tray.cc
+++ b/ash/system/eche/eche_tray.cc
@@ -642,13 +642,6 @@
   static_cast<views::BoxLayout*>(bubble_view->GetLayoutManager())
       ->set_inside_border_insets(kBubblePadding);
 
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    header_view_->SetPaintToLayer();
-    header_view_->layer()->SetFillsBoundsOpaquely(false);
-  }
-
   // Stop any in-progress prewearm channel operation.
   if (initializer_webview_) {
     initializer_webview_.reset();

ash/system/holding_space/holding_space_drag_util.cc

diff --git a/ash/system/holding_space/holding_space_drag_util.cc b/ash/system/holding_space/holding_space_drag_util.cc
index b05fd443..4bae8551 100644
--- a/ash/system/holding_space/holding_space_drag_util.cc
+++ b/ash/system/holding_space/holding_space_drag_util.cc
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "ash/bubble/bubble_utils.h"
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/holding_space/holding_space_image.h"
 #include "ash/public/cpp/holding_space/holding_space_item.h"
 #include "ash/public/cpp/rounded_image_view.h"
@@ -224,8 +223,8 @@
     // disabled. Otherwise, the view's background depends on theming.
     icon->SetImage(item->image().GetImageSkia(
         icon->GetPreferredSize(),
-        /*dark_background=*/features::IsDarkLightModeEnabled() &&
-            DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()));
+        /*dark_background=*/DarkLightModeControllerImpl::Get()
+            ->IsDarkModeEnabled()));
 
     // Label.
     auto* label = AddChildView(bubble_utils::CreateLabel(
@@ -277,8 +276,8 @@
     // disabled. Otherwise, the view's background depends on theming.
     image->SetImage(item->image().GetImageSkia(
         image->GetPreferredSize(),
-        /*dark_background=*/features::IsDarkLightModeEnabled() &&
-            DarkLightModeControllerImpl::Get()->IsDarkModeEnabled()));
+        /*dark_background=*/DarkLightModeControllerImpl::Get()
+            ->IsDarkModeEnabled()));
   }
 };
 

ash/system/holding_space/holding_space_tray_child_bubble.cc

diff --git a/ash/system/holding_space/holding_space_tray_child_bubble.cc b/ash/system/holding_space/holding_space_tray_child_bubble.cc
index 4953229d..c4b5a15 100644
--- a/ash/system/holding_space/holding_space_tray_child_bubble.cc
+++ b/ash/system/holding_space/holding_space_tray_child_bubble.cc
@@ -166,11 +166,7 @@
       kHoldingSpaceChildBubblePadding, kHoldingSpaceChildBubbleChildSpacing));
 
   // Layer.
-  // TODO(crbug/1313073): In dark light mode, since we have changed to use a
-  // textured layer instead of a solid color layer, we need to remove all the
-  // layer set up in the children of this view to remove layer redundancy.
-  SetPaintToLayer(features::IsDarkLightModeEnabled() ? ui::LAYER_TEXTURED
-                                                     : ui::LAYER_SOLID_COLOR);
+  SetPaintToLayer(ui::LAYER_TEXTURED);
   layer()->GetAnimator()->set_preemption_strategy(
       ui::LayerAnimator::PreemptionStrategy::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   layer()->SetFillsBoundsOpaquely(false);

ash/system/ime_menu/ime_menu_tray.cc

diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc
index f3afed0..5c7b938 100644
--- a/ash/system/ime_menu/ime_menu_tray.cc
+++ b/ash/system/ime_menu/ime_menu_tray.cc
@@ -395,35 +395,22 @@
   init_params.corner_radius = kTrayItemCornerRadius;
   init_params.reroute_event_handler = true;
 
-  auto setup_layered_view = [](views::View* view) {
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (features::IsDarkLightModeEnabled())
-      return;
-    view->SetPaintToLayer();
-    view->layer()->SetFillsBoundsOpaquely(false);
-  };
-
   std::unique_ptr<TrayBubbleView> bubble_view =
       std::make_unique<TrayBubbleView>(init_params);
   bubble_view->set_margins(GetSecondaryBubbleInsets());
 
   // Add a title item with a separator on the top of the IME menu.
-  setup_layered_view(
-      bubble_view->AddChildView(std::make_unique<ImeTitleView>()));
+  bubble_view->AddChildView(std::make_unique<ImeTitleView>());
 
   // Adds IME list to the bubble.
   ime_list_view_ =
       bubble_view->AddChildView(std::make_unique<ImeMenuListView>());
   ime_list_view_->Init(ShouldShowKeyboardToggle(),
                        ImeListView::SHOW_SINGLE_IME);
-  setup_layered_view(ime_list_view_);
 
   if (ShouldShowBottomButtons()) {
-    setup_layered_view(
-        bubble_view->AddChildView(std::make_unique<ImeButtonsView>(
-            this, is_emoji_enabled_, is_handwriting_enabled_,
-            is_voice_enabled_)));
+    bubble_view->AddChildView(std::make_unique<ImeButtonsView>(
+        this, is_emoji_enabled_, is_handwriting_enabled_, is_voice_enabled_));
   }
 
   bubble_ = std::make_unique<TrayBubbleWrapper>(this);

ash/system/media/media_color_theme.cc

diff --git a/ash/system/media/media_color_theme.cc b/ash/system/media/media_color_theme.cc
new file mode 100644
index 0000000..24877c9
--- /dev/null
+++ b/ash/system/media/media_color_theme.cc
@@ -0,0 +1,22 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/system/media/media_color_theme.h"
+
+#include "ash/style/ash_color_id.h"
+
+namespace ash {
+
+media_message_center::MediaColorTheme GetCrosMediaColorTheme() {
+  media_message_center::MediaColorTheme theme;
+  theme.primary_foreground_color_id = cros_tokens::kCrosSysOnSurface;
+  theme.secondary_foreground_color_id = cros_tokens::kCrosSysSecondary;
+  theme.primary_container_color_id = cros_tokens::kCrosSysPrimaryLight;
+  theme.secondary_container_color_id =
+      cros_tokens::kCrosSysSystemPrimaryContainer;
+  theme.background_color_id = cros_tokens::kCrosSysSystemOnBase;
+  return theme;
+}
+
+}  // namespace ash

ash/system/media/media_color_theme.h

diff --git a/ash/system/media/media_color_theme.h b/ash/system/media/media_color_theme.h
new file mode 100644
index 0000000..6a6d1d5
--- /dev/null
+++ b/ash/system/media/media_color_theme.h
@@ -0,0 +1,18 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_SYSTEM_MEDIA_MEDIA_COLOR_THEME_H_
+#define ASH_SYSTEM_MEDIA_MEDIA_COLOR_THEME_H_
+
+#include "ash/ash_export.h"
+#include "components/media_message_center/notification_theme.h"
+
+namespace ash {
+
+// Helper function that returns the common media color theme for Chrome OS.
+ASH_EXPORT media_message_center::MediaColorTheme GetCrosMediaColorTheme();
+
+}  // namespace ash
+
+#endif  // ASH_SYSTEM_MEDIA_MEDIA_COLOR_THEME_H_

ash/system/media/quick_settings_media_view_controller.cc

diff --git a/ash/system/media/quick_settings_media_view_controller.cc b/ash/system/media/quick_settings_media_view_controller.cc
index 7326254..5f09c8d 100644
--- a/ash/system/media/quick_settings_media_view_controller.cc
+++ b/ash/system/media/quick_settings_media_view_controller.cc
@@ -6,7 +6,7 @@
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
-#include "ash/style/ash_color_provider.h"
+#include "ash/system/media/media_color_theme.h"
 #include "ash/system/media/quick_settings_media_view.h"
 #include "ash/system/unified/unified_system_tray_controller.h"
 #include "components/global_media_controls/public/media_item_manager.h"
@@ -44,25 +44,6 @@
 
   media_item_manager_->AddObserver(this);
   media_item_manager_->AddItemProducer(media_session_item_producer_.get());
-
-  notification_theme_.primary_text_color =
-      AshColorProvider::Get()->GetContentLayerColor(
-          AshColorProvider::ContentLayerType::kTextColorPrimary);
-  notification_theme_.secondary_text_color =
-      AshColorProvider::Get()->GetContentLayerColor(
-          AshColorProvider::ContentLayerType::kTextColorSecondary);
-  notification_theme_.enabled_icon_color =
-      AshColorProvider::Get()->GetContentLayerColor(
-          AshColorProvider::ContentLayerType::kIconColorPrimary);
-  notification_theme_.disabled_icon_color =
-      AshColorProvider::Get()->GetContentLayerColor(
-          AshColorProvider::ContentLayerType::kIconColorSecondary);
-  notification_theme_.separator_color =
-      AshColorProvider::Get()->GetContentLayerColor(
-          AshColorProvider::ContentLayerType::kSeparatorColor);
-  notification_theme_.background_color =
-      AshColorProvider::Get()->GetControlsLayerColor(
-          AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive);
 }
 
 QuickSettingsMediaViewController::~QuickSettingsMediaViewController() {
@@ -80,7 +61,7 @@
   DCHECK(media_view_);
   auto media_item_ui = std::make_unique<global_media_controls::MediaItemUIView>(
       id, item, /*footer_view=*/nullptr, /*device_selector_view=*/nullptr,
-      notification_theme_,
+      /*notification_theme=*/absl::nullopt, GetCrosMediaColorTheme(),
       media_message_center::MediaDisplayPage::kQuickSettingsMediaView);
   auto* media_item_ui_ptr = media_item_ui.get();
   media_item_ui_observer_set_.Observe(id, media_item_ui_ptr);

ash/system/media/quick_settings_media_view_controller.h

diff --git a/ash/system/media/quick_settings_media_view_controller.h b/ash/system/media/quick_settings_media_view_controller.h
index 7b51831..4f481ff1 100644
--- a/ash/system/media/quick_settings_media_view_controller.h
+++ b/ash/system/media/quick_settings_media_view_controller.h
@@ -9,7 +9,6 @@
 #include "components/global_media_controls/public/media_dialog_delegate.h"
 #include "components/global_media_controls/public/media_item_manager_observer.h"
 #include "components/global_media_controls/public/media_item_ui_observer_set.h"
-#include "components/media_message_center/notification_theme.h"
 
 namespace global_media_controls {
 class MediaItemManager;
@@ -77,8 +76,6 @@
   std::unique_ptr<global_media_controls::MediaSessionItemProducer>
       media_session_item_producer_;
 
-  media_message_center::NotificationTheme notification_theme_;
-
   global_media_controls::MediaItemUIObserverSet media_item_ui_observer_set_{
       this};
 

ash/system/palette/palette_tray.cc

diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
index 6d862cd..43ed4c98 100644
--- a/ash/system/palette/palette_tray.cc
+++ b/ash/system/palette/palette_tray.cc
@@ -635,24 +635,12 @@
   bubble_view->SetBorder(views::CreateEmptyBorder(
       gfx::Insets::TLBR(0, 0, kPaddingBetweenBottomAndLastTrayItem, 0)));
 
-  auto setup_layered_view = [](views::View* view) {
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (features::IsDarkLightModeEnabled())
-      return;
-    view->SetPaintToLayer();
-    view->layer()->SetFillsBoundsOpaquely(false);
-  };
-
   // Add title.
-  auto* title_view =
-      bubble_view->AddChildView(std::make_unique<TitleView>(this));
-  setup_layered_view(title_view);
+  bubble_view->AddChildView(std::make_unique<TitleView>(this));
 
   // Add horizontal separator between the title and tools.
   auto* separator =
       bubble_view->AddChildView(std::make_unique<views::Separator>());
-  setup_layered_view(separator);
   separator->SetColorId(ui::kColorAshSystemUIMenuSeparator);
   separator->SetBorder(views::CreateEmptyBorder(gfx::Insets::TLBR(
       kPaddingBetweenTitleAndSeparator, 0, kMenuSeparatorVerticalPadding, 0)));
@@ -663,7 +651,6 @@
   std::vector<PaletteToolView> views = palette_tool_manager_->CreateViews();
   for (const PaletteToolView& view : views) {
     bubble_view->AddChildView(view.view);
-    setup_layered_view(view.view);
   }
 
   // Show the bubble.

ash/system/phonehub/phone_connected_view.cc

diff --git a/ash/system/phonehub/phone_connected_view.cc b/ash/system/phonehub/phone_connected_view.cc
index 4c598f9..af9adc4 100644
--- a/ash/system/phonehub/phone_connected_view.cc
+++ b/ash/system/phonehub/phone_connected_view.cc
@@ -44,9 +44,6 @@
                       16,
                       kBubbleHorizontalSidePaddingDip);
 
-constexpr auto kDarkLightModeDisabledPadding =
-    gfx::Insets::VH(0, kBubbleHorizontalSidePaddingDip);
-
 }  // namespace
 
 PhoneConnectedView::PhoneConnectedView(
@@ -54,46 +51,34 @@
     : phone_hub_manager_(phone_hub_manager) {
   SetID(PhoneHubViewID::kPhoneConnectedView);
 
-  auto setup_layered_view = [](views::View* view) {
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (features::IsDarkLightModeEnabled())
-      return;
-    view->SetPaintToLayer();
-    view->layer()->SetFillsBoundsOpaquely(false);
-  };
-
   auto* layout = SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical,
-      features::IsDarkLightModeEnabled() ? kDarkLightModeEnabledPadding
-                                         : kDarkLightModeDisabledPadding));
+      views::BoxLayout::Orientation::kVertical, kDarkLightModeEnabledPadding));
 
   layout->SetDefaultFlex(1);
 
   AddChildView(std::make_unique<MultideviceFeatureOptInView>(
       phone_hub_manager->GetMultideviceFeatureAccessManager()));
 
-  setup_layered_view(
-      quick_actions_view_ =
-          AddChildView(std::make_unique<QuickActionsView>(phone_hub_manager)));
+  quick_actions_view_ =
+      AddChildView(std::make_unique<QuickActionsView>(phone_hub_manager));
 
   auto* phone_model = phone_hub_manager->GetPhoneModel();
   if (phone_model) {
-    setup_layered_view(AddChildView(std::make_unique<TaskContinuationView>(
-        phone_model, phone_hub_manager->GetUserActionRecorder())));
+    AddChildView(std::make_unique<TaskContinuationView>(
+        phone_model, phone_hub_manager->GetUserActionRecorder()));
   }
 
   auto* camera_roll_manager = phone_hub_manager->GetCameraRollManager();
   if (features::IsPhoneHubCameraRollEnabled() && camera_roll_manager) {
-    setup_layered_view(AddChildView(std::make_unique<CameraRollView>(
-        camera_roll_manager, phone_hub_manager->GetUserActionRecorder())));
+    AddChildView(std::make_unique<CameraRollView>(
+        camera_roll_manager, phone_hub_manager->GetUserActionRecorder()));
   }
 
   auto* recent_apps_handler =
       phone_hub_manager->GetRecentAppsInteractionHandler();
   if (features::IsEcheSWAEnabled() && recent_apps_handler) {
-    setup_layered_view(AddChildView(std::make_unique<PhoneHubRecentAppsView>(
-        recent_apps_handler, phone_hub_manager, this)));
+    AddChildView(std::make_unique<PhoneHubRecentAppsView>(
+        recent_apps_handler, phone_hub_manager, this));
   }
 
   auto* ping_manager = phone_hub_manager->GetPingManager();

ash/system/phonehub/phone_hub_interstitial_view.cc

diff --git a/ash/system/phonehub/phone_hub_interstitial_view.cc b/ash/system/phonehub/phone_hub_interstitial_view.cc
index 66b6fac..b0319fd85 100644
--- a/ash/system/phonehub/phone_hub_interstitial_view.cc
+++ b/ash/system/phonehub/phone_hub_interstitial_view.cc
@@ -7,7 +7,6 @@
 #include <memory>
 #include <string>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
@@ -41,13 +40,6 @@
 
 PhoneHubInterstitialView::PhoneHubInterstitialView(bool show_progress,
                                                    bool show_image) {
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    SetPaintToLayer();
-    layer()->SetFillsBoundsOpaquely(false);
-  }
-
   auto* layout = SetLayoutManager(std::make_unique<views::BoxLayout>());
   layout->SetOrientation(views::BoxLayout::Orientation::kVertical);
 
@@ -72,8 +64,7 @@
   content_container->SetMainAxisAlignment(views::LayoutAlignment::kCenter);
   content_container->SetInteriorMargin(
       gfx::Insets::VH(0, kBubbleHorizontalSidePaddingDip) +
-      (features::IsDarkLightModeEnabled() ? gfx::Insets::TLBR(0, 0, 16, 0)
-                                          : gfx::Insets()));
+      gfx::Insets::TLBR(0, 0, 16, 0));
 
   // Set up image if any.
   if (show_image) {

ash/system/phonehub/quick_action_item.cc

diff --git a/ash/system/phonehub/quick_action_item.cc b/ash/system/phonehub/quick_action_item.cc
index ffe159cf..de0af50 100644
--- a/ash/system/phonehub/quick_action_item.cc
+++ b/ash/system/phonehub/quick_action_item.cc
@@ -4,7 +4,6 @@
 
 #include "ash/system/phonehub/quick_action_item.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/style/ash_color_provider.h"
@@ -75,13 +74,6 @@
       AshColorProvider::ContentLayerType::kTextColorSecondary);
 
   SetEnabled(true /* enabled */);
-
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    SetPaintToLayer();
-    layer()->SetFillsBoundsOpaquely(false);
-  }
 }
 
 QuickActionItem::~QuickActionItem() = default;

ash/system/phonehub/sub_feature_opt_in_view.cc

diff --git a/ash/system/phonehub/sub_feature_opt_in_view.cc b/ash/system/phonehub/sub_feature_opt_in_view.cc
index 2f13a43e..142271e 100644
--- a/ash/system/phonehub/sub_feature_opt_in_view.cc
+++ b/ash/system/phonehub/sub_feature_opt_in_view.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "ash/constants/ash_features.h"
 #include "ash/style/ash_color_provider.h"
 #include "ash/style/pill_button.h"
 #include "ash/system/phonehub/phone_hub_view_ids.h"
@@ -57,13 +56,6 @@
 }
 
 void SubFeatureOptInView::InitLayout() {
-  // The dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    SetPaintToLayer();
-    layer()->SetFillsBoundsOpaquely(false);
-  }
-
   const SkColor border_color = AshColorProvider::Get()->GetContentLayerColor(
       AshColorProvider::ContentLayerType::kSeparatorColor);
   SetBorder(views::CreateRoundedRectBorder(

ash/system/privacy_screen/privacy_screen_toast_view.cc

diff --git a/ash/system/privacy_screen/privacy_screen_toast_view.cc b/ash/system/privacy_screen/privacy_screen_toast_view.cc
index b19321b..8add8f8 100644
--- a/ash/system/privacy_screen/privacy_screen_toast_view.cc
+++ b/ash/system/privacy_screen/privacy_screen_toast_view.cc
@@ -4,7 +4,6 @@
 
 #include "ash/system/privacy_screen/privacy_screen_toast_view.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/style/ash_color_provider.h"
@@ -131,13 +130,6 @@
 
   label_ = new PrivacyScreenToastLabelView();
   AddChildView(label_);
-
-  // In dark light mode, we switch TrayBubbleView to use a textured layer
-  // instead of solid color layer, so no need to create an extra layer here.
-  if (!features::IsDarkLightModeEnabled()) {
-    SetPaintToLayer();
-    layer()->SetFillsBoundsOpaquely(false);
-  }
 }
 
 PrivacyScreenToastView::~PrivacyScreenToastView() {

ash/system/tray/tray_container.cc

diff --git a/ash/system/tray/tray_container.cc b/ash/system/tray/tray_container.cc
index c20b33a..6d96e53 100644
--- a/ash/system/tray/tray_container.cc
+++ b/ash/system/tray/tray_container.cc
@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "ash/constants/ash_features.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/shelf/shelf.h"
@@ -94,8 +93,7 @@
 
   // We only add highlight border to the system tray when it is in tablet mode
   // and not in app mode.
-  if (!features::IsDarkLightModeEnabled() || !Shell::Get()->IsInTabletMode() ||
-      ShelfConfig::Get()->is_in_app()) {
+  if (!Shell::Get()->IsInTabletMode() || ShelfConfig::Get()->is_in_app()) {
     return;
   }
 

ash/system/unified/date_tray.cc

diff --git a/ash/system/unified/date_tray.cc b/ash/system/unified/date_tray.cc
index 0850ce6..7aeff756 100644
--- a/ash/system/unified/date_tray.cc
+++ b/ash/system/unified/date_tray.cc
@@ -4,8 +4,10 @@
 
 #include "ash/system/unified/date_tray.h"
 
+#include "ash/constants/ash_features.h"
 #include "ash/constants/tray_background_view_catalog.h"
 #include "ash/public/cpp/ash_view_ids.h"
+#include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/model/clock_model.h"
@@ -14,6 +16,7 @@
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
+#include "ash/system/unified/glanceable_tray_bubble.h"
 #include "ash/system/unified/unified_system_tray.h"
 #include "ash/system/unified/unified_system_tray_model.h"
 #include "base/time/time.h"
@@ -72,13 +75,35 @@
   SetVisiblePreferred(true);
 }
 
+void DateTray::ShowBubble() {
+  // Never show System Tray bubble in kiosk app mode.
+  if (Shell::Get()->session_controller()->IsRunningInAppMode()) {
+    return;
+  }
+
+  if (features::AreGlanceablesV2Enabled()) {
+    ShowGlanceableBubble();
+  }
+}
+
 void DateTray::CloseBubble() {
   if (!is_active()) {
     return;
   }
-  // Lets the `unified_system_tray_` close the bubble since it's the owner of
-  // the bubble view.
-  unified_system_tray_->CloseBubble();
+
+  if (features::AreGlanceablesV2Enabled()) {
+    HideGlanceableBubble();
+  } else {
+    // Lets the `unified_system_tray_` close the bubble since it's the owner of
+    // the bubble view.
+    unified_system_tray_->CloseBubble();
+  }
+}
+
+void DateTray::ClickedOutsideBubble() {
+  if (features::AreGlanceablesV2Enabled()) {
+    HideGlanceableBubble();
+  }
 }
 
 void DateTray::OnOpeningCalendarView() {
@@ -93,15 +118,32 @@
   // Lets the `unified_system_tray_` decide whether to show the bubble or not,
   // since it's the owner of the bubble view.
   if (is_active()) {
-    unified_system_tray_->CloseBubble();
+    CloseBubble();
     return;
   }
 
-  // Need to set the date tray as active before notifying the system tray of
-  // an action because we need the system tray to know that the date tray is
-  // already active when it is creating the `UnifiedSystemTrayBubble`.
+  if (features::AreGlanceablesV2Enabled()) {
+    // Hide the unified_system_tray_ bubble.
+    unified_system_tray_->CloseBubble();
+    // Open the glanceables bubble.
+    ShowGlanceableBubble();
+  } else {
+    // Need to set the date tray as active before notifying the system tray of
+    // an action because we need the system tray to know that the date tray is
+    // already active when it is creating the `UnifiedSystemTrayBubble`.
+    SetIsActive(true);
+    unified_system_tray_->OnDateTrayActionPerformed(event);
+  }
+}
+
+void DateTray::ShowGlanceableBubble() {
+  bubble_ = std::make_unique<GlanceableTrayBubble>(this);
   SetIsActive(true);
-  unified_system_tray_->OnDateTrayActionPerformed(event);
+}
+
+void DateTray::HideGlanceableBubble() {
+  bubble_.reset();
+  SetIsActive(false);
 }
 
 BEGIN_METADATA(DateTray, ActionableView)

ash/system/unified/date_tray.h

diff --git a/ash/system/unified/date_tray.h b/ash/system/unified/date_tray.h
index f506d5d9..66f86690 100644
--- a/ash/system/unified/date_tray.h
+++ b/ash/system/unified/date_tray.h
@@ -22,10 +22,13 @@
 class Shelf;
 class TimeTrayItemView;
 class TrayBubbleView;
+class GlanceableTrayBubble;
 
 // This date tray is next to the `UnifiedSystemTray`. Activating this tray
 // results in the `CalendarView` showing in the `UnifiedSystemTray`'s bubble.
-// This tray doesn't have its own bubble.
+// If GlanceablesV2 feature flag is enabled, it will instead show the
+// GlanceableTrayBubble.
+// TODO(b:277268122) update documentation.
 class ASH_EXPORT DateTray : public TrayBackgroundView,
                             public UnifiedSystemTray::Observer {
  public:
@@ -42,10 +45,10 @@
   void HandleLocaleChange() override;
   void UpdateLayout() override;
   void UpdateAfterLoginStatusChange() override;
-  void ShowBubble() override {}
+  void ShowBubble() override;
   void CloseBubble() override;
   void HideBubbleWithView(const TrayBubbleView* bubble_view) override {}
-  void ClickedOutsideBubble() override {}
+  void ClickedOutsideBubble() override;
 
   // UnifiedSystemTray::Observer:
   void OnOpeningCalendarView() override;
@@ -54,6 +57,9 @@
   // Callback called when this tray is pressed.
   void OnButtonPressed(const ui::Event& event);
 
+  void ShowGlanceableBubble();
+  void HideGlanceableBubble();
+
  private:
   friend class DateTrayTest;
 
@@ -63,6 +69,9 @@
   // Owned by `StatusAreaWidget`.
   UnifiedSystemTray* unified_system_tray_ = nullptr;
 
+  // Bubble container for Glanceable UI.
+  std::unique_ptr<GlanceableTrayBubble> bubble_;
+
   base::ScopedObservation<UnifiedSystemTray, UnifiedSystemTray::Observer>
       scoped_unified_system_tray_observer_{this};
 };

ash/system/unified/date_tray_unittest.cc

diff --git a/ash/system/unified/date_tray_unittest.cc b/ash/system/unified/date_tray_unittest.cc
index 4f8bbdc..04570d0 100644
--- a/ash/system/unified/date_tray_unittest.cc
+++ b/ash/system/unified/date_tray_unittest.cc
@@ -10,9 +10,11 @@
 #include "ash/system/status_area_widget_test_helper.h"
 #include "ash/system/time/time_tray_item_view.h"
 #include "ash/system/time/time_view.h"
+#include "ash/system/unified/glanceable_tray_bubble.h"
 #include "ash/system/unified/unified_system_tray_bubble.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/metrics/histogram_tester.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
 #include "base/time/time_override.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
@@ -21,9 +23,16 @@
 
 namespace ash {
 
-class DateTrayTest : public AshTestBase, public wm::ActivationChangeObserver {
+class DateTrayTest
+    : public AshTestBase,
+      public wm::ActivationChangeObserver,
+      public testing::WithParamInterface</*glanceables_v2_enabled=*/bool> {
  public:
-  DateTrayTest() = default;
+  DateTrayTest() {
+    scoped_feature_list_.InitWithFeatureState(features::kGlanceablesV2,
+                                              GetParam());
+  }
+
   DateTrayTest(const DateTrayTest&) = delete;
   DateTrayTest& operator=(const DateTrayTest&) = delete;
   ~DateTrayTest() override = default;
@@ -42,9 +51,13 @@
 
     AshTestBase::SetUp();
     widget_ = CreateFramelessTestWidget();
+    widget_->SetContentsView(std::make_unique<views::View>());
     widget_->SetFullscreen(true);
     date_tray_ = StatusAreaWidgetTestHelper::GetStatusAreaWidget()->date_tray();
-    widget_->SetContentsView(date_tray_);
+    unified_system_tray_ = StatusAreaWidgetTestHelper::GetStatusAreaWidget()
+                               ->unified_system_tray();
+    widget_->GetContentsView()->AddChildView(date_tray_);
+    widget_->GetContentsView()->AddChildView(unified_system_tray_);
     date_tray_->SetVisiblePreferred(true);
     date_tray_->unified_system_tray_->SetVisiblePreferred(true);
   }
@@ -58,12 +71,41 @@
     AshTestBase::TearDown();
   }
 
+  bool AreGlanceablesV2Enabled() { return GetParam(); }
+
   DateTray* GetDateTray() { return date_tray_; }
 
   UnifiedSystemTray* GetUnifiedSystemTray() {
     return date_tray_->unified_system_tray_;
   }
 
+  GlanceableTrayBubble* GetGlanceableTrayBubble() {
+    return date_tray_->bubble_.get();
+  }
+
+  bool IsBubbleShown() {
+    if (AreGlanceablesV2Enabled()) {
+      return !!GetGlanceableTrayBubble();
+    }
+    return GetUnifiedSystemTray()->IsBubbleShown();
+  }
+
+  bool AreContentsViewShown() {
+    if (AreGlanceablesV2Enabled()) {
+      return !!GetGlanceableTrayBubble();
+    }
+    return GetUnifiedSystemTray()->IsShowingCalendarView();
+  }
+
+  void LeftClickOnOpenBubble() {
+    if (AreGlanceablesV2Enabled()) {
+      LeftClickOn(GetGlanceableTrayBubble()->GetBubbleView());
+
+    } else {
+      LeftClickOn(GetUnifiedSystemTray()->bubble()->GetBubbleView());
+    }
+  }
+
   std::u16string GetTimeViewText() {
     return date_tray_->time_view_->time_view()
         ->horizontal_label_date_for_test()
@@ -88,80 +130,88 @@
 
   // Owned by `widget_`.
   DateTray* date_tray_ = nullptr;
+
+  UnifiedSystemTray* unified_system_tray_ = nullptr;
+
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
+INSTANTIATE_TEST_SUITE_P(GlanceablesV2, DateTrayTest, testing::Bool());
+
 // Tests that toggling the `CalendarView` via the date tray accelerator does not
 // result in a crash when the unified system tray bubble is set to immediately
 // close upon activation. See crrev/c/1419499 for details.
-TEST_F(DateTrayTest, AcceleratorOpenAndImmediateCloseDoesNotCrash) {
+TEST_P(DateTrayTest, AcceleratorOpenAndImmediateCloseDoesNotCrash) {
   ImmediatelyCloseBubbleOnActivation();
   ShellTestApi().PressAccelerator(
       ui::Accelerator(ui::VKEY_C, ui::EF_COMMAND_DOWN));
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsBubbleShown());
+  EXPECT_FALSE(IsBubbleShown());
 }
 
 // Test the initial state.
-TEST_F(DateTrayTest, InitialState) {
+TEST_P(DateTrayTest, InitialState) {
   // Show the mock time now Month and day.
   EXPECT_EQ(u"Aug 24", GetTimeViewText());
 
   // Initial state: not showing the calendar bubble.
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsBubbleShown());
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_FALSE(IsBubbleShown());
+  EXPECT_FALSE(AreContentsViewShown());
 }
 
 // Tests clicking/tapping the DateTray shows/closes the calendar bubble.
-TEST_F(DateTrayTest, ShowCalendarBubble) {
+TEST_P(DateTrayTest, ShowCalendarBubble) {
   base::HistogramTester histogram_tester;
   // Clicking on the `DateTray` -> show the calendar bubble.
   LeftClickOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsBubbleShown());
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_TRUE(IsBubbleShown());
+  EXPECT_TRUE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_TRUE(GetDateTray()->is_active());
 
-  histogram_tester.ExpectTotalCount("Ash.Calendar.ShowSource.TimeView", 1);
+  histogram_tester.ExpectTotalCount("Ash.Calendar.ShowSource.TimeView",
+                                    AreGlanceablesV2Enabled() ? 0 : 1);
 
   // Clicking on the `DateTray` again -> close the calendar bubble.
   LeftClickOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_FALSE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_FALSE(GetDateTray()->is_active());
 
   // Tapping on the `DateTray` again -> open the calendar bubble.
   GestureTapOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsBubbleShown());
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_TRUE(IsBubbleShown());
+  EXPECT_TRUE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_TRUE(GetDateTray()->is_active());
 
-  histogram_tester.ExpectTotalCount("Ash.Calendar.ShowSource.TimeView", 2);
+  histogram_tester.ExpectTotalCount("Ash.Calendar.ShowSource.TimeView",
+                                    AreGlanceablesV2Enabled() ? 0 : 2);
 
   // Tapping on the `DateTray` again -> close the calendar bubble.
   GestureTapOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsBubbleShown());
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_FALSE(IsBubbleShown());
+  EXPECT_FALSE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_FALSE(GetDateTray()->is_active());
 }
 
 // Tests the behavior when clicking on different areas.
-TEST_F(DateTrayTest, ClickingArea) {
+TEST_P(DateTrayTest, ClickingArea) {
   // Clicking on the `DateTray` -> show the calendar bubble.
   LeftClickOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_TRUE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_TRUE(GetDateTray()->is_active());
 
   // Clicking on the bubble area -> not close the calendar bubble.
-  LeftClickOn(GetUnifiedSystemTray()->bubble()->GetBubbleView());
+  LeftClickOnOpenBubble();
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_TRUE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_TRUE(GetDateTray()->is_active());
 
@@ -169,74 +219,66 @@
   LeftClickOn(GetUnifiedSystemTray());
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(GetUnifiedSystemTray()->IsBubbleShown());
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsShowingCalendarView());
   EXPECT_TRUE(GetUnifiedSystemTray()->is_active());
   EXPECT_FALSE(GetDateTray()->is_active());
 
   // Clicking on the `DateTray` -> switch to the calendar bubble.
   LeftClickOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_TRUE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_TRUE(GetDateTray()->is_active());
 
-  // Clicking on the gap between `DateTray` and `UnifiedSystemTray`-> close the
-  // bubble.
-  auto* event_generator = GetEventGenerator();
-  int date_tray_right = GetDateTray()->GetBoundsInScreen().right();
-  int unigied_tray_left = GetUnifiedSystemTray()->GetBoundsInScreen().x();
-  event_generator->MoveMouseTo(
-      gfx::Point((date_tray_right + unigied_tray_left) / 2,
-                 GetDateTray()->GetBoundsInScreen().CenterPoint().y()));
-  event_generator->ClickLeftButton();
+  // Clicking on `DateTray` closes the bubble.
   LeftClickOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
+  EXPECT_FALSE(IsBubbleShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->IsBubbleShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_FALSE(GetDateTray()->is_active());
 }
 
-TEST_F(DateTrayTest, EscapeKeyForClose) {
+TEST_P(DateTrayTest, EscapeKeyForClose) {
   base::HistogramTester histogram_tester;
   // Clicking on the `DateTray` -> show the calendar bubble.
   LeftClickOn(GetDateTray());
   base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsBubbleShown());
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_TRUE(IsBubbleShown());
+  EXPECT_TRUE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_TRUE(GetDateTray()->is_active());
 
-  histogram_tester.ExpectTotalCount("Ash.Calendar.ShowSource.TimeView", 1);
+  histogram_tester.ExpectTotalCount("Ash.Calendar.ShowSource.TimeView",
+                                    AreGlanceablesV2Enabled() ? 0 : 1);
 
   // Hitting escape key -> close and deactivate the calendar bubble.
   PressAndReleaseKey(ui::KeyboardCode::VKEY_ESCAPE);
   base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_FALSE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_FALSE(GetDateTray()->is_active());
 }
 
 // Tests that calling `DateTray::CloseBubble()` actually closes the bubble.
-TEST_F(DateTrayTest, CloseBubble) {
-  ASSERT_FALSE(GetUnifiedSystemTray()->IsBubbleShown());
-
+TEST_P(DateTrayTest, CloseBubble) {
+  ASSERT_FALSE(IsBubbleShown());
   // Clicking on the `DateTray` -> show the calendar bubble.
   LeftClickOn(GetDateTray());
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsBubbleShown());
-  EXPECT_TRUE(GetUnifiedSystemTray()->IsShowingCalendarView());
+  EXPECT_TRUE(IsBubbleShown());
+  EXPECT_TRUE(AreContentsViewShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_TRUE(GetDateTray()->is_active());
 
   // Calling `DateTray::CloseBubble()` should close the bubble.
   GetDateTray()->CloseBubble();
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsBubbleShown());
+  EXPECT_FALSE(IsBubbleShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_FALSE(GetDateTray()->is_active());
 
   // Calling `DateTray::CloseBubble()` on an already-closed bubble should do
   // nothing.
   GetDateTray()->CloseBubble();
-  EXPECT_FALSE(GetUnifiedSystemTray()->IsBubbleShown());
+  EXPECT_FALSE(IsBubbleShown());
   EXPECT_FALSE(GetUnifiedSystemTray()->is_active());
   EXPECT_FALSE(GetDateTray()->is_active());
 }

ash/system/unified/glanceable_tray_bubble.cc

diff --git a/ash/system/unified/glanceable_tray_bubble.cc b/ash/system/unified/glanceable_tray_bubble.cc
new file mode 100644
index 0000000..bb0d4cb
--- /dev/null
+++ b/ash/system/unified/glanceable_tray_bubble.cc
@@ -0,0 +1,88 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/system/unified/glanceable_tray_bubble.h"
+
+#include "ash/shelf/shelf.h"
+#include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_event_filter.h"
+#include "ash/system/tray/tray_utils.h"
+
+namespace ash {
+
+GlanceableTrayBubble::GlanceableTrayBubble(DateTray* tray) : tray_(tray) {
+  TrayBubbleView::InitParams init_params;
+  init_params.shelf_alignment = tray_->shelf()->alignment();
+  // TODO(b:277268122): Update with glanceable spec.
+  init_params.preferred_width = kRevampedTrayMenuWidth;
+  init_params.delegate = tray->GetWeakPtr();
+  init_params.parent_window = tray->GetBubbleWindowContainer();
+  init_params.anchor_view = nullptr;
+  init_params.anchor_mode = TrayBubbleView::AnchorMode::kRect;
+  init_params.anchor_rect = tray_->shelf()->GetSystemTrayAnchorRect();
+  // TODO(b:277268122): Update with glanceable spec.
+  init_params.insets = GetTrayBubbleInsets();
+  init_params.close_on_deactivate = false;
+  init_params.reroute_event_handler = true;
+  init_params.translucent = true;
+
+  bubble_view_ = new TrayBubbleView(init_params);
+
+  bubble_widget_ = views::BubbleDialogDelegateView::CreateBubble(bubble_view_);
+  bubble_widget_->AddObserver(this);
+  TrayBackgroundView::InitializeBubbleAnimations(bubble_widget_);
+  bubble_view_->InitializeAndShowBubble();
+
+  tray->tray_event_filter()->AddBubble(this);
+  UpdateBubble();
+}
+
+GlanceableTrayBubble::~GlanceableTrayBubble() {
+  tray_->tray_event_filter()->RemoveBubble(this);
+
+  if (bubble_widget_) {
+    bubble_widget_->RemoveObserver(this);
+    bubble_widget_->Close();
+  }
+}
+
+void GlanceableTrayBubble::OnWidgetDestroying(views::Widget* widget) {
+  CHECK_EQ(bubble_widget_, widget);
+  bubble_widget_->RemoveObserver(this);
+  bubble_widget_ = nullptr;
+
+  // `tray_->CloseBubble()` will delete `this`.
+  tray_->CloseBubble();
+}
+
+TrayBackgroundView* GlanceableTrayBubble::GetTray() const {
+  return tray_;
+}
+
+TrayBubbleView* GlanceableTrayBubble::GetBubbleView() const {
+  return bubble_view_;
+}
+
+views::Widget* GlanceableTrayBubble::GetBubbleWidget() const {
+  return bubble_widget_;
+}
+
+void GlanceableTrayBubble::UpdateBubble() {
+  // TODO(b:277268122): set real contents for glanceables view.
+  if (!title_label_) {
+    title_label_ = bubble_view_->AddChildView(std::make_unique<views::Label>());
+    title_label_->SetText(u"Temp Title Label for Glanceables");
+  }
+
+  int max_height = CalculateMaxTrayBubbleHeight();
+  bubble_view_->SetMaxHeight(max_height);
+  bubble_view_->ChangeAnchorAlignment(tray_->shelf()->alignment());
+  bubble_view_->ChangeAnchorRect(tray_->shelf()->GetSystemTrayAnchorRect());
+}
+
+bool GlanceableTrayBubble::IsBubbleActive() const {
+  return bubble_widget_->IsActive();
+}
+
+}  // namespace ash

ash/system/unified/glanceable_tray_bubble.h

diff --git a/ash/system/unified/glanceable_tray_bubble.h b/ash/system/unified/glanceable_tray_bubble.h
new file mode 100644
index 0000000..c730437b
--- /dev/null
+++ b/ash/system/unified/glanceable_tray_bubble.h
@@ -0,0 +1,56 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_SYSTEM_UNIFIED_GLANCEABLE_TRAY_BUBBLE_H_
+#define ASH_SYSTEM_UNIFIED_GLANCEABLE_TRAY_BUBBLE_H_
+
+#include "ash/system/tray/tray_bubble_base.h"
+#include "ash/system/unified/date_tray.h"
+
+namespace ash {
+
+// Manages the bubble that contains GlanceableTrayView.
+// Shows the bubble on the constructor, and closes the bubble on the destructor.
+class ASH_EXPORT GlanceableTrayBubble : public TrayBubbleBase {
+ public:
+  explicit GlanceableTrayBubble(DateTray* tray);
+
+  GlanceableTrayBubble(const GlanceableTrayBubble&) = delete;
+  GlanceableTrayBubble& operator=(const GlanceableTrayBubble&) = delete;
+
+  ~GlanceableTrayBubble() override;
+
+  // views::WidgetObserver:
+  void OnWidgetDestroying(views::Widget* widget) override;
+
+  // TrayBubbleBase:
+  TrayBackgroundView* GetTray() const override;
+  TrayBubbleView* GetBubbleView() const override;
+  views::Widget* GetBubbleWidget() const override;
+  bool IsBubbleActive() const;
+  TrayBubbleView* GetBubbleView() { return bubble_view_; }
+
+ private:
+  void UpdateBubble();
+
+  // Owner of this class.
+  DateTray* tray_;
+
+  // Widget that contains GlanceableTrayView. Unowned.
+  // When the widget is closed by deactivation, |bubble_widget_| pointer is
+  // invalidated and we have to delete GlanceableTrayBubble by calling
+  // DateTray::CloseBubble().
+  // In order to do this, we observe OnWidgetDestroying().
+  views::Widget* bubble_widget_ = nullptr;
+
+  // Main bubble view anchored to `tray_`.
+  TrayBubbleView* bubble_view_ = nullptr;
+
+  // Stand-in title label for glanceables_view_.
+  // TODO(b:277268122): Remove and replace with actual glanceable content.
+  views::Label* title_label_ = nullptr;
+};
+}  // namespace ash
+
+#endif  // ASH_SYSTEM_UNIFIED_GLANCEABLE_TRAY_BUBBLE_H_

ash/system/unified/unified_system_info_view.cc

diff --git a/ash/system/unified/unified_system_info_view.cc b/ash/system/unified/unified_system_info_view.cc
index 923a2973..e21baba 100644
--- a/ash/system/unified/unified_system_info_view.cc
+++ b/ash/system/unified/unified_system_info_view.cc
@@ -189,12 +189,11 @@
     SetLayoutManager(std::move(layout));
 
     battery_image_ = AddChildView(std::make_unique<views::ImageView>());
-    if (features::IsDarkLightModeEnabled()) {
-      // The battery icon requires its own layer to properly render the masked
-      // outline of the badge within the battery icon.
-      battery_image_->SetPaintToLayer();
-      battery_image_->layer()->SetFillsBoundsOpaquely(false);
-    }
+    // The battery icon requires its own layer to properly render the masked
+    // outline of the badge within the battery icon.
+    battery_image_->SetPaintToLayer();
+    battery_image_->layer()->SetFillsBoundsOpaquely(false);
+
     ConfigureIcon();
 
     percentage_ = AddChildView(std::make_unique<views::Label>());

ash/system/unified/unified_system_tray_controller.cc

diff --git a/ash/system/unified/unified_system_tray_controller.cc b/ash/system/unified/unified_system_tray_controller.cc
index 3d095d46..7098df4e 100644
--- a/ash/system/unified/unified_system_tray_controller.cc
+++ b/ash/system/unified/unified_system_tray_controller.cc
@@ -699,9 +699,7 @@
   AddFeaturePodItem(std::make_unique<VPNFeaturePodController>(this));
   AddFeaturePodItem(std::make_unique<IMEFeaturePodController>(this));
   AddFeaturePodItem(std::make_unique<LocaleFeaturePodController>(this));
-  if (features::IsDarkLightModeEnabled()) {
-    AddFeaturePodItem(std::make_unique<DarkModeFeaturePodController>(this));
-  }
+  AddFeaturePodItem(std::make_unique<DarkModeFeaturePodController>(this));
   if (base::FeatureList::IsEnabled(features::kShelfParty)) {
     AddFeaturePodItem(std::make_unique<ShelfPartyFeaturePodController>());
   }

ash/system/unified/unified_system_tray_view.cc

diff --git a/ash/system/unified/unified_system_tray_view.cc b/ash/system/unified/unified_system_tray_view.cc
index 261d6ff..e4b496d2 100644
--- a/ash/system/unified/unified_system_tray_view.cc
+++ b/ash/system/unified/unified_system_tray_view.cc
@@ -6,7 +6,6 @@
 
 #include <numeric>
 
-#include "ash/constants/ash_features.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
@@ -197,12 +196,6 @@
 
   auto add_layered_child = [](views::View* parent, views::View* child) {
     parent->AddChildView(child);
-    // In dark light mode, we switch TrayBubbleView to use a textured layer
-    // instead of solid color layer, so no need to create an extra layer here.
-    if (!features::IsDarkLightModeEnabled()) {
-      child->SetPaintToLayer();
-      child->layer()->SetFillsBoundsOpaquely(false);
-    }
   };
 
   SessionControllerImpl* session_controller =

ash/test/pixel/ash_pixel_test_helper.cc

diff --git a/ash/test/pixel/ash_pixel_test_helper.cc b/ash/test/pixel/ash_pixel_test_helper.cc
index 11c4e21..9b7cb05 100644
--- a/ash/test/pixel/ash_pixel_test_helper.cc
+++ b/ash/test/pixel/ash_pixel_test_helper.cc
@@ -4,7 +4,6 @@
 
 #include "ash/test/pixel/ash_pixel_test_helper.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/shell.h"
 #include "ash/style/dark_light_mode_controller_impl.h"
 #include "ash/test/ash_test_util.h"
@@ -51,11 +50,6 @@
 }
 
 void AshPixelTestHelper::MaybeSetDarkMode() {
-  // If the dark/light mode feature is not enabled, the dark mode is used as
-  // default so return early.
-  if (!features::IsDarkLightModeEnabled())
-    return;
-
   auto* dark_light_mode_controller = DarkLightModeControllerImpl::Get();
   if (!dark_light_mode_controller->IsDarkModeEnabled())
     dark_light_mode_controller->ToggleColorMode();

ash/user_education/user_education_class_properties.cc

diff --git a/ash/user_education/user_education_class_properties.cc b/ash/user_education/user_education_class_properties.cc
new file mode 100644
index 0000000..dd86a2c
--- /dev/null
+++ b/ash/user_education/user_education_class_properties.cc
@@ -0,0 +1,15 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/user_education/user_education_class_properties.h"
+
+DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::HelpBubbleContext)
+
+namespace ash {
+
+DEFINE_UI_CLASS_PROPERTY_KEY(HelpBubbleContext,
+                             kHelpBubbleContextKey,
+                             HelpBubbleContext::kDefault)
+
+}  // namespace ash

ash/user_education/user_education_class_properties.h

diff --git a/ash/user_education/user_education_class_properties.h b/ash/user_education/user_education_class_properties.h
new file mode 100644
index 0000000..024b386
--- /dev/null
+++ b/ash/user_education/user_education_class_properties.h
@@ -0,0 +1,28 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_USER_EDUCATION_USER_EDUCATION_CLASS_PROPERTIES_H_
+#define ASH_USER_EDUCATION_USER_EDUCATION_CLASS_PROPERTIES_H_
+
+#include "ash/ash_export.h"
+#include "ui/base/class_property.h"
+
+namespace ash {
+
+// TODO(http://b/277994050): Remove after Lacros launch.
+// A property which can be set on a tracked element to indicate its context to
+// help bubble factories. Help bubble factories may use context to determine
+// whether to create a bubble. Currently used to allow Ash-specific help bubbles
+// to take precedence over standard Views-specific help bubbles in System UI.
+// NOTE: Set `kHelpBubbleContextKey` before `views::kElementIdentifierKey` in
+// case registration causes a help bubble to be created synchronously.
+enum class HelpBubbleContext { kDefault, kAsh };
+ASH_EXPORT extern const ui::ClassProperty<HelpBubbleContext>* const
+    kHelpBubbleContextKey;
+
+}  // namespace ash
+
+DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::HelpBubbleContext)
+
+#endif  // ASH_USER_EDUCATION_USER_EDUCATION_CLASS_PROPERTIES_H_

ash/user_education/views/help_bubble_factory_views_ash.cc

diff --git a/ash/user_education/views/help_bubble_factory_views_ash.cc b/ash/user_education/views/help_bubble_factory_views_ash.cc
index ec9fc6e9..4a1619e 100644
--- a/ash/user_education/views/help_bubble_factory_views_ash.cc
+++ b/ash/user_education/views/help_bubble_factory_views_ash.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "ash/user_education/user_education_class_properties.h"
 #include "ash/user_education/views/help_bubble_view_ash.h"
 #include "base/callback_list.h"
 #include "base/functional/bind.h"
@@ -210,7 +211,9 @@
 
 bool HelpBubbleFactoryViewsAsh::CanBuildBubbleForTrackedElement(
     const ui::TrackedElement* element) const {
-  return element->IsA<views::TrackedElementViews>();
+  return element->IsA<views::TrackedElementViews>() &&
+         element->AsA<views::TrackedElementViews>()->view()->GetProperty(
+             kHelpBubbleContextKey) == HelpBubbleContext::kAsh;
 }
 
 std::unique_ptr<user_education::HelpBubble>

ash/webui/personalization_app/search/search_tag_registry.cc

diff --git a/ash/webui/personalization_app/search/search_tag_registry.cc b/ash/webui/personalization_app/search/search_tag_registry.cc
index cef1c7b5..ef7b798 100644
--- a/ash/webui/personalization_app/search/search_tag_registry.cc
+++ b/ash/webui/personalization_app/search/search_tag_registry.cc
@@ -258,7 +258,6 @@
 
 SearchTagRegistry::SearchConceptUpdates GetDarkModePrefChangedUpdates(
     bool dark_mode_on) {
-  DCHECK(ash::features::IsDarkLightModeEnabled());
   return {{&GetDarkModeOnSearchConcept(), dark_mode_on},
           {&GetDarkModeOffSearchConcept(), !dark_mode_on}};
 }
@@ -305,13 +304,11 @@
   updates.merge(GetWallpaperEnterpriseUpdates(
       enterprise_policy_delegate_->IsWallpaperEnterpriseManaged()));
 
-  if (::ash::features::IsDarkLightModeEnabled()) {
-    for (const auto& search_concept : GetDarkModeSearchConcepts()) {
-      updates[&search_concept] = true;
-    }
-    updates.merge(GetDarkModePrefChangedUpdates(
-        pref_service_->GetBoolean(ash::prefs::kDarkModeEnabled)));
+  for (const auto& search_concept : GetDarkModeSearchConcepts()) {
+    updates[&search_concept] = true;
   }
+  updates.merge(GetDarkModePrefChangedUpdates(
+      pref_service_->GetBoolean(ash::prefs::kDarkModeEnabled)));
 
   if (::ash::features::IsRgbKeyboardEnabled() &&
       Shell::Get()->rgb_keyboard_manager()->IsRgbKeyboardSupported()) {
@@ -381,16 +378,12 @@
 }
 
 void SearchTagRegistry::BindObservers() {
-  if (IsAmbientModeAllowed() || ::ash::features::IsDarkLightModeEnabled()) {
-    pref_change_registrar_.Init(pref_service_);
-  }
-  if (::ash::features::IsDarkLightModeEnabled()) {
-    // base::Unretained is safe because |this| owns |pref_change_registrar_|.
-    pref_change_registrar_.Add(
-        ash::prefs::kDarkModeEnabled,
-        base::BindRepeating(&SearchTagRegistry::OnDarkModePrefChanged,
-                            base::Unretained(this)));
-  }
+  pref_change_registrar_.Init(pref_service_);
+  // base::Unretained is safe because |this| owns |pref_change_registrar_|.
+  pref_change_registrar_.Add(
+      ash::prefs::kDarkModeEnabled,
+      base::BindRepeating(&SearchTagRegistry::OnDarkModePrefChanged,
+                          base::Unretained(this)));
   if (IsAmbientModeAllowed()) {
     // base::Unretained is safe because |this| owns |pref_change_registrar_|.
     pref_change_registrar_.Add(

ash/wm/desks/desks_bar_view.cc

diff --git a/ash/wm/desks/desks_bar_view.cc b/ash/wm/desks/desks_bar_view.cc
index bcfbb0d..5514be5 100644
--- a/ash/wm/desks/desks_bar_view.cc
+++ b/ash/wm/desks/desks_bar_view.cc
@@ -7,7 +7,6 @@
 #include <iterator>
 #include <utility>
 
-#include "ash/constants/ash_features.h"
 #include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
@@ -514,13 +513,11 @@
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
 
-  if (features::IsDarkLightModeEnabled()) {
-    SetBorder(std::make_unique<views::HighlightBorder>(
-        /*corner_radius=*/0,
-        chromeos::features::IsJellyrollEnabled()
-            ? views::HighlightBorder::Type::kHighlightBorderNoShadow
-            : views::HighlightBorder::Type::kHighlightBorder2));
-  }
+  SetBorder(std::make_unique<views::HighlightBorder>(
+      /*corner_radius=*/0,
+      chromeos::features::IsJellyrollEnabled()
+          ? views::HighlightBorder::Type::kHighlightBorderNoShadow
+          : views::HighlightBorder::Type::kHighlightBorder2));
 
   SetBackground(views::CreateThemedSolidBackground(kColorAshShieldAndBase80));
   // Use layer scrolling so that the contents will paint on top of the parent,

ash/wm/desks/templates/saved_desk_save_desk_button.cc

diff --git a/ash/wm/desks/templates/saved_desk_save_desk_button.cc b/ash/wm/desks/templates/saved_desk_save_desk_button.cc
index 4bc1ae68..c41a76c8 100644
--- a/ash/wm/desks/templates/saved_desk_save_desk_button.cc
+++ b/ash/wm/desks/templates/saved_desk_save_desk_button.cc
@@ -4,7 +4,6 @@
 
 #include "ash/wm/desks/templates/saved_desk_save_desk_button.h"
 
-#include "ash/constants/ash_features.h"
 #include "ash/style/ash_color_provider.h"
 #include "ash/style/style_util.h"
 #include "ash/wm/desks/templates/saved_desk_constants.h"
@@ -36,13 +35,11 @@
   });
   focus_ring->SetColorId(ui::kColorAshFocusRing);
 
-  if (features::IsDarkLightModeEnabled()) {
-    SetBorder(std::make_unique<views::HighlightBorder>(
-        kSaveDeskCornerRadius,
-        chromeos::features::IsJellyrollEnabled()
-            ? views::HighlightBorder::Type::kHighlightBorderNoShadow
-            : views::HighlightBorder::Type::kHighlightBorder2));
-  }
+  SetBorder(std::make_unique<views::HighlightBorder>(
+      kSaveDeskCornerRadius,
+      chromeos::features::IsJellyrollEnabled()
+          ? views::HighlightBorder::Type::kHighlightBorderNoShadow
+          : views::HighlightBorder::Type::kHighlightBorder2));
 }
 
 SavedDeskSaveDeskButton::~SavedDeskSaveDeskButton() = default;

ash/wm/float/float_controller.cc

diff --git a/ash/wm/float/float_controller.cc b/ash/wm/float/float_controller.cc
index df575001..d640156 100644
--- a/ash/wm/float/float_controller.cc
+++ b/ash/wm/float/float_controller.cc
@@ -822,26 +822,18 @@
     return;
 
   // If a floated window already exists at current desk, unfloat it before
-  // floating `window`, unless it is pinned to all desks.
+  // floating `window`.
   auto* desk_controller = DesksController::Get();
   // Get the desk where the window belongs to before moving it to float
   // container.
   const Desk* desk = desks_util::GetDeskForContext(window);
   DCHECK(desk);
 
+  // TODO(b/267363112): Allow a floated window to be assigned to all desks.
+  // If window is visible to all desks, unset it.
   if (desks_util::IsWindowVisibleOnAllWorkspaces(window)) {
-    // Restore all other floated windows on other desks.
-    // We want to use a `for` loop rather than a range, as we are modifying the
-    // map.
-    for (auto it = floated_window_info_map_.cbegin();
-         it != floated_window_info_map_.cend();
-         /* manual increment */) {
-      if (it->second->desk() != desk) {
-        ResetFloatedWindow(it->first);
-      } else {
-        it++;
-      }
-    }
+    window->SetProperty(aura::client::kWindowWorkspaceKey,
+                        aura::client::kWindowWorkspaceUnassignedWorkspace);
   }
 
   auto* previously_floated_window = FindFloatedWindowOfDesk(desk);
@@ -859,9 +851,9 @@
       window->GetRootWindow()->GetChildById(kShellWindowId_FloatContainer);
   DCHECK_NE(window->parent(), floated_container);
   floated_container->AddChild(window);
-  if (!desk->is_active()) {
+
+  if (!desk->is_active())
     HideFloatedWindow(window);
-  }
 
   // Update floated window counts.
   // Note that if the same window gets floated 2 times in the same session, it's

ash/wm/float/float_controller.h

diff --git a/ash/wm/float/float_controller.h b/ash/wm/float/float_controller.h
index ef841a15..b8f4edd9 100644
--- a/ash/wm/float/float_controller.h
+++ b/ash/wm/float/float_controller.h
@@ -152,9 +152,7 @@
 
   // Floats/Unfloats `window`. Only one floating window is allowed per desk,
   // floating a new window on the same desk or moving a floated window to that
-  // desk will unfloat the other floated window (if any). Floating a window that
-  // is pinned to all desks will unfloat all other floated windows on other
-  // desks.
+  // desk will unfloat the other floated window (if any).
   // Note: currently window can only be floated from an active desk.
   void FloatImpl(aura::Window* window);
   void UnfloatImpl(aura::Window* window);

ash/wm/float/float_controller_unittest.cc

diff --git a/ash/wm/float/float_controller_unittest.cc b/ash/wm/float/float_controller_unittest.cc
index ba71dcfc..a5fe583 100644
--- a/ash/wm/float/float_controller_unittest.cc
+++ b/ash/wm/float/float_controller_unittest.cc
@@ -812,48 +812,6 @@
   EXPECT_TRUE(floated_window->IsVisible());
 }
 
-// Tests that a window pinned to all desks can be floated (does not include the
-// converse).
-TEST_F(WindowFloatTest, FloatAllDesksWindow) {
-  // Create two new desks (three total).
-  NewDesk();
-  NewDesk();
-  auto* desks_controller = DesksController::Get();
-  ASSERT_EQ(3u, desks_controller->desks().size());
-
-  // Create a floated window and a regular window on the first desk.
-  auto first_floated_window = CreateFloatedWindow();
-  auto all_desks_window = CreateAppWindow();
-
-  // Assign the regular window to all desks.
-  views::Widget::GetWidgetForNativeWindow(all_desks_window.get())
-      ->SetVisibleOnAllWorkspaces(true);
-  ASSERT_TRUE(
-      desks_util::IsWindowVisibleOnAllWorkspaces(all_desks_window.get()));
-  ASSERT_EQ(1u, desks_controller->visible_on_all_desks_windows().size());
-
-  // Switch to the second desk and create another floated window.
-  ActivateDesk(desks_controller->desks()[1].get());
-  ASSERT_TRUE(wm::IsActiveWindow(all_desks_window.get()));
-  auto second_floated_window = CreateFloatedWindow();
-
-  // Switch to the third desk and float the `all_desks_window` using the
-  // accelerator.
-  ActivateDesk(desks_controller->desks()[2].get());
-  ASSERT_TRUE(wm::IsActiveWindow(all_desks_window.get()));
-  PressAndReleaseKey(ui::VKEY_F, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN);
-  EXPECT_TRUE(WindowState::Get(all_desks_window.get())->IsFloated());
-
-  // Switch back to the first and second desks. The other floated windows should
-  // no longer be floated, and the `all_desks_window` should still be floated.
-  ActivateDesk(desks_controller->desks()[0].get());
-  EXPECT_FALSE(WindowState::Get(first_floated_window.get())->IsFloated());
-  EXPECT_TRUE(WindowState::Get(all_desks_window.get())->IsFloated());
-  ActivateDesk(desks_controller->desks()[1].get());
-  EXPECT_FALSE(WindowState::Get(second_floated_window.get())->IsFloated());
-  EXPECT_TRUE(WindowState::Get(all_desks_window.get())->IsFloated());
-}
-
 // A test class that uses a mock time test environment.
 class WindowFloatMetricsTest : public WindowFloatTest {
  public:

base/android/java/src/org/chromium/base/ThreadUtils.java

diff --git a/base/android/java/src/org/chromium/base/ThreadUtils.java b/base/android/java/src/org/chromium/base/ThreadUtils.java
index d5b7ee2..ff024c3 100644
--- a/base/android/java/src/org/chromium/base/ThreadUtils.java
+++ b/base/android/java/src/org/chromium/base/ThreadUtils.java
@@ -12,6 +12,7 @@
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.task.PostTask;
+import org.chromium.base.task.TaskTraits;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -127,42 +128,25 @@
      * Run the supplied Runnable on the main thread. The method will block until the Runnable
      * completes.
      *
-     * @deprecated Use {@link
-     *         org.chromium.content_public.browser.test.util.TestThreadUtils#runOnUiThreadBlocking(Runnable)
-     *         TestThreadUtils.runOnUiThreadBlocking(r)} instead. For non-test usage (heavily
-     * discouraged) use {@link org.chromium.base.task.PostTask#runSynchronously(TaskTraits,
-     * Runnable) PostTask.runSynchronously(TaskTraits, Runnable)} with task traits chosen from
-     * {@link org.chromium.base.task.TaskTraits}. If the call site can't import
-     * content, it means it shouldn't be posting to the UI thread at all; all such usages will
-     * gradually get rewritten.
+     * Note that non-test usage of this function is heavily discouraged. For non-tests, use
+     * callbacks rather than blocking threads.
+     *
      * @param r The Runnable to run.
      */
-    @Deprecated
     public static void runOnUiThreadBlocking(final Runnable r) {
-        if (runningOnUiThread()) {
-            r.run();
-        } else {
-            FutureTask<Void> task = new FutureTask<Void>(r, null);
-            postOnUiThread(task);
-            try {
-                task.get();
-            } catch (Exception e) {
-                throw new RuntimeException("Exception occurred while waiting for runnable", e);
-            }
-        }
+        PostTask.runSynchronously(TaskTraits.UI_DEFAULT, r);
     }
 
     /**
      * Run the supplied Callable on the main thread, wrapping any exceptions in a RuntimeException.
      * The method will block until the Callable completes.
      *
-     * @deprecated Use {@link
-     *         org.chromium.content_public.browser.test.util.TestThreadUtils#runOnUiThreadBlockingNoException(Callable)
-     *         TestThreadUtils.runOnUiThreadBlockingNoException(c)} instead.
+     * Note that non-test usage of this function is heavily discouraged. For non-tests, use
+     * callbacks rather than blocking threads.
+     *
      * @param c The Callable to run
      * @return The result of the callable
      */
-    @Deprecated
     public static <T> T runOnUiThreadBlockingNoException(Callable<T> c) {
         try {
             return runOnUiThreadBlocking(c);
@@ -175,43 +159,26 @@
      * Run the supplied Callable on the main thread, The method will block until the Callable
      * completes.
      *
-     * @deprecated Use {@link
-     *         org.chromium.content_public.browser.test.util.TestThreadUtils#runOnUiThreadBlocking(Callable)
-     *         TestThreadUtils.runOnUiThreadBlocking(c)} instead.
+     * Note that non-test usage of this function is heavily discouraged. For non-tests, use
+     * callbacks rather than blocking threads.
+     *
      * @param c The Callable to run
      * @return The result of the callable
      * @throws ExecutionException c's exception
      */
-    @Deprecated
     public static <T> T runOnUiThreadBlocking(Callable<T> c) throws ExecutionException {
-        FutureTask<T> task = new FutureTask<T>(c);
-        runOnUiThread(task);
-        try {
-            return task.get();
-        } catch (InterruptedException e) {
-            throw new RuntimeException("Interrupted waiting for callable", e);
-        }
+        return PostTask.runSynchronously(TaskTraits.UI_DEFAULT, c);
     }
 
     /**
      * Run the supplied FutureTask on the main thread. The method will block only if the current
      * thread is the main thread.
      *
-     * @deprecated Use {@link org.chromium.base.task.PostTask#runOrPostTask(TaskTraits, Runnable)
-     *         PostTask.runOrPostTask(TaskTraits, Runnable)} with task traits chosen from {@link
-     *         org.chromium.base.task.TaskTraits}.
-     *         If the call site can't import content, it means it shouldn't be posting to the UI
-     *         thread at all; all such usages will gradually get rewritten.
      * @param task The FutureTask to run
      * @return The queried task (to aid inline construction)
      */
-    @Deprecated
     public static <T> FutureTask<T> runOnUiThread(FutureTask<T> task) {
-        if (runningOnUiThread()) {
-            task.run();
-        } else {
-            postOnUiThread(task);
-        }
+        PostTask.runOrPostTask(TaskTraits.UI_DEFAULT, task);
         return task;
     }
 
@@ -219,15 +186,9 @@
      * Run the supplied Callable on the main thread. The method will block only if the current
      * thread is the main thread.
      *
-     * @deprecated Use {@link org.chromium.base.task.PostTask#runOrPostTask(TaskTraits, Runnable)
-     *         PostTask.runOrPostTask(TaskTraits, Runnable)} with task traits chosen from {@link
-     *         org.chromium.base.task.TaskTraits}.
-     *         If the call site can't import content, it means it shouldn't be posting to the UI
-     *         thread at all; all such usages will gradually get rewritten.
      * @param c The Callable to run
      * @return A FutureTask wrapping the callable to retrieve results
      */
-    @Deprecated
     public static <T> FutureTask<T> runOnUiThread(Callable<T> c) {
         return runOnUiThread(new FutureTask<T>(c));
     }
@@ -236,37 +197,21 @@
      * Run the supplied Runnable on the main thread. The method will block only if the current
      * thread is the main thread.
      *
-     * @deprecated Use {@link org.chromium.base.task.PostTask#runOrPostTask(TaskTraits, Runnable)
-     *         PostTask.runOrPostTask(TaskTraits, Runnable)} with task traits chosen from {@link
-     *         org.chromium.base.task.TaskTraits}.
-     *         If the call site can't import content, it means it shouldn't be posting to the UI
-     *         thread at all; all such usages will gradually get rewritten.
      * @param r The Runnable to run
      */
-    @Deprecated
     public static void runOnUiThread(Runnable r) {
-        if (runningOnUiThread()) {
-            r.run();
-        } else {
-            getUiThreadHandler().post(r);
-        }
+        PostTask.runOrPostTask(TaskTraits.UI_DEFAULT, r);
     }
 
     /**
      * Post the supplied FutureTask to run on the main thread. The method will not block, even if
      * called on the UI thread.
      *
-     * @deprecated Use {@link org.chromium.base.task.PostTask#postTask(TaskTraits, Runnable)
-     *         PostTask.postTask(TaskTraits, Runnable)} with task traits chosen from {@link
-     *         org.chromium.base.task.TaskTraits}.
-     *         If the call site can't import content, it means it shouldn't be posting to the UI
-     *         thread at all; all such usages will gradually get rewritten.
      * @param task The FutureTask to run
      * @return The queried task (to aid inline construction)
      */
-    @Deprecated
     public static <T> FutureTask<T> postOnUiThread(FutureTask<T> task) {
-        getUiThreadHandler().post(task);
+        PostTask.postTask(TaskTraits.UI_DEFAULT, task);
         return task;
     }
 
@@ -274,33 +219,21 @@
      * Post the supplied Runnable to run on the main thread. The method will not block, even if
      * called on the UI thread.
      *
-     * @deprecated Use {@link org.chromium.base.task.PostTask#postTask(TaskTraits, Runnable)
-     *         PostTask.postTask(TaskTraits, Runnable)} with task traits chosen from {@link
-     *         org.chromium.base.task.TaskTraits}.
-     *         If the call site can't import content, it means it shouldn't be posting to the UI
-     *         thread at all; all such usages will gradually get rewritten.
-     * @param task The Runnable to run
+     * @param r The Runnable to run
      */
-    @Deprecated
-    public static void postOnUiThread(Runnable task) {
-        getUiThreadHandler().post(task);
+    public static void postOnUiThread(Runnable r) {
+        PostTask.postTask(TaskTraits.UI_DEFAULT, r);
     }
 
     /**
      * Post the supplied Runnable to run on the main thread after the given amount of time. The
      * method will not block, even if called on the UI thread.
      *
-     * @deprecated Use {@link org.chromium.base.task.PostTask#postDelayedTask(TaskTraits, Runnable,
-     *         long) PostTask.postDelayedTask(TaskTraits, Runnable, long)} with task traits chosen
-     *         from {@link org.chromium.base.task.TaskTraits}.
-     *         If the call site can't import content, it means it shouldn't be posting to the UI
-     *         thread at all; all such usages will gradually get rewritten.
-     * @param task The Runnable to run
+     * @param r The Runnable to run
      * @param delayMillis The delay in milliseconds until the Runnable will be run
      */
-    @Deprecated
-    public static void postOnUiThreadDelayed(Runnable task, long delayMillis) {
-        getUiThreadHandler().postDelayed(task, delayMillis);
+    public static void postOnUiThreadDelayed(Runnable r, long delayMillis) {
+        PostTask.postDelayedTask(TaskTraits.UI_DEFAULT, r, delayMillis);
     }
 
     /**

base/android/java/src/org/chromium/base/task/PostTask.java

diff --git a/base/android/java/src/org/chromium/base/task/PostTask.java b/base/android/java/src/org/chromium/base/task/PostTask.java
index 7ff7ee64..d2592ea 100644
--- a/base/android/java/src/org/chromium/base/task/PostTask.java
+++ b/base/android/java/src/org/chromium/base/task/PostTask.java
@@ -130,11 +130,9 @@
      *
      * Use this only for trivial tasks as it ignores task priorities.
      *
-     * @deprecated In tests, use {@link
-     *         org.chromium.content_public.browser.test.util.TestThreadUtils#runOnUiThreadBlocking(Runnable)
-     *         TestThreadUtils.runOnUiThreadBlocking(Runnable)} instead. Non-test usage is heavily
-     *         discouraged. For non-tests, use callbacks rather than blocking threads. If you
-     * absolutely must block the thread, use FutureTask.get().
+     * Note that non-test usage of this function is heavily discouraged. For non-tests, use
+     * callbacks rather than blocking threads.
+     *
      * @param taskTraits The TaskTraits that describe the desired TaskRunner.
      * @param task The task to be run with the specified traits.
      * @return The result of the callable
@@ -154,11 +152,9 @@
      *
      * Use this only for trivial tasks as it ignores task priorities.
      *
-     * @deprecated In tests, use {@link
-     *         org.chromium.content_public.browser.test.util.TestThreadUtils#runOnUiThreadBlocking(Runnable)
-     *         TestThreadUtils.runOnUiThreadBlocking(Runnable)} instead. Non-test usage is heavily
-     *         discouraged. For non-tests, use callbacks rather than blocking threads. If you
-     * absolutely must block the thread, use FutureTask.get().
+     * Note that non-test usage of this function is heavily discouraged. For non-tests, use
+     * callbacks rather than blocking threads.
+     *
      * @param taskTraits The TaskTraits that describe the desired TaskRunner.
      * @param task The task to be run with the specified traits.
      */
@@ -279,6 +275,9 @@
     }
 
     public static void resetUiThreadForTesting() {
+        // UI Thread cannot be reset cleanly after native initialization.
+        assert !sNativeInitialized;
+
         sUiThreadTaskExecutor = null;
     }
 }

base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java

diff --git a/base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java b/base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java
index 2f349d85..b024366 100644
--- a/base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java
+++ b/base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java
@@ -49,4 +49,15 @@
             mHandler.post(mRunPreNativeTaskClosure);
         }
     }
+
+    @Override
+    protected boolean schedulePreNativeDelayedTask(Runnable task, long delay) {
+        if (mHandler == null) return false;
+        // In theory it would be fine to delay these tasks until native is initialized and post them
+        // to the native task runner, but in practice some tests don't initialize native and still
+        // expect delayed tasks to eventually run. There's no good reason not to support them here,
+        // there are so few of these tasks that they're very unlikely to cause performance problems.
+        mHandler.postDelayed(task, delay);
+        return true;
+    }
 }

base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java

diff --git a/base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java b/base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java
index 21fd7fe..0ab9c399 100644
--- a/base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java
+++ b/base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java
@@ -161,7 +161,7 @@
             if (delay == 0) {
                 mPreNativeTasks.add(task);
                 schedulePreNativeTask();
-            } else {
+            } else if (!schedulePreNativeDelayedTask(task, delay)) {
                 Pair<Runnable, Long> preNativeDelayedTask = new Pair<>(task, delay);
                 mPreNativeDelayedTasks.add(preNativeDelayedTask);
             }
@@ -201,6 +201,16 @@
     }
 
     /**
+     * Overridden in subclasses that support Delayed tasks pre-native.
+     *
+     * @return true if the task has been scheduled and does not need to be forwarded to the native
+     *         task runner.
+     */
+    protected boolean schedulePreNativeDelayedTask(Runnable task, long delay) {
+        return false;
+    }
+
+    /**
      * Runs a single task and returns when its finished.
      */
     // The trace event name is derived from string literals.

base/memory/madv_free_discardable_memory_posix.cc

diff --git a/base/memory/madv_free_discardable_memory_posix.cc b/base/memory/madv_free_discardable_memory_posix.cc
index a19747e0..a72aee6 100644
--- a/base/memory/madv_free_discardable_memory_posix.cc
+++ b/base/memory/madv_free_discardable_memory_posix.cc
@@ -24,6 +24,10 @@
 #include "base/tracing_buildflags.h"
 #include "build/build_config.h"
 
+#if BUILDFLAG(IS_ANDROID)
+#include <sys/prctl.h>
+#endif
+
 #if BUILDFLAG(ENABLE_BASE_TRACING)
 #include "base/trace_event/memory_allocator_dump.h"  // no-presubmit-check
 #include "base/trace_event/memory_dump_manager.h"    // no-presubmit-check
@@ -38,9 +42,16 @@
 constexpr intptr_t kPageMagicCookie = 1;
 
 void* AllocatePages(size_t size_in_pages) {
-  void* data = mmap(nullptr, size_in_pages * base::GetPageSize(),
-                    PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+  const size_t length = size_in_pages * base::GetPageSize();
+  void* data = mmap(nullptr, length, PROT_READ | PROT_WRITE,
+                    MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
   PCHECK(data != MAP_FAILED);
+
+#if BUILDFLAG(IS_ANDROID)
+  prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, data, length,
+        "madv-free-discardable");
+#endif
+
   return data;
 }
 

base/metrics/histogram_threadsafe_unittest.cc

diff --git a/base/metrics/histogram_threadsafe_unittest.cc b/base/metrics/histogram_threadsafe_unittest.cc
index 753e9c8..1bf313a 100644
--- a/base/metrics/histogram_threadsafe_unittest.cc
+++ b/base/metrics/histogram_threadsafe_unittest.cc
@@ -181,6 +181,8 @@
   }
 
   void TearDown() override {
+    histograms_.clear();
+    allocator_view_.reset();
     GlobalHistogramAllocator::ReleaseForTesting();
     ASSERT_FALSE(GlobalHistogramAllocator::Get());
   }
@@ -332,11 +334,11 @@
     // later on.
     constexpr size_t kNumThreads = 2;
     constexpr size_t kNumEmissions = 2000;
-    std::unique_ptr<SnapshotDeltaThread> threads[kNumThreads];
     subtle::Atomic32 real_total_samples_count = 0;
     std::vector<subtle::Atomic32> real_bucket_counts(kHistogramMax, 0);
     subtle::Atomic32 snapshots_total_samples_count = 0;
     std::vector<subtle::Atomic32> snapshots_bucket_counts(kHistogramMax, 0);
+    std::unique_ptr<SnapshotDeltaThread> threads[kNumThreads];
     for (size_t i = 0; i < kNumThreads; ++i) {
       threads[i] = std::make_unique<SnapshotDeltaThread>(
           StringPrintf("SnapshotDeltaThread.%zu.%zu", iteration, i),

base/nix/xdg_util.cc

diff --git a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc
index fd4076d..06ebf54 100644
--- a/base/nix/xdg_util.cc
+++ b/base/nix/xdg_util.cc
@@ -86,6 +86,9 @@
           if (kde_session == "5") {
             return DESKTOP_ENVIRONMENT_KDE5;
           }
+          if (kde_session == "6") {
+            return DESKTOP_ENVIRONMENT_KDE6;
+          }
         }
         return DESKTOP_ENVIRONMENT_KDE4;
       }
@@ -152,6 +155,8 @@
       return "KDE4";
     case DESKTOP_ENVIRONMENT_KDE5:
       return "KDE5";
+    case DESKTOP_ENVIRONMENT_KDE6:
+      return "KDE6";
     case DESKTOP_ENVIRONMENT_PANTHEON:
       return "PANTHEON";
     case DESKTOP_ENVIRONMENT_UNITY:

base/nix/xdg_util.h

diff --git a/base/nix/xdg_util.h b/base/nix/xdg_util.h
index 4d26721..7085e152 100644
--- a/base/nix/xdg_util.h
+++ b/base/nix/xdg_util.h
@@ -22,11 +22,12 @@
   DESKTOP_ENVIRONMENT_CINNAMON = 1,
   DESKTOP_ENVIRONMENT_DEEPIN = 2,
   DESKTOP_ENVIRONMENT_GNOME = 3,
-  // KDE3, KDE4 and KDE5 are sufficiently different that we count
+  // KDE{3,4,5,6} are sufficiently different that we count
   // them as different desktop environments here.
   DESKTOP_ENVIRONMENT_KDE3 = 4,
   DESKTOP_ENVIRONMENT_KDE4 = 5,
   DESKTOP_ENVIRONMENT_KDE5 = 6,
+  DESKTOP_ENVIRONMENT_KDE6 = 12,
   DESKTOP_ENVIRONMENT_PANTHEON = 7,
   DESKTOP_ENVIRONMENT_UKUI = 8,
   DESKTOP_ENVIRONMENT_UNITY = 9,

base/nix/xdg_util_unittest.cc

diff --git a/base/nix/xdg_util_unittest.cc b/base/nix/xdg_util_unittest.cc
index bd028681..19f8aad 100644
--- a/base/nix/xdg_util_unittest.cc
+++ b/base/nix/xdg_util_unittest.cc
@@ -44,6 +44,7 @@
 const char* const kXdgDesktopUnity7 = "Unity:Unity7";
 const char* const kXdgDesktopUnity8 = "Unity:Unity8";
 const char* const kKDESessionKDE5 = "5";
+const char* const kKDESessionKDE6 = "6";
 
 const char kDesktopSession[] = "DESKTOP_SESSION";
 const char kKDESession[] = "KDE_SESSION_VERSION";
@@ -162,6 +163,17 @@
   EXPECT_EQ(DESKTOP_ENVIRONMENT_KDE5, GetDesktopEnvironment(&getter));
 }
 
+TEST(XDGUtilTest, GetXdgDesktopKDE6) {
+  MockEnvironment getter;
+  EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false));
+  EXPECT_CALL(getter, GetVar(Eq(kXdgCurrentDesktopEnvVar), _))
+      .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopKDE), Return(true)));
+  EXPECT_CALL(getter, GetVar(Eq(kKDESession), _))
+      .WillOnce(DoAll(SetArgPointee<1>(kKDESessionKDE6), Return(true)));
+
+  EXPECT_EQ(DESKTOP_ENVIRONMENT_KDE6, GetDesktopEnvironment(&getter));
+}
+
 TEST(XDGUtilTest, GetXdgDesktopKDE4) {
   MockEnvironment getter;
   EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false));

base/test/android/javatests/src/org/chromium/base/test/util/TimeoutTimer.java

diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutTimer.java b/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutTimer.java
index e171191..1039f73 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutTimer.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutTimer.java
@@ -5,21 +5,35 @@
 package org.chromium.base.test.util;
 
 import android.os.Debug;
-import android.os.SystemClock;
 
 /**
  * Encapsulates timeout logic, and disables timeouts when debugger is attached.
  */
 public class TimeoutTimer {
-    private final long mEndTimeMs;
+    private static final boolean IS_REAL_ANDROID =
+            System.getProperty("java.class.path").endsWith(".apk");
+    private static final long MS_TO_NANO = 1000000;
+    private final long mEndTimeNano;
     private final long mTimeoutMs;
 
+    static {
+        if (!IS_REAL_ANDROID) {
+            try {
+                // BaseRobolectricTestRunner marks this class as "DoNotAcquire" so that
+                // System.nanoTime() will not return fake time.
+                Class.forName("android.os.Debug");
+                assert false : "Cannot use TimeoutTimer without using BaseRobolectricTestRunner";
+            } catch (Throwable e) {
+            }
+        }
+    }
+
     /**
      * @param timeoutMs Relative time for the timeout (unscaled).
      */
     public TimeoutTimer(long timeoutMs) {
         mTimeoutMs = ScalableTimeout.scaleTimeout(timeoutMs);
-        mEndTimeMs = SystemClock.uptimeMillis() + mTimeoutMs;
+        mEndTimeNano = System.nanoTime() + mTimeoutMs * MS_TO_NANO;
     }
 
     /** Whether this timer has expired. */
@@ -27,14 +41,24 @@
         return getRemainingMs() == 0;
     }
 
+    private static boolean shouldPauseTimeouts() {
+        if (IS_REAL_ANDROID) {
+            return Debug.isDebuggerConnected();
+        }
+        // Our test runner sets this when --wait-for-java-debugger is passed.
+        // This will cause tests to never time out since the value is not updated when debugger
+        // detaches (oh well).
+        return "true".equals(System.getProperty("chromium.jdwp_active"));
+    }
+
     /** Returns how much time is left in milliseconds. */
     public long getRemainingMs() {
-        if (Debug.isDebuggerConnected()) {
+        if (shouldPauseTimeouts()) {
             // Never decreases, but still short enough that it's safe to wait() on and have a
             // timeout happen once the debugger detaches.
             return mTimeoutMs;
         }
-        long ret = mEndTimeMs - SystemClock.uptimeMillis();
-        return ret < 0 ? 0 : ret;
+        long ret = mEndTimeNano - System.nanoTime();
+        return ret < 0 ? 0 : ret / MS_TO_NANO;
     }
 }

base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java

diff --git a/base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java b/base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java
index 2d63c583..a0d0608 100644
--- a/base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java
+++ b/base/test/android/junit/src/org/chromium/base/test/BaseRobolectricTestRunner.java
@@ -10,6 +10,7 @@
 import org.junit.runners.model.InitializationError;
 import org.robolectric.DefaultTestLifecycle;
 import org.robolectric.TestLifecycle;
+import org.robolectric.internal.bytecode.InstrumentationConfiguration;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.BundleUtils;
@@ -24,6 +25,7 @@
 import org.chromium.base.task.PostTask;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
+import org.chromium.base.test.util.TimeoutTimer;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 import java.lang.reflect.Method;
@@ -94,4 +96,11 @@
         Class<?> testSuiteClass = method.getDeclaringClass();
         return testSuiteClass.getAnnotation(DisabledTest.class) != null;
     }
+
+    @Override
+    protected InstrumentationConfiguration createClassLoaderConfig(final FrameworkMethod method) {
+        return new InstrumentationConfiguration.Builder(super.createClassLoaderConfig(method))
+                .doNotAcquireClass(TimeoutTimer.class) // Requires access to non-fake SystemClock.
+                .build();
+    }
 }

build/android/pylib/local/machine/local_machine_junit_test_run.py

diff --git a/build/android/pylib/local/machine/local_machine_junit_test_run.py b/build/android/pylib/local/machine/local_machine_junit_test_run.py
index 42bfe34..364c517e 100644
--- a/build/android/pylib/local/machine/local_machine_junit_test_run.py
+++ b/build/android/pylib/local/machine/local_machine_junit_test_run.py
@@ -103,8 +103,9 @@
     ]
     if self._test_instance.debug_socket and not for_listing:
       jvm_args += [
-          '-agentlib:jdwp=transport=dt_socket'
-          ',server=y,suspend=y,address=%s' % self._test_instance.debug_socket
+          '-Dchromium.jdwp_active=true',
+          ('-agentlib:jdwp=transport=dt_socket'
+           ',server=y,suspend=y,address=%s' % self._test_instance.debug_socket)
       ]
 
     if self._test_instance.coverage_dir and not for_listing:

build/config/android/abi.gni

diff --git a/build/config/android/abi.gni b/build/config/android/abi.gni
index 43c62b1..e044ac6 100644
--- a/build/config/android/abi.gni
+++ b/build/config/android/abi.gni
@@ -69,11 +69,17 @@
 
   # Place holder for mips64 support, not tested.
   android_abi_target = "mips64el-linux-android"
+} else if (current_cpu == "riscv64") {
+  android_app_abi = "riscv64"
+
+  # Place holder for riscv64 support, not tested.
+  android_abi_target = "riscv64-linux-android"
 } else {
   assert(false, "Unknown Android ABI: " + current_cpu)
 }
 
-if (target_cpu == "arm64" || target_cpu == "x64" || target_cpu == "mips64el") {
+if (target_cpu == "arm64" || target_cpu == "x64" || target_cpu == "mips64el" ||
+    target_cpu == "riscv64") {
   android_64bit_target_cpu = true
 } else if (target_cpu == "arm" || target_cpu == "x86" ||
            target_cpu == "mipsel") {

build/fuchsia/linux_internal.sdk.sha1

diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1
index 10c2bfd..ed2cd19 100644
--- a/build/fuchsia/linux_internal.sdk.sha1
+++ b/build/fuchsia/linux_internal.sdk.sha1
@@ -1 +1 @@
-12.20230418.1.1
+12.20230418.2.1

build/rust/std/rules/BUILD.gn

diff --git a/build/rust/std/rules/BUILD.gn b/build/rust/std/rules/BUILD.gn
index 405d9ca..d6e2eed 100644
--- a/build/rust/std/rules/BUILD.gn
+++ b/build/rust/std/rules/BUILD.gn
@@ -308,14 +308,14 @@
 }
 cargo_crate("libc") {
   crate_type = "rlib"
-  crate_root = "//build/rust/std/fake_root/../../../../third_party/rust-toolchain/lib/rustlib/src/rust/vendor/libc-0.2.139/src/lib.rs"
+  crate_root = "//build/rust/std/fake_root/../../../../third_party/rust-toolchain/lib/rustlib/src/rust/vendor/libc-0.2.140/src/lib.rs"
   no_std = true
 
   # Unit tests skipped. Generate with --with-tests to include them.
   build_native_rust_unit_tests = false
-  sources = [ "//build/rust/std/fake_root/../../../../third_party/rust-toolchain/lib/rustlib/src/rust/vendor/libc-0.2.139/src/lib.rs" ]
+  sources = [ "//build/rust/std/fake_root/../../../../third_party/rust-toolchain/lib/rustlib/src/rust/vendor/libc-0.2.140/src/lib.rs" ]
   edition = "2015"
-  cargo_pkg_version = "0.2.139"
+  cargo_pkg_version = "0.2.140"
   cargo_pkg_authors = "The Rust Project Developers"
   cargo_pkg_name = "libc"
   cargo_pkg_description = "Raw FFI bindings to platform libraries like libc."

buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template

diff --git a/buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template b/buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template
index b2a15910..cb3bac3ec3 100644
--- a/buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template
+++ b/buildtools/reclient_cfgs/reproxy_cfg_templates/reproxy.cfg.template
@@ -7,6 +7,17 @@
 deps_cache_max_mb=256
 # TODO(b/276727504) Re-enable once noop build shutdown time bug is fixed
 # enable_deps_cache=true
-use_unified_uploads=true
+# TODO(b/263125591) Re-enable once slowness on fully remote builds is resolved
+# use_unified_uploads=true
 fast_log_collection=true
 depsscanner_address=exec://${scandeps_bin_path}
+
+# Improve upload/download concurrency
+max_concurrent_streams_per_conn=50
+max_concurrent_requests_per_conn=50
+min_grpc_connections=50
+cas_concurrency=1000
+
+# Always compress artifacts
+compression_threshold=0
+use_batches=false

cc/paint/image_transfer_cache_entry_unittest.cc

diff --git a/cc/paint/image_transfer_cache_entry_unittest.cc b/cc/paint/image_transfer_cache_entry_unittest.cc
index 44601c5..cc2c096 100644
--- a/cc/paint/image_transfer_cache_entry_unittest.cc
+++ b/cc/paint/image_transfer_cache_entry_unittest.cc
@@ -16,6 +16,7 @@
 #include "base/notreached.h"
 #include "build/build_config.h"
 #include "cc/paint/image_transfer_cache_entry.h"
+#include "cc/paint/paint_op_writer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -242,14 +243,14 @@
                                            nullptr /* decoded color space*/),
       true /* needs_mips */, absl::nullopt));
   uint32_t size = client_entry->SerializedSize();
-  std::vector<uint8_t> data(size);
+  auto data = PaintOpWriter::AllocateAlignedBuffer<uint8_t>(size);
   ASSERT_TRUE(client_entry->Serialize(
-      base::make_span(static_cast<uint8_t*>(data.data()), size)));
+      base::make_span(static_cast<uint8_t*>(data.get()), size)));
 
   // Create service-side entry from the client-side serialize info
   auto entry(std::make_unique<ServiceImageTransferCacheEntry>());
   ASSERT_TRUE(entry->Deserialize(
-      gr_context(), base::make_span(static_cast<uint8_t*>(data.data()), size)));
+      gr_context(), base::make_span(static_cast<uint8_t*>(data.get()), size)));
   ASSERT_TRUE(entry->is_yuv());
 
   // Check color of pixels
@@ -394,12 +395,13 @@
   ClientImageTransferCacheEntry client_entry(
       ClientImageTransferCacheEntry::Image(&bitmap.pixmap()), true,
       absl::nullopt);
-  std::vector<uint8_t> storage(client_entry.SerializedSize());
-  client_entry.Serialize(base::make_span(storage.data(), storage.size()));
+  const uint32_t storage_size = client_entry.SerializedSize();
+  auto storage = PaintOpWriter::AllocateAlignedBuffer<uint8_t>(storage_size);
+  client_entry.Serialize(base::make_span(storage.get(), storage_size));
 
   ServiceImageTransferCacheEntry service_entry;
   service_entry.Deserialize(gr_context.get(),
-                            base::make_span(storage.data(), storage.size()));
+                            base::make_span(storage.get(), storage_size));
   ASSERT_TRUE(service_entry.image());
   auto pre_mip_image = service_entry.image();
   EXPECT_FALSE(pre_mip_image->isTextureBacked());
@@ -422,12 +424,13 @@
   ClientImageTransferCacheEntry client_entry(
       ClientImageTransferCacheEntry::Image(&bitmap.pixmap()), false,
       absl::nullopt);
-  std::vector<uint8_t> storage(client_entry.SerializedSize());
-  client_entry.Serialize(base::make_span(storage.data(), storage.size()));
+  const uint32_t storage_size = client_entry.SerializedSize();
+  auto storage = PaintOpWriter::AllocateAlignedBuffer<uint8_t>(storage_size);
+  client_entry.Serialize(base::make_span(storage.get(), storage_size));
 
   ServiceImageTransferCacheEntry service_entry;
   service_entry.Deserialize(gr_context.get(),
-                            base::make_span(storage.data(), storage.size()));
+                            base::make_span(storage.get(), storage_size));
   ASSERT_TRUE(service_entry.image());
   auto pre_mip_image = service_entry.image();
   EXPECT_FALSE(pre_mip_image->isTextureBacked());

cc/paint/paint_op_buffer_unittest.cc

diff --git a/cc/paint/paint_op_buffer_unittest.cc b/cc/paint/paint_op_buffer_unittest.cc
index a0abe2aa..070c3e4fa 100644
--- a/cc/paint/paint_op_buffer_unittest.cc
+++ b/cc/paint/paint_op_buffer_unittest.cc
@@ -3319,8 +3319,8 @@
                                               SkRect::MakeWH(100, 100));
 
   TestOptionsProvider options_provider;
-  std::vector<uint8_t> memory(kDefaultSerializedBufferSize);
-  PaintOpWriter writer(memory.data(), memory.size(),
+  auto memory = AllocateSerializedBuffer();
+  PaintOpWriter writer(memory.get(), kDefaultSerializedBufferSize,
                        options_provider.serialize_options(), false);
   writer.Write(filter.get(), SkM44());
   ASSERT_GT(writer.size(), sizeof(float));
@@ -3328,14 +3328,14 @@
   // Replace the first occurrence of rect_size with NaN to make the ClipRectOp
   // invalid.
   for (size_t i = 0; i < writer.size(); i += sizeof(float)) {
-    float* f = reinterpret_cast<float*>(memory.data() + i);
+    float* f = reinterpret_cast<float*>(memory.get() + i);
     if (*f == rect_size) {
       *f = std::numeric_limits<float>::quiet_NaN();
       break;
     }
   }
   sk_sp<PaintFilter> deserialized_filter;
-  PaintOpReader reader(memory.data(), writer.size(),
+  PaintOpReader reader(memory.get(), writer.size(),
                        options_provider.deserialize_options(), false);
   reader.Read(&deserialized_filter);
   EXPECT_FALSE(deserialized_filter);

cc/paint/paint_op_writer.h

diff --git a/cc/paint/paint_op_writer.h b/cc/paint/paint_op_writer.h
index ef077f3..dee0d600 100644
--- a/cc/paint/paint_op_writer.h
+++ b/cc/paint/paint_op_writer.h
@@ -50,10 +50,11 @@
                 bool enable_security_constraints = false);
   ~PaintOpWriter();
 
-  static std::unique_ptr<char, base::AlignedFreeDeleter> AllocateAlignedBuffer(
+  template <typename T = char>
+  static std::unique_ptr<T, base::AlignedFreeDeleter> AllocateAlignedBuffer(
       size_t size) {
-    return std::unique_ptr<char, base::AlignedFreeDeleter>(
-        static_cast<char*>(base::AlignedAlloc(size, kMaxAlignment)));
+    return std::unique_ptr<T, base::AlignedFreeDeleter>(
+        static_cast<T*>(base::AlignedAlloc(size, kMaxAlignment)));
   }
 
   const PaintOp::SerializeOptions& options() const { return *options_; }

cc/test/test_options_provider.cc

diff --git a/cc/test/test_options_provider.cc b/cc/test/test_options_provider.cc
index 3b2d89f2..5eec903 100644
--- a/cc/test/test_options_provider.cc
+++ b/cc/test/test_options_provider.cc
@@ -7,6 +7,7 @@
 #include <limits>
 #include <vector>
 
+#include "cc/paint/paint_op_writer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
@@ -114,13 +115,13 @@
   ClientImageTransferCacheEntry cache_entry(
       ClientImageTransferCacheEntry::Image(&bitmap.pixmap()),
       false /* needs_mips */, target_color_params);
-  std::vector<uint8_t> data;
-  data.resize(cache_entry.SerializedSize());
-  if (!cache_entry.Serialize(base::span<uint8_t>(data.data(), data.size()))) {
+  const uint32_t data_size = cache_entry.SerializedSize();
+  auto data = PaintOpWriter::AllocateAlignedBuffer<uint8_t>(data_size);
+  if (!cache_entry.Serialize(base::span<uint8_t>(data.get(), data_size))) {
     return ScopedResult();
   }
 
-  CreateEntryDirect(entry_key, base::span<uint8_t>(data.data(), data.size()));
+  CreateEntryDirect(entry_key, base::span<uint8_t>(data.get(), data_size));
 
   return ScopedResult(DecodedDrawImage(
       image_id, nullptr, SkSize::MakeEmpty(), draw_image.scale(),

cc/tiles/gpu_image_decode_cache_unittest.cc

diff --git a/cc/tiles/gpu_image_decode_cache_unittest.cc b/cc/tiles/gpu_image_decode_cache_unittest.cc
index fde3858..fb9dd49 100644
--- a/cc/tiles/gpu_image_decode_cache_unittest.cc
+++ b/cc/tiles/gpu_image_decode_cache_unittest.cc
@@ -20,6 +20,7 @@
 #include "cc/paint/draw_image.h"
 #include "cc/paint/image_transfer_cache_entry.h"
 #include "cc/paint/paint_image_builder.h"
+#include "cc/paint/paint_op_writer.h"
 #include "cc/test/fake_paint_image_generator.h"
 #include "cc/test/skia_common.h"
 #include "cc/test/test_tile_task_runner.h"
@@ -170,7 +171,9 @@
 
   void* MapTransferCacheEntry(uint32_t serialized_size) override {
     mapped_entry_size_ = serialized_size;
-    mapped_entry_.reset(new uint8_t[serialized_size]);
+    auto buffer =
+        PaintOpWriter::AllocateAlignedBuffer<uint8_t>(serialized_size);
+    mapped_entry_.swap(buffer);
     return mapped_entry_.get();
   }
 
@@ -270,7 +273,7 @@
   raw_ptr<TransferCacheTestHelper> transfer_cache_helper_;
   bool advertise_accelerated_decoding_ = false;
   size_t mapped_entry_size_ = 0;
-  std::unique_ptr<uint8_t[]> mapped_entry_;
+  std::unique_ptr<uint8_t, base::AlignedFreeDeleter> mapped_entry_;
 };
 
 class MockRasterImplementation : public gpu::raster::RasterImplementationGLES {

chrome/android/chrome_java_sources.gni

diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 7d841d4..2c951b7 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -201,6 +201,7 @@
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiObserver.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiState.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java",

chrome/android/chrome_junit_test_java_sources.gni

diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni
index a2f50ee..468fb11e 100644
--- a/chrome/android/chrome_junit_test_java_sources.gni
+++ b/chrome/android/chrome_junit_test_java_sources.gni
@@ -49,6 +49,7 @@
   "junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerViewBinderTest.java",
   "junit/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediatorTest.java",
   "junit/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediatorTest.java",
+  "junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefsTest.java",
   "junit/src/org/chromium/chrome/browser/bookmarks/ReadingListSectionHeaderTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/ClearDataDialogResultRecorderTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/InstalledWebappBroadcastReceiverTest.java",
@@ -266,6 +267,7 @@
   "junit/src/org/chromium/chrome/browser/supervised_user/ChildAccountServiceTest.java",
   "junit/src/org/chromium/chrome/browser/survey/ChromeSurveyControllerFlowTest.java",
   "junit/src/org/chromium/chrome/browser/survey/ChromeSurveyControllerTest.java",
+  "junit/src/org/chromium/chrome/browser/sync/SyncErrorNotifierTest.java",
   "junit/src/org/chromium/chrome/browser/sync/ui/SyncErrorMessageImpressionTrackerTest.java",
   "junit/src/org/chromium/chrome/browser/tab/RequestDesktopUtilsUnitTest.java",
   "junit/src/org/chromium/chrome/browser/tab/TabAttributesTest.java",

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java

diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
index c7477c3e..65174a51 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
@@ -136,7 +136,7 @@
     private @Nullable FeedListContentManager mContentManager;
     private @Nullable RecyclerView mRecyclerView;
     private @Nullable SurfaceScope mSurfaceScope;
-    private @Nullable FeedSurfaceScopeDependencyProviderImpl mDependencyProvider;
+    private @Nullable FeedSurfaceScopeDependencyProvider mDependencyProvider;
     private @Nullable HybridListRenderer mHybridListRenderer;
 
     // Used to handle things related to the main scrollable container of NTP surface.
@@ -679,7 +679,7 @@
         mContentManager = new FeedListContentManager();
         ProcessScope processScope = FeedSurfaceTracker.getInstance().getXSurfaceProcessScope();
         if (processScope != null) {
-            mDependencyProvider = new FeedSurfaceScopeDependencyProviderImpl(
+            mDependencyProvider = new FeedSurfaceScopeDependencyProvider(
                     mActivity, mActivity, mShowDarkBackground);
 
             mSurfaceScope = processScope.obtainSurfaceScope(mDependencyProvider);

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java

diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
index c733703..8e0aafd 100644
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
@@ -48,8 +48,8 @@
 import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
 import org.chromium.chrome.browser.ui.signin.SyncPromoController;
 import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
+import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType;
 import org.chromium.chrome.browser.xsurface.ListLayoutHelper;
-import org.chromium.chrome.browser.xsurface.feed.StreamType;
 import org.chromium.components.browser_ui.widget.listmenu.ListMenu;
 import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.components.feed.proto.wire.ReliabilityLoggingEnums.DiscoverLaunchResult;

chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
index f72684c..3d08f34 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
@@ -15,6 +15,8 @@
 import org.chromium.chrome.browser.back_press.BackPressManager;
 import org.chromium.chrome.browser.bookmarks.BookmarkManagerCoordinator;
 import org.chromium.chrome.browser.bookmarks.BookmarkPage;
+import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.embedder_support.util.UrlConstants;
@@ -38,7 +40,8 @@
         mBookmarkManagerCoordinator = new BookmarkManagerCoordinator(this,
                 IntentUtils.safeGetParcelableExtra(
                         getIntent(), IntentHandler.EXTRA_PARENT_COMPONENT),
-                true, isIncognito, getSnackbarManager(), Profile.getLastUsedRegularProfile());
+                true, isIncognito, getSnackbarManager(), Profile.getLastUsedRegularProfile(),
+                new BookmarkUiPrefs(SharedPreferencesManager.getInstance()));
         String url = getIntent().getDataString();
         if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL;
         mBookmarkManagerCoordinator.updateForUrl(url);

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
index 78ba468..8af305e5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
@@ -18,13 +18,14 @@
 
     /** Returns whether an additional "add bookmark" item should be in the overflow menu. */
     public static boolean isBookmarkMenuItemAsDedicatedRowEnabled() {
+        // TODO(wylieb): Remove the BOOKMARKS_REFRESH flag.
         return FeatureList.isInitialized()
                 && ChromeFeatureList.isEnabled(ChromeFeatureList.BOOKMARKS_REFRESH)
                 && ShoppingFeatures.isShoppingListEligible();
     }
 
     /** Returns whether the visual refresh should be used for the bookmark manager. */
-    public static boolean isBookmarksVisualRefreshEnabled() {
+    public static boolean isLegacyBookmarksVisualRefreshEnabled() {
         return isBookmarkMenuItemAsDedicatedRowEnabled();
     }
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java
index 5a70e9d..a4ec9df 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java
@@ -26,8 +26,8 @@
 public class BookmarkItemRow extends BookmarkRow implements LargeIconCallback {
     private GURL mUrl;
     private RoundedIconGenerator mIconGenerator;
-    private final int mMinIconSize;
-    private final int mDisplayedIconSize;
+    private int mMinIconSize;
+    private int mDisplayedIconSize;
     private boolean mFaviconCancelled;
 
     /**
@@ -37,6 +37,7 @@
      */
     public static BookmarkItemRow buildView(Context context, boolean isVisualRefreshEnabled) {
         BookmarkItemRow row = new BookmarkItemRow(context, null);
+        row.setupIconProperties(isVisualRefreshEnabled);
         BookmarkRow.buildView(row, context, isVisualRefreshEnabled);
         return row;
     }
@@ -44,25 +45,23 @@
     /** Constructor for inflating from XML. */
     public BookmarkItemRow(Context context, AttributeSet attrs) {
         super(context, attrs);
+    }
 
-        boolean isVisualRefreshEnabled = BookmarkFeatures.isBookmarksVisualRefreshEnabled();
-        mMinIconSize = isVisualRefreshEnabled
-                ? getResources().getDimensionPixelSize(R.dimen.bookmark_refresh_min_start_icon_size)
-                : getResources().getDimensionPixelSize(R.dimen.default_favicon_min_size);
+    void setupIconProperties(boolean isVisualRefreshEnabled) {
+        mMinIconSize = getResources().getDimensionPixelSize(isVisualRefreshEnabled
+                        ? R.dimen.bookmark_refresh_min_start_icon_size
+                        : R.dimen.default_favicon_min_size);
+        mDisplayedIconSize = getResources().getDimensionPixelSize(isVisualRefreshEnabled
+                        ? R.dimen.bookmark_refresh_preferred_start_icon_size
+                        : R.dimen.default_favicon_size);
 
-        mDisplayedIconSize = isVisualRefreshEnabled
-                ? getResources().getDimensionPixelSize(
-                        R.dimen.bookmark_refresh_preferred_start_icon_size)
-                : getResources().getDimensionPixelSize(R.dimen.default_favicon_size);
-        if (isVisualRefreshEnabled) {
-            mIconGenerator = new RoundedIconGenerator(mDisplayedIconSize, mDisplayedIconSize,
-                    mDisplayedIconSize / 2,
-                    getContext().getColor(R.color.default_favicon_background_color),
-                    getResources().getDimensionPixelSize(
-                            R.dimen.bookmark_refresh_circular_monogram_text_size));
-        } else {
-            mIconGenerator = FaviconUtils.createCircularIconGenerator(context);
-        }
+        mIconGenerator = isVisualRefreshEnabled
+                ? new RoundedIconGenerator(mDisplayedIconSize, mDisplayedIconSize,
+                        mDisplayedIconSize / 2,
+                        getContext().getColor(R.color.default_favicon_background_color),
+                        getResources().getDimensionPixelSize(
+                                R.dimen.bookmark_refresh_circular_monogram_text_size))
+                : FaviconUtils.createCircularIconGenerator(getContext());
     }
 
     // BookmarkRow implementation.

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
index 95adbd5..c8ad5bd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
@@ -67,6 +67,7 @@
     private final BookmarkPromoHeader mPromoHeaderManager;
     private final BookmarkModel mBookmarkModel;
     private final Profile mProfile;
+    private final BookmarkUiPrefs mBookmarkUiPrefs;
 
     /**
      * Creates an instance of {@link BookmarkManagerCoordinator}. It also initializes resources,
@@ -77,10 +78,11 @@
      * @param isIncognito Whether the tab model loading the bookmark manager is for incognito mode.
      * @param snackbarManager The {@link SnackbarManager} used to display snackbars.
      * @param profile The profile which the manager is running in.
+     * @param bookmarkUiPrefs Manages prefs for bookmarks ui.
      */
     public BookmarkManagerCoordinator(Context context, ComponentName openBookmarkComponentName,
             boolean isDialogUi, boolean isIncognito, SnackbarManager snackbarManager,
-            Profile profile) {
+            Profile profile, BookmarkUiPrefs bookmarkUiPrefs) {
         mProfile = profile;
         mImageFetcher =
                 ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE,
@@ -93,6 +95,7 @@
         if (ShoppingFeatures.isShoppingListEligible()) {
             ShoppingServiceFactory.getForProfile(profile).scheduleSavedProductUpdate();
         }
+        mBookmarkUiPrefs = bookmarkUiPrefs;
 
         SelectionDelegate<BookmarkId> selectionDelegate = new SelectionDelegate<>() {
             @Override
@@ -129,7 +132,8 @@
                 new OneshotSupplierImpl<>();
         mBookmarkToolbarCoordinator = new BookmarkToolbarCoordinator(context, mSelectableListLayout,
                 selectionDelegate, /*searchDelegate=*/this, dragReorderableRecyclerViewAdapter,
-                isDialogUi, bookmarkDelegateSupplier, mBookmarkModel, mBookmarkOpener);
+                isDialogUi, bookmarkDelegateSupplier, mBookmarkModel, mBookmarkOpener,
+                mBookmarkUiPrefs);
         mSelectableListLayout.configureWideDisplayStyle();
 
         LargeIconBridge largeIconBridge = new LargeIconBridge(mProfile);
@@ -140,7 +144,8 @@
         mMediator = new BookmarkManagerMediator(context, mBookmarkModel, mBookmarkOpener,
                 mSelectableListLayout, selectionDelegate, mRecyclerView,
                 dragReorderableRecyclerViewAdapter, largeIconBridge, isDialogUi, isIncognito,
-                mBackPressStateSupplier, mProfile, bookmarkUndoController, modelList);
+                mBackPressStateSupplier, mProfile, bookmarkUndoController, modelList,
+                mBookmarkUiPrefs);
         mPromoHeaderManager = mMediator.getPromoHeaderManager();
 
         bookmarkDelegateSupplier.set(/*bookmarkDelegate=*/mMediator);
@@ -329,20 +334,20 @@
 
     private static BookmarkFolderRow buildBookmarkFolderView(ViewGroup parent) {
         BookmarkFolderRow bookmarkFolderRow = BookmarkFolderRow.buildView(
-                parent.getContext(), BookmarkFeatures.isBookmarksVisualRefreshEnabled());
+                parent.getContext(), BookmarkFeatures.isLegacyBookmarksVisualRefreshEnabled());
         return bookmarkFolderRow;
     }
 
     static @VisibleForTesting BookmarkItemRow buildBookmarkItemView(ViewGroup parent) {
         BookmarkItemRow bookmarkItemRow = BookmarkItemRow.buildView(
-                parent.getContext(), BookmarkFeatures.isBookmarksVisualRefreshEnabled());
+                parent.getContext(), BookmarkFeatures.isLegacyBookmarksVisualRefreshEnabled());
         return bookmarkItemRow;
     }
 
     static @VisibleForTesting PowerBookmarkShoppingItemRow buildShoppingItemView(ViewGroup parent) {
         PowerBookmarkShoppingItemRow powerBookmarkShoppingItemRow =
-                PowerBookmarkShoppingItemRow.buildView(
-                        parent.getContext(), BookmarkFeatures.isBookmarksVisualRefreshEnabled());
+                PowerBookmarkShoppingItemRow.buildView(parent.getContext(),
+                        BookmarkFeatures.isLegacyBookmarksVisualRefreshEnabled());
         return powerBookmarkShoppingItemRow;
     }
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
index e30a94c..a25d5f6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
@@ -53,8 +53,9 @@
 
 /** Responsible for BookmarkManager business logic. */
 // TODO(crbug.com/1416611): Remove BookmarkDelegate if possible.
-class BookmarkManagerMediator
-        implements BookmarkDelegate, TestingDelegate, PartnerBookmarksReader.FaviconUpdateObserver {
+class BookmarkManagerMediator implements BookmarkDelegate, TestingDelegate,
+                                         PartnerBookmarksReader.FaviconUpdateObserver,
+                                         BookmarkUiPrefs.Observer {
     private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
     private static final String EMPTY_QUERY = null;
 
@@ -344,6 +345,7 @@
     private final BookmarkPromoHeader mPromoHeaderManager;
     private final BookmarkUndoController mBookmarkUndoController;
     private final ModelList mModelList;
+    private final BookmarkUiPrefs mBookmarkUiPrefs;
 
     // Whether this instance has been destroyed.
     private boolean mIsDestroyed;
@@ -364,7 +366,8 @@
             DragReorderableRecyclerViewAdapter dragReorderableRecyclerViewAdapter,
             LargeIconBridge largeIconBridge, boolean isDialogUi, boolean isIncognito,
             ObservableSupplierImpl<Boolean> backPressStateSupplier, Profile profile,
-            BookmarkUndoController bookmarkUndoController, ModelList modelList) {
+            BookmarkUndoController bookmarkUndoController, ModelList modelList,
+            BookmarkUiPrefs bookmarkUiPrefs) {
         mContext = context;
         mBookmarkModel = bookmarkModel;
         mBookmarkModel.addObserver(mBookmarkModelObserver);
@@ -390,6 +393,8 @@
         mPromoHeaderManager = new BookmarkPromoHeader(mContext, mProfile, this::updateHeader);
         mBookmarkUndoController = bookmarkUndoController;
         mModelList = modelList;
+        mBookmarkUiPrefs = bookmarkUiPrefs;
+        mBookmarkUiPrefs.addObserver(this);
 
         // Previously we were waiting for BookmarkModel to be loaded, but it's not necessary.
         PartnerBookmarksReader.addFaviconUpdateObserver(this);
@@ -427,6 +432,8 @@
         mBookmarkUndoController.destroy();
         mDragStateDelegate.destroy();
 
+        mBookmarkUiPrefs.removeObserver(this);
+
         for (BookmarkUiObserver observer : mUiObservers) {
             observer.onDestroy();
         }
@@ -1073,6 +1080,16 @@
         return new ListItem(bookmarkListEntry.getViewType(), propertyModel);
     }
 
+    // BookmarkUiPrefs.Observer implementation.
+
+    @Override
+    @SuppressWarnings("NotifyDataSetChanged")
+    public void onBookmarkRowDisplayPrefChanged() {
+        mRecyclerView.setAdapter(null);
+        mRecyclerView.setAdapter(mDragReorderableRecyclerViewAdapter);
+        mDragReorderableRecyclerViewAdapter.notifyDataSetChanged();
+    }
+
     // Testing methods.
     /** Whether to prevent the bookmark model from fully loading for testing. */
     static void preventLoadingForTesting(boolean preventLoading) {

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
index 08e3ad38..f7fe72d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
@@ -9,6 +9,7 @@
 import androidx.annotation.VisibleForTesting;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
@@ -35,7 +36,8 @@
 
         mBookmarkManagerCoordinator =
                 new BookmarkManagerCoordinator(host.getContext(), componentName, false, isIncognito,
-                        snackbarManager, Profile.getLastUsedRegularProfile());
+                        snackbarManager, Profile.getLastUsedRegularProfile(),
+                        new BookmarkUiPrefs(SharedPreferencesManager.getInstance()));
         mBookmarkManagerCoordinator.setBasicNativePage(this);
         mTitle = host.getContext().getResources().getString(R.string.bookmarks);
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java
index 324a3bc..f179c6e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java
@@ -28,7 +28,8 @@
             SelectionDelegate selectionDelegate, SearchDelegate searchDelegate,
             DragReorderableRecyclerViewAdapter dragReorderableRecyclerViewAdapter,
             boolean isDialogUi, OneshotSupplier<BookmarkDelegate> bookmarkDelegateSupplier,
-            BookmarkModel bookmarkModel, BookmarkOpener bookmarkOpener) {
+            BookmarkModel bookmarkModel, BookmarkOpener bookmarkOpener,
+            BookmarkUiPrefs bookmarkUiPrefs) {
         mToolbar = (BookmarkToolbar) selectableListLayout.initializeToolbar(
                 R.layout.bookmark_toolbar, selectionDelegate, 0, R.id.normal_menu_group,
                 R.id.selection_mode_menu_group, null, isDialogUi);
@@ -43,7 +44,8 @@
         mModel.set(BookmarkToolbarProperties.IS_DIALOG_UI, isDialogUi);
         mModel.set(BookmarkToolbarProperties.DRAG_ENABLED, false);
         mMediator = new BookmarkToolbarMediator(context, mModel, dragReorderableRecyclerViewAdapter,
-                bookmarkDelegateSupplier, selectionDelegate, bookmarkModel, bookmarkOpener);
+                bookmarkDelegateSupplier, selectionDelegate, bookmarkModel, bookmarkOpener,
+                bookmarkUiPrefs);
 
         PropertyModelChangeProcessor.create(mModel, mToolbar, BookmarkToolbarViewBinder::bind);
     }

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
index 64d462e..7df701a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
@@ -17,6 +17,7 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.app.bookmarks.BookmarkAddEditFolderActivity;
 import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderSelectActivity;
+import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs.BookmarkRowDisplayPref;
 import org.chromium.chrome.browser.bookmarks.BookmarkUiState.BookmarkUiMode;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkItem;
@@ -38,6 +39,7 @@
     private final SelectionDelegate mSelectionDelegate;
     private final BookmarkModel mBookmarkModel;
     private final BookmarkOpener mBookmarkOpener;
+    private final BookmarkUiPrefs mBookmarkUiPrefs;
 
     // TODO(crbug.com/1413463): Remove reference to BookmarkDelegate if possible.
     private @Nullable BookmarkDelegate mBookmarkDelegate;
@@ -48,7 +50,7 @@
             DragReorderableRecyclerViewAdapter dragReorderableRecyclerViewAdapter,
             OneshotSupplier<BookmarkDelegate> bookmarkDelegateSupplier,
             SelectionDelegate selectionDelegate, BookmarkModel bookmarkModel,
-            BookmarkOpener bookmarkOpener) {
+            BookmarkOpener bookmarkOpener, BookmarkUiPrefs bookmarkUiPrefs) {
         mContext = context;
         mModel = model;
 
@@ -59,7 +61,13 @@
         mSelectionDelegate.addObserver(this);
         mBookmarkModel = bookmarkModel;
         mBookmarkOpener = bookmarkOpener;
+        mBookmarkUiPrefs = bookmarkUiPrefs;
 
+        final @BookmarkRowDisplayPref int pref = mBookmarkUiPrefs.getBookmarkRowDisplayPref();
+        if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled()) {
+            mModel.set(BookmarkToolbarProperties.CHECKED_SORT_MENU_ID,
+                    pref == BookmarkRowDisplayPref.COMPACT ? R.id.compact_view : R.id.visual_view);
+        }
         bookmarkDelegateSupplier.onAvailable((bookmarkDelegate) -> {
             mBookmarkDelegate = bookmarkDelegate;
             mModel.set(BookmarkToolbarProperties.OPEN_SEARCH_UI_RUNNABLE,
@@ -91,9 +99,11 @@
             mModel.set(BookmarkToolbarProperties.CHECKED_SORT_MENU_ID, id);
             return true;
         } else if (id == R.id.visual_view) {
+            mBookmarkUiPrefs.setBookmarkRowDisplayPref(BookmarkRowDisplayPref.VISUAL);
             mModel.set(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID, id);
             return true;
         } else if (id == R.id.compact_view) {
+            mBookmarkUiPrefs.setBookmarkRowDisplayPref(BookmarkRowDisplayPref.COMPACT);
             mModel.set(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID, id);
             return true;
         } else if (id == R.id.edit_menu_id) {

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
new file mode 100644
index 0000000..f2448ffc
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
@@ -0,0 +1,84 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.bookmarks;
+
+import androidx.annotation.IntDef;
+
+import org.chromium.base.ObserverList;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Self-documenting preference class for bookmarks.
+ */
+public class BookmarkUiPrefs {
+    private static final @BookmarkRowDisplayPref int sInitialBookmarkRowDisplayPref =
+            BookmarkRowDisplayPref.COMPACT;
+
+    // This is persisted to preferences, entries shouldn't be reordered or removed.
+    @IntDef({BookmarkRowDisplayPref.COMPACT, BookmarkRowDisplayPref.VISUAL})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface BookmarkRowDisplayPref {
+        int COMPACT = 0;
+        int VISUAL = 1;
+    }
+
+    /** Observer for changes to prefs. */
+    public interface Observer {
+        /** Called when the BookmarkRowDisplayPref changes. */
+        void onBookmarkRowDisplayPrefChanged();
+    }
+
+    private final SharedPreferencesManager mPrefsManager;
+    private final ObserverList<Observer> mObservers = new ObserverList<>();
+
+    /**
+     * @param prefsManager Instance of SharedPreferencesManager to read/write from prefs.
+     */
+    public BookmarkUiPrefs(SharedPreferencesManager prefsManager) {
+        mPrefsManager = prefsManager;
+    }
+
+    /** Add the given observer to the list. */
+    public void addObserver(Observer observer) {
+        mObservers.addObserver(observer);
+    }
+
+    /** Remove the given observer from the list. */
+    public void removeObserver(Observer observer) {
+        mObservers.removeObserver(observer);
+    }
+
+    /** Returns how the bookmark rows should b edisplayed. */
+    public @BookmarkRowDisplayPref int getBookmarkRowDisplayPref() {
+        // Special cases for when the new visuals aren't enabled. We should either fallback to the
+        // shopping visuals or the compact.
+        if (!BookmarkFeatures.isAndroidImprovedBookmarksEnabled()) {
+            return BookmarkFeatures.isLegacyBookmarksVisualRefreshEnabled()
+                    ? BookmarkRowDisplayPref.VISUAL
+                    : BookmarkRowDisplayPref.COMPACT;
+        }
+
+        if (mPrefsManager.contains(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF)) {
+            return mPrefsManager.readInt(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF);
+        } else {
+            // The initial preference is controlled through a static member.
+            setBookmarkRowDisplayPref(sInitialBookmarkRowDisplayPref);
+            return sInitialBookmarkRowDisplayPref;
+        }
+    }
+
+    /**
+     * Sets the value for the bookmark row display pref.
+     * @param pref The pref value to be set.
+     */
+    public void setBookmarkRowDisplayPref(@BookmarkRowDisplayPref int pref) {
+        mPrefsManager.writeInt(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF, pref);
+        for (Observer obs : mObservers) obs.onBookmarkRowDisplayPrefChanged();
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManager.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManager.java
index 50ce314..6c20cf3b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManager.java
@@ -211,7 +211,7 @@
         mStrategy.destroy();
     }
 
-    private int calculateBreakPoint(int unclampedBreakPointDp) {
+    private static int calculateBreakPoint(int unclampedBreakPointDp) {
         return Math.max(unclampedBreakPointDp, WINDOW_WIDTH_COMPACT_CUTOFF_DP);
     }
 
@@ -268,7 +268,7 @@
         @PartialCustomTabType
         int type = calculatePartialCustomTabType(activity, provider.getInitialActivityWidth(),
                 provider.getInitialActivityHeight(), displayWidthDpSupplier,
-                provider.getActivityBreakPoint());
+                calculateBreakPoint(provider.getActivityBreakPoint()));
 
         @AnimRes
         int start_anim_id = defaultResId;

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java
index bc78b0e..5c4437ae 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java
@@ -9,6 +9,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
@@ -18,8 +19,6 @@
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.chrome.browser.notifications.NotificationWrapperBuilderFactory;
 import org.chromium.chrome.browser.notifications.channels.ChromeChannelDefinitions;
-import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.sync.ui.PassphraseActivity;
 import org.chromium.chrome.browser.sync.ui.SyncTrustedVaultProxyActivity;
 import org.chromium.components.browser_ui.notifications.NotificationManagerProxy;
@@ -28,7 +27,6 @@
 import org.chromium.components.browser_ui.notifications.NotificationWrapper;
 import org.chromium.components.browser_ui.notifications.PendingIntentProvider;
 import org.chromium.components.signin.base.CoreAccountInfo;
-import org.chromium.components.signin.identitymanager.ConsentLevel;
 import org.chromium.components.sync.PassphraseType;
 import org.chromium.components.sync.TrustedVaultUserActionTriggerForUMA;
 
@@ -40,6 +38,7 @@
     private static final String TAG = "SyncUI";
     private final NotificationManagerProxy mNotificationManager;
     private final SyncService mSyncService;
+    private final TrustedVaultClient mTrustedVaultClient;
     private boolean mTrustedVaultNotificationShownOrCreating;
 
     private @Nullable static SyncErrorNotifier sInstance;
@@ -53,18 +52,21 @@
         ThreadUtils.assertOnUiThread();
         if (!sInitialized) {
             if (SyncService.get() != null) {
-                sInstance = new SyncErrorNotifier();
+                sInstance = new SyncErrorNotifier(
+                        new NotificationManagerProxyImpl(ContextUtils.getApplicationContext()),
+                        SyncService.get(), TrustedVaultClient.get());
             }
             sInitialized = true;
         }
         return sInstance;
     }
 
-    private SyncErrorNotifier() {
-        mNotificationManager =
-                new NotificationManagerProxyImpl(ContextUtils.getApplicationContext());
-        mSyncService = SyncService.get();
-        assert mSyncService != null;
+    @VisibleForTesting
+    public SyncErrorNotifier(NotificationManagerProxy notificationManager, SyncService syncService,
+            TrustedVaultClient trustedVaultClient) {
+        mNotificationManager = notificationManager;
+        mSyncService = syncService;
+        mTrustedVaultClient = trustedVaultClient;
         mSyncService.addSyncStateChangedListener(this);
     }
 
@@ -173,10 +175,7 @@
      * already exist or is being created; and b) there is a primary account with ConsentLevel.SYNC.
      */
     private void maybeShowKeyRetrievalNotification() {
-        CoreAccountInfo primaryAccountInfo =
-                IdentityServicesProvider.get()
-                        .getIdentityManager(Profile.getLastUsedRegularProfile())
-                        .getPrimaryAccountInfo(ConsentLevel.SYNC);
+        CoreAccountInfo primaryAccountInfo = mSyncService.getAccountInfo();
         // Check/set |mTrustedVaultNotificationShownOrCreating| here to ensure the notification is
         // not shown again immediately after cancelling (Sync state might be changed often) and
         // there is only one asynchronous createKeyRetrievalIntent() attempt at a time.
@@ -192,7 +191,7 @@
                         ? R.string.hint_sync_retrieve_keys_for_everything
                         : R.string.hint_sync_retrieve_keys_for_passwords);
 
-        TrustedVaultClient.get()
+        mTrustedVaultClient
                 .createKeyRetrievalIntent(primaryAccountInfo)
                 // Cf. SyncTrustedVaultProxyActivity as to why use a proxy intent.
                 .then((realIntent)

chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinatorTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinatorTest.java
index 585c30a..f2214ee6 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinatorTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinatorTest.java
@@ -77,6 +77,8 @@
     IdentityManager mIdentityManager;
     @Mock
     BookmarkModel mBookmarkModel;
+    @Mock
+    BookmarkUiPrefs mBookmarkUiPrefs;
 
     private Activity mActivity;
     private BookmarkManagerCoordinator mCoordinator;
@@ -99,7 +101,7 @@
             mCoordinator = new BookmarkManagerCoordinator(mActivity,
                     /*openBookmarkComponentName=*/null,
                     /*isDialogUi=*/!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity),
-                    /*isIncognito=*/false, mSnackbarManager, mProfile);
+                    /*isIncognito=*/false, mSnackbarManager, mProfile, mBookmarkUiPrefs);
             mActivity.setContentView(mCoordinator.getView());
         });
     }

chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediatorTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediatorTest.java
index 1f145a6..97b77798 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediatorTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediatorTest.java
@@ -40,6 +40,7 @@
 import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.Batch;
+import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs.BookmarkRowDisplayPref;
 import org.chromium.chrome.browser.bookmarks.BookmarkUiState.BookmarkUiMode;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -111,7 +112,7 @@
     @Mock
     AccessibilityManager mAccessibilityManager;
     @Mock
-    private DragReorderableRecyclerViewAdapter mDragReorderableRecyclerViewAdapter;
+    private BookmarkUiPrefs mBookmarkUiPrefs;
 
     @Captor
     private ArgumentCaptor<BookmarkModelObserver> mBookmarkModelObserverArgumentCaptor;
@@ -129,6 +130,7 @@
 
     private Activity mActivity;
     private BookmarkManagerMediator mMediator;
+    private DragReorderableRecyclerViewAdapter mDragReorderableRecyclerViewAdapter;
     private final BookmarkItem mFolderItem1 =
             new BookmarkItem(mFolderId1, "Folder1", null, true, null, true, false, 0, false);
     private final BookmarkItem mFolderItem2 =
@@ -164,6 +166,11 @@
                     .when(mBookmarkUiObserver)
                     .onDestroy();
 
+            // Setup SharedPreferencesManager.
+            doReturn(BookmarkRowDisplayPref.COMPACT)
+                    .when(mBookmarkUiPrefs)
+                    .getBookmarkRowDisplayPref();
+
             // Setup sync/identify mocks.
             SyncService.overrideForTests(mSyncService);
             IdentityServicesProvider.setInstanceForTests(mIdentityServicesProvider);
@@ -171,11 +178,13 @@
             doReturn(mIdentityManager).when(mSigninManager).getIdentityManager();
             AccountManagerFacadeProvider.setInstanceForTests(mAccountManagerFacade);
 
+            mDragReorderableRecyclerViewAdapter =
+                    spy(new DragReorderableRecyclerViewAdapter(mActivity, mModelList));
             mMediator = new BookmarkManagerMediator(mActivity, mBookmarkModel, mBookmarkOpener,
                     mSelectableListLayout, mSelectionDelegate, mRecyclerView,
                     mDragReorderableRecyclerViewAdapter, mLargeIconBridge, /*isDialogUi=*/true,
                     /*isIncognito=*/false, mBackPressStateSupplier, mProfile,
-                    mBookmarkUndoController, mModelList);
+                    mBookmarkUndoController, mModelList, mBookmarkUiPrefs);
             mMediator.addUiObserver(mBookmarkUiObserver);
         });
     }
@@ -334,4 +343,10 @@
         mMediator.onDetachedFromWindow();
         verify(mBookmarkUndoController).setEnabled(false);
     }
+
+    @Test
+    public void onPreferenceChanged_ViewPreferenceUpdated() {
+        mMediator.onBookmarkRowDisplayPrefChanged();
+        verify(mRecyclerView).setAdapter(mDragReorderableRecyclerViewAdapter);
+    }
 }
\ No newline at end of file

chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediatorTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediatorTest.java
index 8027163..751ff8c 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediatorTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediatorTest.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.bookmarks;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
@@ -38,6 +39,7 @@
 import org.chromium.chrome.browser.app.bookmarks.BookmarkAddEditFolderActivity;
 import org.chromium.chrome.browser.app.bookmarks.BookmarkEditActivity;
 import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderSelectActivity;
+import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs.BookmarkRowDisplayPref;
 import org.chromium.chrome.browser.bookmarks.BookmarkUiState.BookmarkUiMode;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkItem;
@@ -82,6 +84,8 @@
     BookmarkId mBookmarkId;
     @Mock
     BookmarkItem mBookmarkItem;
+    @Mock
+    BookmarkUiPrefs mBookmarkUiPrefs;
     @Spy
     Context mContext;
 
@@ -114,7 +118,7 @@
 
         mMediator = new BookmarkToolbarMediator(mContext, mModel,
                 mDragReorderableRecyclerViewAdapter, mBookmarkDelegateSupplier, mSelectionDelegate,
-                mBookmarkModel, mBookmarkOpener);
+                mBookmarkModel, mBookmarkOpener, mBookmarkUiPrefs);
         mBookmarkDelegateSupplier.set(mBookmarkDelegate);
     }
 
@@ -136,7 +140,7 @@
 
         mMediator = new BookmarkToolbarMediator(mContext, mModel,
                 mDragReorderableRecyclerViewAdapter, mBookmarkDelegateSupplier, mSelectionDelegate,
-                mBookmarkModel, mBookmarkOpener);
+                mBookmarkModel, mBookmarkOpener, mBookmarkUiPrefs);
     }
 
     @Test
@@ -286,4 +290,50 @@
                                   .apply(R.id.selection_mode_delete_menu_id));
         verify(mBookmarkModel).deleteBookmarks(Mockito.any());
     }
+
+    @Test
+    public void testOnMenuItemClick_selectionOpenInNewTab() {
+        setCurrentSelection(mBookmarkId);
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.selection_open_in_new_tab_id));
+        verify(mBookmarkOpener).openBookmarksInNewTabs(any(), eq(false));
+    }
+
+    @Test
+    public void testOnMenuItemClick_selectionOpenInIncognitoTab() {
+        setCurrentSelection(mBookmarkId);
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.selection_open_in_incognito_tab_id));
+        verify(mBookmarkOpener).openBookmarksInNewTabs(any(), eq(true));
+    }
+
+    @Test
+    public void testOnMenuItemClick_sortOptions() {
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.sort_by_newest));
+        Assert.assertEquals(
+                R.id.sort_by_newest, mModel.get(BookmarkToolbarProperties.CHECKED_SORT_MENU_ID));
+
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.sort_by_oldest));
+        Assert.assertEquals(
+                R.id.sort_by_oldest, mModel.get(BookmarkToolbarProperties.CHECKED_SORT_MENU_ID));
+
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.sort_by_alpha));
+        Assert.assertEquals(
+                R.id.sort_by_alpha, mModel.get(BookmarkToolbarProperties.CHECKED_SORT_MENU_ID));
+
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.sort_by_reverse_alpha));
+        Assert.assertEquals(R.id.sort_by_reverse_alpha,
+                mModel.get(BookmarkToolbarProperties.CHECKED_SORT_MENU_ID));
+    }
+
+    @Test
+    public void testOnMenuItemClick_viewOptions() {
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.visual_view));
+        Assert.assertEquals(
+                R.id.visual_view, mModel.get(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID));
+        verify(mBookmarkUiPrefs).setBookmarkRowDisplayPref(BookmarkRowDisplayPref.VISUAL);
+
+        Assert.assertTrue(mMediator.onMenuIdClick(R.id.compact_view));
+        Assert.assertEquals(
+                R.id.compact_view, mModel.get(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID));
+        verify(mBookmarkUiPrefs).setBookmarkRowDisplayPref(BookmarkRowDisplayPref.COMPACT);
+    }
 }

chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefsTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefsTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefsTest.java
new file mode 100644
index 0000000..44f8f7d
--- /dev/null
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefsTest.java
@@ -0,0 +1,128 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.bookmarks;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.annotation.Config;
+
+import org.chromium.base.test.BaseRobolectricTestRunner;
+import org.chromium.base.test.util.Batch;
+import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs.BookmarkRowDisplayPref;
+import org.chromium.chrome.browser.commerce.ShoppingFeatures;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.test.util.browser.Features;
+
+/** Unit tests for {@link BookmarkUiPrefs}. */
+@Batch(Batch.UNIT_TESTS)
+@RunWith(BaseRobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+@Features.EnableFeatures({ChromeFeatureList.ANDROID_IMPROVED_BOOKMARKS})
+public class BookmarkUiPrefsTest {
+    @Rule
+    public MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Rule
+    public TestRule mFeaturesProcessorRule = new Features.JUnitProcessor();
+
+    @Mock
+    BookmarkUiPrefs.Observer mObserver;
+    @Mock
+    SharedPreferencesManager mSharedPreferencesManager;
+
+    BookmarkUiPrefs mBookmarkUiPrefs;
+
+    @Before
+    public void setUp() {
+        mBookmarkUiPrefs = new BookmarkUiPrefs(mSharedPreferencesManager);
+    }
+
+    @Test
+    @Features.DisableFeatures({ChromeFeatureList.ANDROID_IMPROVED_BOOKMARKS})
+    @Features.EnableFeatures({ChromeFeatureList.BOOKMARKS_REFRESH})
+    public void legacyVisualFlags() {
+        ShoppingFeatures.setShoppingListEligibleForTesting(true);
+
+        // Nothing has been written to shared prefs manager.
+        Assert.assertEquals(
+                BookmarkRowDisplayPref.VISUAL, mBookmarkUiPrefs.getBookmarkRowDisplayPref());
+        // It should also persist that value to prefs.
+        verify(mSharedPreferencesManager, times(0))
+                .writeInt(eq(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF), anyInt());
+
+        ShoppingFeatures.setShoppingListEligibleForTesting(false);
+    }
+
+    @Test
+    @Features.DisableFeatures({ChromeFeatureList.ANDROID_IMPROVED_BOOKMARKS})
+    @Features.EnableFeatures({ChromeFeatureList.BOOKMARKS_REFRESH})
+    public void legacyVisualFlags_noShopping() {
+        ShoppingFeatures.setShoppingListEligibleForTesting(false);
+
+        // Nothing has been written to shared prefs manager.
+        Assert.assertEquals(
+                BookmarkRowDisplayPref.COMPACT, mBookmarkUiPrefs.getBookmarkRowDisplayPref());
+        // It should also persist that value to prefs.
+        verify(mSharedPreferencesManager, times(0))
+                .writeInt(eq(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF), anyInt());
+    }
+
+    @Test
+    public void initialBookmarkRowDisplayPref() {
+        // Nothing has been written to shared prefs manager.
+        Assert.assertEquals(
+                BookmarkRowDisplayPref.COMPACT, mBookmarkUiPrefs.getBookmarkRowDisplayPref());
+        // It should also persist that value to prefs.
+        verify(mSharedPreferencesManager)
+                .writeInt(
+                        ChromePreferenceKeys.BOOKMARK_VISUALS_PREF, BookmarkRowDisplayPref.COMPACT);
+    }
+
+    @Test
+    public void returnsStoredPref() {
+        doReturn(true)
+                .when(mSharedPreferencesManager)
+                .contains(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF);
+        doReturn(BookmarkRowDisplayPref.VISUAL)
+                .when(mSharedPreferencesManager)
+                .readInt(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF);
+
+        // Nothing has been written to shared prefs manager.
+        Assert.assertEquals(
+                BookmarkRowDisplayPref.VISUAL, mBookmarkUiPrefs.getBookmarkRowDisplayPref());
+        // It shouldn't persist that value to prefs.
+        verify(mSharedPreferencesManager, times(0))
+                .writeInt(eq(ChromePreferenceKeys.BOOKMARK_VISUALS_PREF), anyInt());
+    }
+
+    @Test
+    public void setBookmarkRowDisplayPref() {
+        BookmarkUiPrefs.Observer obs = Mockito.mock(BookmarkUiPrefs.Observer.class);
+
+        mBookmarkUiPrefs.addObserver(obs);
+        mBookmarkUiPrefs.setBookmarkRowDisplayPref(BookmarkRowDisplayPref.COMPACT);
+        verify(obs).onBookmarkRowDisplayPrefChanged();
+
+        mBookmarkUiPrefs.removeObserver(obs);
+        mBookmarkUiPrefs.setBookmarkRowDisplayPref(BookmarkRowDisplayPref.COMPACT);
+        // The observer method shouldn't have been called again.
+        verify(obs, times(1)).onBookmarkRowDisplayPrefChanged();
+    }
+}

chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManagerTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManagerTest.java
index 48af58e1..b8e727a2 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManagerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabDisplayManagerTest.java
@@ -539,5 +539,12 @@
         LocalizationUtils.setRtlForTesting(true);
         assertEquals(R.anim.slide_in_left,
                 PartialCustomTabDisplayManager.getStartAnimationOverride(act, provider, defId));
+
+        // BOTTOM_SHEET -> slide up (with height and width set, compact portrait)
+        mPCCTTestRule.configCompactDevice_Portrait();
+        when(provider.getInitialActivityWidth()).thenReturn(500);
+        when(provider.getActivityBreakPoint()).thenReturn(50);
+        assertEquals(R.anim.slide_in_up,
+                PartialCustomTabDisplayManager.getStartAnimationOverride(act, provider, defId));
     }
 }

chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java
index cf9ebb87..942fc04 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabTestRule.java
@@ -89,6 +89,8 @@
     static final int DEVICE_WIDTH_MEDIUM = 700;
     static final int DEVICE_WIDTH_COMPACT = 500;
     static final int DEVICE_HEIGHT_COMPACT = 300;
+    static final int DEVICE_WIDTH_COMPACT_PORTRAIT = DEVICE_HEIGHT_COMPACT;
+    static final int DEVICE_HEIGHT_COMPACT_PORTRAIT = DEVICE_WIDTH_COMPACT;
 
     @Mock
     Activity mActivity;
@@ -296,6 +298,14 @@
         when(mContentFrame.getHeight()).thenReturn(DEVICE_WIDTH_COMPACT);
     }
 
+    public void configCompactDevice_Portrait() {
+        mConfiguration.orientation = Configuration.ORIENTATION_PORTRAIT;
+        mRealMetrics.widthPixels = DEVICE_WIDTH_COMPACT_PORTRAIT;
+        mRealMetrics.heightPixels = DEVICE_HEIGHT_COMPACT_PORTRAIT;
+        mDisplaySize.set(DEVICE_WIDTH_COMPACT_PORTRAIT, DEVICE_HEIGHT_COMPACT_PORTRAIT);
+        when(mContentFrame.getHeight()).thenReturn(DEVICE_HEIGHT_COMPACT_PORTRAIT);
+    }
+
     public void verifyWindowFlagsSet() {
         verify(mWindow).addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
         verify(mWindow).clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);

chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceMediatorTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceMediatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceMediatorTest.java
index 7e4dea3..686d55b 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceMediatorTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceMediatorTest.java
@@ -53,9 +53,9 @@
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
+import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType;
 import org.chromium.chrome.browser.xsurface.HybridListRenderer;
 import org.chromium.chrome.browser.xsurface.ListLayoutHelper;
-import org.chromium.chrome.browser.xsurface.feed.StreamType;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
 import org.chromium.components.feed.proto.wire.ReliabilityLoggingEnums.DiscoverLaunchResult;

chrome/android/junit/src/org/chromium/chrome/browser/sync/SyncErrorNotifierTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/sync/SyncErrorNotifierTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/sync/SyncErrorNotifierTest.java
new file mode 100644
index 0000000..d6df7dab
--- /dev/null
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/sync/SyncErrorNotifierTest.java
@@ -0,0 +1,191 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+package org.chromium.chrome.browser.sync;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.test.filters.SmallTest;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.shadows.ShadowLooper;
+
+import org.chromium.base.ContextUtils;
+import org.chromium.base.Promise;
+import org.chromium.base.test.BaseRobolectricTestRunner;
+import org.chromium.chrome.R;
+import org.chromium.components.browser_ui.notifications.NotificationManagerProxy;
+import org.chromium.components.browser_ui.notifications.NotificationWrapper;
+import org.chromium.components.signin.base.CoreAccountInfo;
+import org.chromium.components.sync.PassphraseType;
+
+/** Unit tests for {@link SyncErrorNotifier}. */
+@RunWith(BaseRobolectricTestRunner.class)
+public class SyncErrorNotifierTest {
+    @Rule
+    public final MockitoRule mockitoRule = MockitoJUnit.rule();
+
+    private final Context mContext = ContextUtils.getApplicationContext();
+
+    @Mock
+    private NotificationManagerProxy mNotificationManagerProxy;
+    @Mock
+    private SyncService mSyncService;
+    @Mock
+    private TrustedVaultClient mTrustedVaultClient;
+
+    @Captor
+    private ArgumentCaptor<NotificationWrapper> mNotificationWrapperCaptor;
+
+    @Test
+    @SmallTest
+    public void testNoNotification() {
+        when(mSyncService.getAccountInfo()).thenReturn(null);
+        when(mSyncService.isSyncFeatureEnabled()).thenReturn(false);
+        when(mSyncService.isEngineInitialized()).thenReturn(false);
+        when(mSyncService.isEncryptEverythingEnabled()).thenReturn(false);
+        when(mSyncService.isPassphraseRequiredForPreferredDataTypes()).thenReturn(false);
+        when(mSyncService.isPassphrasePromptMutedForCurrentProductVersion()).thenReturn(false);
+        when(mSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()).thenReturn(false);
+        when(mSyncService.getPassphraseType()).thenReturn(PassphraseType.IMPLICIT_PASSPHRASE);
+
+        SyncErrorNotifier notifier =
+                new SyncErrorNotifier(mNotificationManagerProxy, mSyncService, mTrustedVaultClient);
+        notifier.syncStateChanged();
+
+        verify(mNotificationManagerProxy, Mockito.times(0)).notify(any());
+    }
+
+    @Test
+    @SmallTest
+    public void testPassphraseNotification() {
+        when(mSyncService.getAccountInfo())
+                .thenReturn(CoreAccountInfo.createFromEmailAndGaiaId("a@b.com", "gaiaId"));
+        when(mSyncService.isSyncFeatureEnabled()).thenReturn(true);
+        when(mSyncService.isEngineInitialized()).thenReturn(true);
+        when(mSyncService.isEncryptEverythingEnabled()).thenReturn(true);
+        when(mSyncService.isPassphraseRequiredForPreferredDataTypes()).thenReturn(true);
+        when(mSyncService.isPassphrasePromptMutedForCurrentProductVersion()).thenReturn(false);
+        when(mSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()).thenReturn(false);
+        when(mSyncService.getPassphraseType()).thenReturn(PassphraseType.CUSTOM_PASSPHRASE);
+
+        SyncErrorNotifier notifier =
+                new SyncErrorNotifier(mNotificationManagerProxy, mSyncService, mTrustedVaultClient);
+        notifier.syncStateChanged();
+
+        verify(mSyncService).markPassphrasePromptMutedForCurrentProductVersion();
+        verify(mNotificationManagerProxy).notify(mNotificationWrapperCaptor.capture());
+        Bundle notificationExtras = mNotificationWrapperCaptor.getValue().getNotification().extras;
+        assertEquals(notificationExtras.getCharSequence(Notification.EXTRA_TITLE),
+                mContext.getString(R.string.sync_error_card_title));
+        assertEquals(notificationExtras.getCharSequence(Notification.EXTRA_TEXT),
+                mContext.getString(R.string.hint_passphrase_required));
+    }
+
+    @Test
+    @SmallTest
+    public void testPassphraseNotificationMuted() {
+        when(mSyncService.getAccountInfo())
+                .thenReturn(CoreAccountInfo.createFromEmailAndGaiaId("a@b.com", "gaiaId"));
+        when(mSyncService.isSyncFeatureEnabled()).thenReturn(true);
+        when(mSyncService.isEngineInitialized()).thenReturn(true);
+        when(mSyncService.isEncryptEverythingEnabled()).thenReturn(true);
+        when(mSyncService.isPassphraseRequiredForPreferredDataTypes()).thenReturn(true);
+        when(mSyncService.isPassphrasePromptMutedForCurrentProductVersion()).thenReturn(true);
+        when(mSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()).thenReturn(false);
+        when(mSyncService.getPassphraseType()).thenReturn(PassphraseType.CUSTOM_PASSPHRASE);
+
+        SyncErrorNotifier notifier =
+                new SyncErrorNotifier(mNotificationManagerProxy, mSyncService, mTrustedVaultClient);
+        notifier.syncStateChanged();
+
+        verify(mNotificationManagerProxy, Mockito.times(0)).notify(any());
+    }
+
+    @Test
+    @SmallTest
+    public void testTrustedVaultNotificationForPasswords() {
+        when(mSyncService.getAccountInfo())
+                .thenReturn(CoreAccountInfo.createFromEmailAndGaiaId("a@b.com", "gaiaId"));
+        when(mSyncService.isSyncFeatureEnabled()).thenReturn(true);
+        when(mSyncService.isEngineInitialized()).thenReturn(true);
+        when(mSyncService.isEncryptEverythingEnabled()).thenReturn(false);
+        when(mSyncService.isPassphraseRequiredForPreferredDataTypes()).thenReturn(false);
+        when(mSyncService.isPassphrasePromptMutedForCurrentProductVersion()).thenReturn(false);
+        when(mSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()).thenReturn(true);
+        when(mSyncService.getPassphraseType()).thenReturn(PassphraseType.TRUSTED_VAULT_PASSPHRASE);
+        Promise<PendingIntent> intentPromise = new Promise<>();
+        when(mTrustedVaultClient.createKeyRetrievalIntent(any())).thenReturn(intentPromise);
+
+        SyncErrorNotifier notifier =
+                new SyncErrorNotifier(mNotificationManagerProxy, mSyncService, mTrustedVaultClient);
+        notifier.syncStateChanged();
+
+        // Client started creating the intent but hasn't finished yet, so no notification.
+        verify(mTrustedVaultClient).createKeyRetrievalIntent(any());
+        verify(mNotificationManagerProxy, Mockito.times(0)).notify(any());
+
+        notifier.syncStateChanged();
+
+        // New calls to createKeyRetrievalIntent() must be suppressed because the first one is still
+        // in flight. No notification yet.
+        verify(mTrustedVaultClient).createKeyRetrievalIntent(any());
+        verify(mNotificationManagerProxy, Mockito.times(0)).notify(any());
+
+        // Return the intent (can be null as it's unused by the test).
+        intentPromise.fulfill(null);
+        ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+
+        // Notification must be shown now.
+        verify(mNotificationManagerProxy).notify(mNotificationWrapperCaptor.capture());
+        Bundle notificationExtras = mNotificationWrapperCaptor.getValue().getNotification().extras;
+        assertEquals(notificationExtras.getCharSequence(Notification.EXTRA_TITLE),
+                mContext.getString(R.string.password_sync_error_summary));
+        assertEquals(notificationExtras.getCharSequence(Notification.EXTRA_TEXT),
+                mContext.getString(R.string.hint_sync_retrieve_keys_for_passwords));
+    }
+
+    @Test
+    @SmallTest
+    public void testTrustedVaultNotificationForEverything() {
+        when(mSyncService.getAccountInfo())
+                .thenReturn(CoreAccountInfo.createFromEmailAndGaiaId("a@b.com", "gaiaId"));
+        when(mSyncService.isSyncFeatureEnabled()).thenReturn(true);
+        when(mSyncService.isEngineInitialized()).thenReturn(true);
+        when(mSyncService.isEncryptEverythingEnabled()).thenReturn(true);
+        when(mSyncService.isPassphraseRequiredForPreferredDataTypes()).thenReturn(false);
+        when(mSyncService.isPassphrasePromptMutedForCurrentProductVersion()).thenReturn(false);
+        when(mSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()).thenReturn(true);
+        when(mSyncService.getPassphraseType()).thenReturn(PassphraseType.TRUSTED_VAULT_PASSPHRASE);
+        when(mTrustedVaultClient.createKeyRetrievalIntent(any()))
+                .thenReturn(Promise.fulfilled(null));
+
+        SyncErrorNotifier notifier =
+                new SyncErrorNotifier(mNotificationManagerProxy, mSyncService, mTrustedVaultClient);
+        notifier.syncStateChanged();
+        ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+
+        verify(mNotificationManagerProxy).notify(mNotificationWrapperCaptor.capture());
+        Bundle notificationExtras = mNotificationWrapperCaptor.getValue().getNotification().extras;
+        assertEquals(notificationExtras.getCharSequence(Notification.EXTRA_TITLE),
+                mContext.getString(R.string.sync_error_card_title));
+        assertEquals(notificationExtras.getCharSequence(Notification.EXTRA_TEXT),
+                mContext.getString(R.string.hint_sync_retrieve_keys_for_everything));
+    }
+}

chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index ec470021..49ee880 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -809,7 +809,10 @@
     // This lives here rather than in ChromeBrowserMainExtraPartsLacros due to
     // timing constraints. If we relocate it, then the flags aren't propagated
     // to the GPU process.
-    if (init_params->BuildFlags().has_value()) {
+    // All the flags in the block below relate to HW protected content, which
+    // require OOP video decoding as well.
+    if (init_params->BuildFlags().has_value() &&
+        init_params->OopVideoDecodingEnabled()) {
       for (auto flag : init_params->BuildFlags().value()) {
         switch (flag) {
           case crosapi::mojom::BuildFlag::kUnknown:

chrome/app/chromeos_strings.grdp

diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index 4bef0bf3..cb3e703a 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -6579,6 +6579,24 @@
     Scroll with two fingers on your touchpad in this area
   </message>
 
+  <!-- Display Size -->
+  <!-- TODO(b/258503542): Remove translateable tags when strings are finalized. -->
+  <message name="IDS_OOBE_DISPLAY_SIZE_TITLE" desc="Title of the display size screen." translateable="false">
+    Change text size
+  </message>
+  <message name="IDS_OOBE_DISPLAY_SIZE_DESCRIPTION" desc="Description of the display size screen." translateable="false">
+    Adjust the display size to make items on your screen, including text, larger or smaller.
+  </message>
+   <message name="IDS_OOBE_DISPLAY_SIZE_DESCRIPTION_ADDITIONAL" desc="Additional description of the display size screen." translateable="false">
+    You can also find this later in Settings &gt; Device &gt; Displays.
+  </message>
+  <message name="IDS_OOBE_DISPLAY_SIZE_SLIDER_TITLE" desc="Title of the zoom levels slider in the display size screen." translateable="false">
+    Display Size
+  </message>
+  <message name="IDS_OOBE_DISPLAY_SIZE_SLIDER_DESCRIPTION" desc="Description of the zoom levels slider in the display size screen." translateable="false">
+    Make everything bigger or smaller
+  </message>
+
   <!-- Strings for the locale switch notification inside the OOBE. -->
   <message name="IDS_LOCALE_SWITCH_NOTIFICATION_TITLE" desc="Title of the notification that is displayed at the bottom-right corner of the screen.">
     Switch device language?

chrome/browser/BUILD.gn

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index ccd886e..1084b3a 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7427,8 +7427,6 @@
       "supervised_user/chrome_supervised_user_web_content_handler_base.h",
       "supervised_user/kids_chrome_management/kids_chrome_management_client_factory.cc",
       "supervised_user/kids_chrome_management/kids_chrome_management_client_factory.h",
-      "supervised_user/kids_chrome_management/kids_external_fetcher.cc",
-      "supervised_user/kids_chrome_management/kids_external_fetcher.h",
       "supervised_user/kids_chrome_management/kids_management_service.cc",
       "supervised_user/kids_chrome_management/kids_management_service.h",
       "supervised_user/kids_chrome_management/kids_profile_manager.cc",

chrome/browser/about_flags.cc

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 47fc9fab..fd90aee 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -5397,6 +5397,9 @@
     {"print-management-jelly", flag_descriptions::kPrintManagementJellyName,
      flag_descriptions::kPrintManagementJellyDescription, kOsCrOS,
      FEATURE_VALUE_TYPE(ash::features::kPrintManagementJelly)},
+    {"printer-settings-revamp", flag_descriptions::kPrinterSettingsRevampName,
+     flag_descriptions::kPrinterSettingsRevampDescription, kOsCrOS,
+     FEATURE_VALUE_TYPE(ash::features::kPrinterSettingsRevamp)},
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 #if BUILDFLAG(IS_MAC)
@@ -6924,6 +6927,10 @@
      kOsAndroid,
      FEATURE_VALUE_TYPE(switches::kGaiaIdCacheInAccountManagerFacade)},
 
+    {"gainmap-hdr-images", flag_descriptions::kGainmapHdrImagesName,
+     flag_descriptions::kGainmapHdrImagesDescription, kOsAll,
+     FEATURE_VALUE_TYPE(blink::features::kGainmapHdrImages)},
+
     {"tangible-sync", flag_descriptions::kTangibleSyncName,
      flag_descriptions::kTangibleSyncDescription, kOsAndroid,
      FEATURE_WITH_PARAMS_VALUE_TYPE(switches::kTangibleSync,
@@ -9706,6 +9713,16 @@
      MULTI_VALUE_TYPE(kPrintingPpdChannelChoices)},
 #endif
 
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
+    {"data-retention-policies-disable-sync-types-needed",
+     flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
+     flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
+     kOsLinux | kOsWin | kOsMac | kOsCrOS | kOsAndroid,
+     FEATURE_VALUE_TYPE(browsing_data::features::
+                            kDataRetentionPoliciesDisableSyncTypesNeeded)},
+#endif
+
     {"storage-buckets", flag_descriptions::kStorageBucketsName,
      flag_descriptions::kStorageBucketsDescription, kOsAll,
      FEATURE_VALUE_TYPE(blink::features::kStorageBuckets)},

chrome/browser/apps/app_service/browser_app_launcher.cc

diff --git a/chrome/browser/apps/app_service/browser_app_launcher.cc b/chrome/browser/apps/app_service/browser_app_launcher.cc
index 76d401f..4cb10b2 100644
--- a/chrome/browser/apps/app_service/browser_app_launcher.cc
+++ b/chrome/browser/apps/app_service/browser_app_launcher.cc
@@ -46,15 +46,15 @@
     Profile* profile,
     int restore_id,
     apps::AppLaunchParams params_for_restore,
-    Browser* browser,
-    content::WebContents* web_contents,
+    base::WeakPtr<Browser> browser,
+    base::WeakPtr<content::WebContents> web_contents,
     apps::LaunchContainer launch_container) {
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   if (!SessionID::IsValidValue(restore_id)) {
     RecordAppLaunchMetrics(
         profile, apps::AppType::kWeb, params_for_restore.app_id,
         params_for_restore.launch_source, params_for_restore.container);
-    std::move(callback).Run(web_contents);
+    std::move(callback).Run(web_contents.get());
     return;
   }
 
@@ -62,9 +62,10 @@
       profile, apps::AppType::kWeb, params_for_restore.app_id,
       apps::LaunchSource::kFromFullRestore, params_for_restore.container);
 
-  int session_id = apps::GetSessionIdForRestoreFromWebContents(web_contents);
+  int session_id =
+      apps::GetSessionIdForRestoreFromWebContents(web_contents.get());
   if (!SessionID::IsValidValue(session_id)) {
-    std::move(callback).Run(web_contents);
+    std::move(callback).Run(web_contents.get());
     return;
   }
 
@@ -78,7 +79,7 @@
   full_restore::SaveAppLaunchInfo(profile->GetPath(), std::move(launch_info));
 
 #endif
-  std::move(callback).Run(web_contents);
+  std::move(callback).Run(web_contents.get());
 }
 
 void LaunchAppWithParamsImpl(

chrome/browser/apps/app_shim/app_shim_manager_mac.cc

diff --git a/chrome/browser/apps/app_shim/app_shim_manager_mac.cc b/chrome/browser/apps/app_shim/app_shim_manager_mac.cc
index d370eef5..b75046d 100644
--- a/chrome/browser/apps/app_shim/app_shim_manager_mac.cc
+++ b/chrome/browser/apps/app_shim/app_shim_manager_mac.cc
@@ -11,6 +11,7 @@
 #include <utility>
 
 #include "apps/app_lifetime_monitor_factory.h"
+#include "base/barrier_closure.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
@@ -253,10 +254,28 @@
   return a->menu_index < b->menu_index;
 }
 
+// Used by tests to be informed when launching an app shim has finished.
+base::OnceClosure& GetShimStartupDoneCallback() {
+  static base::NoDestructor<base::OnceClosure> instance;
+  return *instance;
+}
+
+base::OnceClosure TakeShimStartupDoneCallbackOrDoNothing() {
+  if (GetShimStartupDoneCallback()) {
+    return std::move(GetShimStartupDoneCallback());
+  }
+  return base::DoNothing();
+}
+
 }  // namespace
 
 namespace apps {
 
+void SetMacShimStartupDoneCallbackForTesting(base::OnceClosure callback) {
+  DCHECK(!GetShimStartupDoneCallback());
+  GetShimStartupDoneCallback() = std::move(callback);
+}
+
 // The state for an individual (app, Profile) pair. This includes the
 // AppShimHost.
 struct AppShimManager::ProfileState {
@@ -586,6 +605,7 @@
           profile_path, params, profiles_with_handlers, &launch_callback)) {
     // If we used an existing profile, |launch_callback| should have been run.
     DCHECK(!launch_callback);
+    DCHECK(!GetShimStartupDoneCallback());
     return;
   }
 
@@ -708,7 +728,8 @@
   DCHECK(profile);
 
   // Launch the app, if appropriate.
-  LoadAndLaunchApp_LaunchIfAppropriate(profile, profile_state, params);
+  LoadAndLaunchApp_LaunchIfAppropriate(
+      profile, profile_state, params, TakeShimStartupDoneCallbackOrDoNothing());
 
   std::move(*launch_callback)
       .Run(profile_state, chrome::mojom::AppShimLaunchResult::kSuccess);
@@ -725,10 +746,15 @@
   // recent reason for a failure (if any) in |launch_result|.
   ProfileState* launched_profile_state = nullptr;
   auto launch_result = chrome::mojom::AppShimLaunchResult::kProfileNotFound;
+  auto barrier = base::BarrierClosure(profile_paths_to_launch.size(),
+                                      TakeShimStartupDoneCallbackOrDoNothing());
+
   for (size_t iter = 0; iter < profile_paths_to_launch.size(); ++iter) {
+    base::ScopedClosureRunner launch_finished(barrier);
     const base::FilePath& profile_path = profile_paths_to_launch[iter];
-    if (profile_path.empty())
+    if (profile_path.empty()) {
       continue;
+    }
     if (IsProfileLockedForPath(profile_path)) {
       launch_result = chrome::mojom::AppShimLaunchResult::kProfileLocked;
       continue;
@@ -746,25 +772,31 @@
     // Create a ProfileState for this app, if appropriate (e.g, not for
     // open-in-a-tab bookmark apps).
     ProfileState* profile_state = nullptr;
-    if (delegate_->AppCanCreateHost(profile, params.app_id))
+    if (delegate_->AppCanCreateHost(profile, params.app_id)) {
       profile_state = GetOrCreateProfileState(profile, params.app_id);
+    }
 
     // Launch the app, if appropriate.
-    LoadAndLaunchApp_LaunchIfAppropriate(profile, profile_state, params);
+    LoadAndLaunchApp_LaunchIfAppropriate(profile, profile_state, params,
+                                         launch_finished.Release());
 
     // If we successfully created a profile state, save it for |bootstrap| to
     // connect to once all launches are done.
-    if (profile_state)
+    if (profile_state) {
       launched_profile_state = profile_state;
-    else
+    } else {
       launch_result = chrome::mojom::AppShimLaunchResult::kSuccessAndDisconnect;
+    }
 
     // If files or urls were specified, only open one new window.
-    if (params.HasFilesOrURLs())
-      break;
+    // If this was the profile specified in the bootstrap, also stop here.
+    if (params.HasFilesOrURLs() ||
+        (first_profile_is_from_bootstrap && iter == 0)) {
+      // Trigger barrier for remaining profiles we didn't launch in.
+      for (size_t i = iter + 1; i < profile_paths_to_launch.size(); ++i) {
+        barrier.Run();
+      }
 
-    // If this was the profile specified in the bootstrap, stop here.
-    if (first_profile_is_from_bootstrap && iter == 0) {
       break;
     }
   }
@@ -836,7 +868,8 @@
 void AppShimManager::LoadAndLaunchApp_LaunchIfAppropriate(
     Profile* profile,
     ProfileState* profile_state,
-    const LoadAndLaunchAppParams& params) {
+    const LoadAndLaunchAppParams& params,
+    base::OnceClosure launch_finished_callback) {
   // If `params.files`, `params.urls` or `params.override_url` is non-empty,
   // then always do a launch to open the files or URL(s).
   bool do_launch = params.HasFilesOrURLs();
@@ -850,10 +883,12 @@
       Browser* browser = nullptr;
       for (auto it = browsers->begin_browsers_ordered_by_activation();
            it != browsers->end_browsers_ordered_by_activation(); ++it) {
-        if ((*it)->profile() != profile)
+        if ((*it)->profile() != profile) {
           continue;
-        if (!web_app::AppBrowserController::IsForWebApp(*it, params.app_id))
+        }
+        if (!web_app::AppBrowserController::IsForWebApp(*it, params.app_id)) {
           continue;
+        }
         browser = *it;
         break;
       }
@@ -861,20 +896,25 @@
       // If iterating the browsers by activation order didn't find any matching
       // windows fall back to showing an arbitrary one from our ProfileState
       // instead.
-      if (!browser)
+      if (!browser) {
         browser = *(profile_state->browsers.begin());
+      }
 
       browser->window()->Show();
       had_windows = true;
     }
 
-    if (!had_windows)
+    if (!had_windows) {
       do_launch = true;
+    }
   }
 
   if (do_launch) {
     delegate_->LaunchApp(profile, params.app_id, params.files, params.urls,
-                         params.override_url, params.login_item_restore_state);
+                         params.override_url, params.login_item_restore_state,
+                         std::move(launch_finished_callback));
+  } else {
+    std::move(launch_finished_callback).Run();
   }
 }
 

chrome/browser/apps/app_shim/app_shim_manager_mac.h

diff --git a/chrome/browser/apps/app_shim/app_shim_manager_mac.h b/chrome/browser/apps/app_shim/app_shim_manager_mac.h
index 94bcdc6..f263f21 100644
--- a/chrome/browser/apps/app_shim/app_shim_manager_mac.h
+++ b/chrome/browser/apps/app_shim/app_shim_manager_mac.h
@@ -42,6 +42,11 @@
 
 namespace apps {
 
+// The passed in `callback` will be called when all launches for the next app
+// shim launch have completed (all profiles the app will launch in, as well
+// as possibly multiple windows within profiles).
+void SetMacShimStartupDoneCallbackForTesting(base::OnceClosure callback);
+
 // This app shim handler that handles events for app shims that correspond to an
 // extension.
 class AppShimManager : public AppShimHostBootstrap::Client,
@@ -96,13 +101,14 @@
     // Launch the app in Chrome. This will (often) create a new window. It is
     // guaranteed that |app_id| is installed for |profile| when this method
     // is called.
-    virtual void LaunchApp(Profile* profile,
-                           const web_app::AppId& app_id,
-                           const std::vector<base::FilePath>& files,
-                           const std::vector<GURL>& urls,
-                           const GURL& override_url,
-                           chrome::mojom::AppShimLoginItemRestoreState
-                               login_item_restore_state) = 0;
+    virtual void LaunchApp(
+        Profile* profile,
+        const web_app::AppId& app_id,
+        const std::vector<base::FilePath>& files,
+        const std::vector<GURL>& urls,
+        const GURL& override_url,
+        chrome::mojom::AppShimLoginItemRestoreState login_item_restore_state,
+        base::OnceClosure launch_finished_callback) = 0;
 
     // Launch the shim process for an app. It is guaranteed that |app_id| is
     // installed for |profile| when this method is called.
@@ -343,7 +349,8 @@
   void LoadAndLaunchApp_LaunchIfAppropriate(
       Profile* profile,
       ProfileState* profile_state,
-      const LoadAndLaunchAppParams& params);
+      const LoadAndLaunchAppParams& params,
+      base::OnceClosure launch_finished_callback);
 
   // The final step of both paths for OnShimProcessConnected. This will connect
   // |bootstrap| to |profile_state|'s AppShimHost, if possible. The value of

chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc

diff --git a/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc b/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc
index 120604ad..cdd7c2d 100644
--- a/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc
+++ b/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc
@@ -57,13 +57,14 @@
   MOCK_METHOD2(AppIsMultiProfile, bool(Profile*, const std::string&));
   MOCK_METHOD3(EnableExtension,
                void(Profile*, const std::string&, base::OnceCallback<void()>));
-  MOCK_METHOD6(LaunchApp,
+  MOCK_METHOD7(LaunchApp,
                void(Profile*,
                     const std::string& app_id,
                     const std::vector<base::FilePath>&,
                     const std::vector<GURL>&,
                     const GURL&,
-                    chrome::mojom::AppShimLoginItemRestoreState));
+                    chrome::mojom::AppShimLoginItemRestoreState,
+                    base::OnceClosure));
   MOCK_METHOD2(GetAppShortcutsMenuItemInfos,
                std::vector<chrome::mojom::ApplicationDockMenuItemPtr>(
                    Profile*,
@@ -437,7 +438,7 @@
         .WillRepeatedly(Return(false));
     EXPECT_CALL(*delegate_, AppIsInstalled(_, kTestAppIdB))
         .WillRepeatedly(Return(true));
-    EXPECT_CALL(*delegate_, LaunchApp(_, _, _, _, _, _))
+    EXPECT_CALL(*delegate_, LaunchApp(_, _, _, _, _, _, _))
         .WillRepeatedly(Return());
   }
 
@@ -632,7 +633,7 @@
   std::vector<GURL> some_url(1, GURL("web+test://foo"));
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdB, some_file, some_url, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone));
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _));
   DoShimLaunch(bootstrap_bb_, std::move(host_bb_unique_),
                chrome::mojom::AppShimLaunchType::kNormal, some_file, some_url,
                chrome::mojom::AppShimLoginItemRestoreState::kNone);
@@ -672,7 +673,7 @@
   EXPECT_CALL(
       *delegate_,
       LaunchApp(&profile_b_, kTestAppIdB, some_file, some_url, _,
-                chrome::mojom::AppShimLoginItemRestoreState::kWindowed));
+                chrome::mojom::AppShimLoginItemRestoreState::kWindowed, _));
   DoShimLaunch(bootstrap_bb_, std::move(host_bb_unique_),
                chrome::mojom::AppShimLaunchType::kNormal, some_file, some_url,
                chrome::mojom::AppShimLoginItemRestoreState::kWindowed);
@@ -752,7 +753,7 @@
 
   // Normal shim launch adds an entry in the map.
   // App should not be launched here, but return success to the shim.
-  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _))
+  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _, _))
       .Times(0);
   RegisterOnlyLaunch(bootstrap_aa_, nullptr);
   EXPECT_EQ(chrome::mojom::AppShimLaunchResult::kSuccess,
@@ -762,14 +763,14 @@
   // Return no app windows for OnShimFocus. This will do nothing.
   EXPECT_CALL(*delegate_, ShowAppWindows(&profile_a_, kTestAppIdA))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _))
+  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _, _))
       .Times(0);
   ShimNormalFocus(host_aa_.get());
 
   // Return no app windows for OnShimReopen. This will result in a launch call.
   EXPECT_CALL(*delegate_, ShowAppWindows(&profile_a_, kTestAppIdA))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _))
+  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _, _))
       .Times(1);
   host_aa_->ReopenApp();
 
@@ -778,7 +779,7 @@
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   host_aa_->ReopenApp();
 
@@ -787,7 +788,7 @@
   EXPECT_CALL(
       *delegate_,
       LaunchApp(&profile_a_, kTestAppIdA, some_file, std::vector<GURL>(),
-                GURL(), chrome::mojom::AppShimLoginItemRestoreState::kNone));
+                GURL(), chrome::mojom::AppShimLoginItemRestoreState::kNone, _));
   host_aa_->FilesOpened(some_file);
 
   // Open urls should trigger a launch with those urls
@@ -795,7 +796,7 @@
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, std::vector<base::FilePath>(),
                         some_url, GURL(),
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone));
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _));
   host_aa_->UrlsOpened(some_url);
 
   // Open app with override url should trigger a launch with that url
@@ -803,7 +804,7 @@
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, std::vector<base::FilePath>(),
                         std::vector<GURL>(), some_override_url,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone));
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _));
   host_aa_->OpenAppWithOverrideUrl(some_override_url);
 
   // OnAppDeactivated should not close the shim.
@@ -830,7 +831,7 @@
 
   // Normal shim launch adds an entry in the map.
   // App should not be launched here, but return success to the shim.
-  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _))
+  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _, _))
       .Times(0);
   RegisterOnlyLaunch(bootstrap_aa_, nullptr);
   EXPECT_EQ(chrome::mojom::AppShimLaunchResult::kSuccess,
@@ -840,42 +841,42 @@
   // Return no app windows for OnShimFocus. This will do nothing.
   EXPECT_CALL(*delegate_, ShowAppWindows(&profile_a_, kTestAppIdA))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _))
+  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _, _))
       .Times(0);
   ShimNormalFocus(host_aa_.get());
 
   // Return no app windows for OnShimReopen. This will result in a launch call.
   EXPECT_CALL(*delegate_, ShowAppWindows(&profile_a_, kTestAppIdA))
       .WillRepeatedly(Return(false));
-  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _))
+  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _, _))
       .Times(1);
   host_aa_->ReopenApp();
 
   // Return one window. This should do nothing.
   EXPECT_CALL(*delegate_, ShowAppWindows(&profile_a_, kTestAppIdA))
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _))
+  EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, _, _, _, _, _))
       .Times(0);
   host_aa_->ReopenApp();
 
   // Open files should trigger a launch with those files.
   std::vector<base::FilePath> some_file(1, base::FilePath("some_file"));
   EXPECT_CALL(*delegate_, LaunchApp(&profile_a_, kTestAppIdA, some_file,
-                                    std::vector<GURL>(), GURL(), _));
+                                    std::vector<GURL>(), GURL(), _, _));
   host_aa_->FilesOpened(some_file);
 
   // Open urls should trigger a launch with those urls
   std::vector<GURL> some_url(1, GURL("web+test://foo"));
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, std::vector<base::FilePath>(),
-                        some_url, GURL(), _));
+                        some_url, GURL(), _, _));
   host_aa_->UrlsOpened(some_url);
 
   // Open app with override url should trigger a launch with that url
   GURL some_override_url("https://some-override-url.com");
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, std::vector<base::FilePath>(),
-                        std::vector<GURL>(), some_override_url, _));
+                        std::vector<GURL>(), some_override_url, _, _));
   host_aa_->OpenAppWithOverrideUrl(some_override_url);
 
   // Process disconnect will cause the host to be deleted.
@@ -1073,7 +1074,7 @@
 TEST_F(AppShimManagerTest, RegisterOnly) {
   // For an chrome::mojom::AppShimLaunchType::kRegisterOnly, don't launch the
   // app.
-  EXPECT_CALL(*delegate_, LaunchApp(_, _, _, _, _, _)).Times(0);
+  EXPECT_CALL(*delegate_, LaunchApp(_, _, _, _, _, _, _)).Times(0);
   RegisterOnlyLaunch(bootstrap_aa_, std::move(host_aa_unique_));
   EXPECT_EQ(chrome::mojom::AppShimLaunchResult::kSuccess,
             *bootstrap_aa_result_);
@@ -1088,7 +1089,7 @@
   delegate_->SetAppCanCreateHost(false);
 
   // The app should be launched.
-  EXPECT_CALL(*delegate_, LaunchApp(_, _, _, _, _, _)).Times(1);
+  EXPECT_CALL(*delegate_, LaunchApp(_, _, _, _, _, _, _)).Times(1);
   NormalLaunch(bootstrap_ab_, std::move(host_ab_unique_));
   // But the bootstrap should be closed.
   EXPECT_EQ(chrome::mojom::AppShimLaunchResult::kSuccessAndDisconnect,
@@ -1142,7 +1143,7 @@
   // pre-existing host's launch result should be set.
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   EXPECT_FALSE(host_aa_->did_connect_to_host());
   DoShimLaunch(bootstrap_aa_, nullptr,
@@ -1256,7 +1257,7 @@
   // launched.
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone));
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _));
   host_aa_->ProfileSelectedFromMenu(profile_path_b_);
   EXPECT_CALL(*delegate_, DoLaunchShim(_, _, _)).Times(0);
   manager_->OnAppActivated(&profile_b_, kTestAppIdA);
@@ -1266,7 +1267,7 @@
   EXPECT_CALL(*delegate_, ShowAppWindows(_, _)).WillRepeatedly(Return(true));
   EXPECT_CALL(*delegate_,
               LaunchApp(_, _, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   host_aa_->ProfileSelectedFromMenu(profile_path_a_);
   host_aa_->ProfileSelectedFromMenu(profile_path_b_);
@@ -1319,7 +1320,7 @@
   // launched.
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone));
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _));
   host_aa_->ProfileSelectedFromMenu(profile_path_b_);
   EXPECT_CALL(*delegate_, DoLaunchShim(_, _, _)).Times(0);
   manager_->OnAppActivated(&profile_b_, kTestAppIdA);
@@ -1340,7 +1341,7 @@
   EXPECT_CALL(*delegate_, ShowAppWindows(_, _)).WillRepeatedly(Return(false));
   EXPECT_CALL(*delegate_,
               LaunchApp(_, _, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   host_aa_->ProfileSelectedFromMenu(profile_path_a_);
   EXPECT_TRUE(browser_window_a->did_show);
@@ -1377,7 +1378,7 @@
   // Launch the shim.
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   RegisterOnlyLaunch(bootstrap_aa_, nullptr);
   EXPECT_EQ(chrome::mojom::AppShimLaunchResult::kSuccess,
@@ -1435,11 +1436,11 @@
   manager_->SetHostForCreate(std::move(host_aa_unique_));
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(1);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   EXPECT_CALL(*delegate_, EnableExtension(&profile_c_, kTestAppIdA, _))
       .WillOnce(RunOnceCallback<2>());
@@ -1458,11 +1459,11 @@
   manager_->SetHostForCreate(std::move(host_aa_unique_));
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(1);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   NormalLaunch(bootstrap_xa_, nullptr);
   EXPECT_EQ(chrome::mojom::AppShimLaunchResult::kSuccess,
@@ -1490,15 +1491,15 @@
   // Launch the shim passing in several files.
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(1);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_c_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   DoShimLaunch(bootstrap_xa_, std::move(host_ba_unique_),
                chrome::mojom::AppShimLaunchType::kNormal,
@@ -1531,15 +1532,15 @@
   // Launch the shim passing in a file URL.
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(1);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_c_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   DoShimLaunch(bootstrap_xa_, std::move(host_aa_unique_),
                chrome::mojom::AppShimLaunchType::kNormal, {},
@@ -1570,15 +1571,15 @@
   // Launch the shim passing in a URL to be handled in profile B.
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_a_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_b_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(1);
   EXPECT_CALL(*delegate_,
               LaunchApp(&profile_c_, kTestAppIdA, _, _, _,
-                        chrome::mojom::AppShimLoginItemRestoreState::kNone))
+                        chrome::mojom::AppShimLoginItemRestoreState::kNone, _))
       .Times(0);
   DoShimLaunch(bootstrap_xa_, std::move(host_ba_unique_),
                chrome::mojom::AppShimLaunchType::kNormal, {},

chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.cc

diff --git a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.cc b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.cc
index 375f4970..54618f3 100644
--- a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.cc
+++ b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.cc
@@ -39,29 +39,16 @@
   return *instance;
 }
 
-base::OnceClosure& GetMacShimStartupDoneCallbackForTesting() {
-  static base::NoDestructor<base::OnceClosure> instance;
-  return *instance;
-}
-
-void OnShimLaunchResolved() {
-  if (GetMacShimStartupDoneCallbackForTesting())
-    std::move(GetMacShimStartupDoneCallbackForTesting()).Run();
-}
-
 // Launches the app specified by `params` and `file_launches` in the given
 // `profile`.
 void LaunchAppWithParams(
     Profile* profile,
     apps::AppLaunchParams params,
-    const WebAppFileHandlerManager::LaunchInfos& file_launches) {
-  auto callback =
-      GetMacShimStartupDoneCallbackForTesting()
-          ? std::move(GetMacShimStartupDoneCallbackForTesting())  // IN-TEST
-          : base::DoNothing();
+    const WebAppFileHandlerManager::LaunchInfos& file_launches,
+    base::OnceClosure launch_finished_callback) {
   if (!file_launches.empty()) {
-    auto barrier_callback =
-        base::BarrierClosure(file_launches.size(), std::move(callback));
+    auto barrier_callback = base::BarrierClosure(
+        file_launches.size(), std::move(launch_finished_callback));
     for (const auto& [url, files] : file_launches) {
       apps::AppLaunchParams params_copy(params.app_id, params.container,
                                         params.disposition,
@@ -85,13 +72,13 @@
 
   if (GetBrowserAppLauncherForTesting()) {
     GetBrowserAppLauncherForTesting().Run(params);
-    std::move(callback).Run();
+    std::move(launch_finished_callback).Run();
   } else {
     apps::AppServiceProxyFactory::GetForProfile(profile)
         ->BrowserAppLauncher()
-        ->LaunchAppWithParams(
-            std::move(params),
-            base::IgnoreArgs<content::WebContents*>(std::move(callback)));
+        ->LaunchAppWithParams(std::move(params),
+                              base::IgnoreArgs<content::WebContents*>(
+                                  std::move(launch_finished_callback)));
   }
 }
 
@@ -99,7 +86,6 @@
 // in the app shim exiting.
 void CancelAppLaunch(Profile* profile, const web_app::AppId& app_id) {
   apps::AppShimManager::Get()->OnAppLaunchCancelled(profile, app_id);
-  OnShimLaunchResolved();
 }
 
 // Called after the user's preference has been persisted, and the OS
@@ -108,11 +94,14 @@
     apps::AppLaunchParams params,
     const WebAppFileHandlerManager::LaunchInfos& file_launches,
     Profile* profile,
+    base::OnceClosure launch_finished_callback,
     bool allowed) {
   if (allowed) {
-    LaunchAppWithParams(profile, std::move(params), file_launches);
+    LaunchAppWithParams(profile, std::move(params), file_launches,
+                        std::move(launch_finished_callback));
   } else {
     CancelAppLaunch(profile, params.app_id);
+    std::move(launch_finished_callback).Run();
   }
 }
 
@@ -122,15 +111,16 @@
     apps::AppLaunchParams params,
     const WebAppFileHandlerManager::LaunchInfos& file_launches,
     Profile* profile,
+    base::OnceClosure launch_finished_callback,
     bool allowed,
     bool remember_user_choice) {
   absl::optional<GURL> protocol_url = params.protocol_handler_launch_url;
   const bool is_file_launch = !file_launches.empty();
   web_app::AppId app_id = params.app_id;
 
-  auto persist_done =
-      base::BindOnce(&OnPersistUserChoiceCompleted, std::move(params),
-                     file_launches, profile, allowed);
+  auto persist_done = base::BindOnce(
+      &OnPersistUserChoiceCompleted, std::move(params), file_launches, profile,
+      std::move(launch_finished_callback), allowed);
 
   if (remember_user_choice) {
     WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
@@ -157,10 +147,6 @@
   GetBrowserAppLauncherForTesting() = launcher;
 }
 
-void SetMacShimStartupDoneCallbackForTesting(base::OnceClosure callback) {
-  GetMacShimStartupDoneCallbackForTesting() = std::move(callback);  // IN-TEST
-}
-
 WebAppShimManagerDelegate::WebAppShimManagerDelegate(
     std::unique_ptr<apps::AppShimManager::Delegate> fallback_delegate)
     : fallback_delegate_(std::move(fallback_delegate)) {}
@@ -246,13 +232,18 @@
     const std::vector<base::FilePath>& files,
     const std::vector<GURL>& urls,
     const GURL& override_url,
-    chrome::mojom::AppShimLoginItemRestoreState login_item_restore_state) {
+    chrome::mojom::AppShimLoginItemRestoreState login_item_restore_state,
+    base::OnceClosure launch_finished_callback) {
   DCHECK(AppIsInstalled(profile, app_id));
   if (UseFallback(profile, app_id)) {
     fallback_delegate_->LaunchApp(profile, app_id, files, urls, override_url,
-                                  login_item_restore_state);
+                                  login_item_restore_state,
+                                  std::move(launch_finished_callback));
     return;
   }
+  base::ScopedClosureRunner run_launch_finished(
+      std::move(launch_finished_callback));
+
   DisplayMode effective_display_mode = WebAppProvider::GetForWebApps(profile)
                                            ->registrar_unsafe()
                                            .GetAppEffectiveDisplayMode(app_id);
@@ -317,7 +308,8 @@
                         .GetMatchingFileHandlerUrls(app_id, launch_files);
   }
   if (GetBrowserAppLauncherForTesting()) {
-    LaunchAppWithParams(profile, std::move(params), file_launches);
+    LaunchAppWithParams(profile, std::move(params), file_launches,
+                        run_launch_finished.Release());
     return;
   }
 
@@ -338,7 +330,8 @@
       chrome::ShowWebAppProtocolLaunchDialog(
           std::move(protocol_url), profile, app_id,
           base::BindOnce(&UserChoiceDialogCompleted, std::move(params),
-                         WebAppFileHandlerManager::LaunchInfos(), profile));
+                         WebAppFileHandlerManager::LaunchInfos(), profile,
+                         run_launch_finished.Release()));
       return;
     }
   }
@@ -354,7 +347,8 @@
       chrome::ShowWebAppFileLaunchDialog(
           launch_files, profile, app_id,
           base::BindOnce(&UserChoiceDialogCompleted, std::move(params),
-                         file_launches, profile));
+                         file_launches, profile,
+                         run_launch_finished.Release()));
       return;
     }
 
@@ -362,7 +356,8 @@
               web_app->file_handler_approval_state());
   }
 
-  LaunchAppWithParams(profile, std::move(params), file_launches);
+  LaunchAppWithParams(profile, std::move(params), file_launches,
+                      run_launch_finished.Release());
 }
 
 void WebAppShimManagerDelegate::LaunchShim(

chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h

diff --git a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h
index 29b836e..a6f89aa 100644
--- a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h
+++ b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h
@@ -27,8 +27,6 @@
 void SetBrowserAppLauncherForTesting(
     const BrowserAppLauncherForTesting& launcher);
 
-void SetMacShimStartupDoneCallbackForTesting(base::OnceClosure callback);
-
 class WebAppShimManagerDelegate : public apps::AppShimManager::Delegate {
  public:
   // AppShimManager::Delegate:
@@ -44,13 +42,14 @@
   void EnableExtension(Profile* profile,
                        const std::string& extension_id,
                        base::OnceCallback<void()> callback) override;
-  void LaunchApp(Profile* profile,
-                 const AppId& app_id,
-                 const std::vector<base::FilePath>& files,
-                 const std::vector<GURL>& urls,
-                 const GURL& override_url,
-                 chrome::mojom::AppShimLoginItemRestoreState
-                     login_item_restore_state) override;
+  void LaunchApp(
+      Profile* profile,
+      const AppId& app_id,
+      const std::vector<base::FilePath>& files,
+      const std::vector<GURL>& urls,
+      const GURL& override_url,
+      chrome::mojom::AppShimLoginItemRestoreState login_item_restore_state,
+      base::OnceClosure launch_finished_callback) override;
   void LaunchShim(Profile* profile,
                   const AppId& app_id,
                   bool recreate_shims,

chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc

diff --git a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc
index 6a126c98..beb2113 100644
--- a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc
+++ b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc
@@ -61,7 +61,8 @@
                const std::vector<base::FilePath>&,
                const std::vector<GURL>&,
                const GURL&,
-               chrome::mojom::AppShimLoginItemRestoreState),
+               chrome::mojom::AppShimLoginItemRestoreState,
+               base::OnceClosure),
               (override));
   MOCK_METHOD(void,
               LaunchShim,
@@ -199,7 +200,8 @@
 
   shim_manager.LaunchApp(profile(), AppId(), std::vector<base::FilePath>(),
                          std::vector<GURL>(), GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+                         chrome::mojom::AppShimLoginItemRestoreState::kNone,
+                         base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_ProtocolWebPrefix) {
@@ -221,7 +223,8 @@
 
   shim_manager.LaunchApp(profile(), AppId(), std::vector<base::FilePath>(),
                          {protocol_handler_launch_url}, GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+                         chrome::mojom::AppShimLoginItemRestoreState::kNone,
+                         base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_ProtocolMailTo) {
@@ -243,7 +246,8 @@
 
   shim_manager.LaunchApp(profile(), AppId(), std::vector<base::FilePath>(),
                          {protocol_handler_launch_url}, GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+                         chrome::mojom::AppShimLoginItemRestoreState::kNone,
+                         base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_ProtocolFile) {
@@ -264,7 +268,8 @@
 
   shim_manager.LaunchApp(profile(), AppId(), std::vector<base::FilePath>(),
                          {protocol_handler_launch_url}, GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+                         chrome::mojom::AppShimLoginItemRestoreState::kNone,
+                         base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_ProtocolDisallowed) {
@@ -284,7 +289,8 @@
 
   shim_manager.LaunchApp(profile(), AppId(), std::vector<base::FilePath>(),
                          {protocol_handler_launch_url}, GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+                         chrome::mojom::AppShimLoginItemRestoreState::kNone,
+                         base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_FileFullPath) {
@@ -305,9 +311,9 @@
         return nullptr;
       }));
 
-  shim_manager.LaunchApp(profile(), AppId(), {test_path}, std::vector<GURL>(),
-                         GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+  shim_manager.LaunchApp(
+      profile(), AppId(), {test_path}, std::vector<GURL>(), GURL(),
+      chrome::mojom::AppShimLoginItemRestoreState::kNone, base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_FileRelativePath) {
@@ -328,9 +334,9 @@
         return nullptr;
       }));
 
-  shim_manager.LaunchApp(profile(), AppId(), {test_path}, std::vector<GURL>(),
-                         GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+  shim_manager.LaunchApp(
+      profile(), AppId(), {test_path}, std::vector<GURL>(), GURL(),
+      chrome::mojom::AppShimLoginItemRestoreState::kNone, base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_FileHandlersLaunchType) {
@@ -363,7 +369,8 @@
       profile(), AppId(),
       {base::FilePath(kTestPathTxt), base::FilePath(kTestPathPng),
        base::FilePath(kTestPathTxt2), base::FilePath(kTestPathPng2)},
-      {}, GURL(), chrome::mojom::AppShimLoginItemRestoreState::kNone);
+      {}, GURL(), chrome::mojom::AppShimLoginItemRestoreState::kNone,
+      base::DoNothing());
   EXPECT_EQ(3, launches);
 }
 
@@ -386,9 +393,9 @@
         return nullptr;
       }));
 
-  shim_manager.LaunchApp(profile(), AppId(), {test_path},
-                         {protocol_handler_launch_url}, GURL(),
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+  shim_manager.LaunchApp(
+      profile(), AppId(), {test_path}, {protocol_handler_launch_url}, GURL(),
+      chrome::mojom::AppShimLoginItemRestoreState::kNone, base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest,
@@ -415,7 +422,7 @@
   shim_manager.LaunchApp(
       profile(), AppId(), {test_path},
       {protocol_handler_launch_url, protocol_handler_file_url}, GURL(),
-      chrome::mojom::AppShimLoginItemRestoreState::kNone);
+      chrome::mojom::AppShimLoginItemRestoreState::kNone, base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, LaunchApp_OverrideUrl) {
@@ -435,7 +442,8 @@
 
   shim_manager.LaunchApp(profile(), AppId(), std::vector<base::FilePath>(),
                          std::vector<GURL>(), override_url,
-                         chrome::mojom::AppShimLoginItemRestoreState::kNone);
+                         chrome::mojom::AppShimLoginItemRestoreState::kNone,
+                         base::DoNothing());
 }
 
 TEST_F(WebAppShimManagerDelegateTest, GetAppShortcutsMenuItemInfos) {

chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.cc

diff --git a/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.cc b/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.cc
index 800e6d1c..1584400 100644
--- a/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.cc
+++ b/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.cc
@@ -186,7 +186,10 @@
     const std::vector<base::FilePath>& files,
     const std::vector<GURL>& urls,
     const GURL& override_url,
-    chrome::mojom::AppShimLoginItemRestoreState login_item_restore_state) {
+    chrome::mojom::AppShimLoginItemRestoreState login_item_restore_state,
+    base::OnceClosure launch_finished_callback) {
+  base::ScopedClosureRunner run_launch_finished(
+      std::move(launch_finished_callback));
   const Extension* extension = MaybeGetAppExtension(profile, app_id);
   DCHECK(extension);
   extensions::RecordAppLaunchType(extension_misc::APP_LAUNCH_CMD_LINE_APP,

chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h

diff --git a/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h b/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h
index 493ca9b..63e3f03 100644
--- a/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h
+++ b/chrome/browser/apps/platform_apps/extension_app_shim_manager_delegate_mac.h
@@ -26,13 +26,14 @@
   void EnableExtension(Profile* profile,
                        const std::string& extension_id,
                        base::OnceCallback<void()> callback) override;
-  void LaunchApp(Profile* profile,
-                 const web_app::AppId& app_id,
-                 const std::vector<base::FilePath>& files,
-                 const std::vector<GURL>& urls,
-                 const GURL& override_url,
-                 chrome::mojom::AppShimLoginItemRestoreState
-                     login_item_restore_state) override;
+  void LaunchApp(
+      Profile* profile,
+      const web_app::AppId& app_id,
+      const std::vector<base::FilePath>& files,
+      const std::vector<GURL>& urls,
+      const GURL& override_url,
+      chrome::mojom::AppShimLoginItemRestoreState login_item_restore_state,
+      base::OnceClosure launch_finished_callback) override;
   void LaunchShim(Profile* profile,
                   const web_app::AppId& app_id,
                   bool recreate_shims,

chrome/browser/ash/BUILD.gn

diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn
index 715e627..69fa559 100644
--- a/chrome/browser/ash/BUILD.gn
+++ b/chrome/browser/ash/BUILD.gn
@@ -1738,6 +1738,8 @@
     "login/screens/demo_setup_screen.h",
     "login/screens/device_disabled_screen.cc",
     "login/screens/device_disabled_screen.h",
+    "login/screens/display_size_screen.cc",
+    "login/screens/display_size_screen.h",
     "login/screens/edu_coexistence_login_screen.cc",
     "login/screens/edu_coexistence_login_screen.h",
     "login/screens/enable_adb_sideloading_screen.cc",

chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc

diff --git a/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc b/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc
index ababfc90..dd4de75 100644
--- a/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc
+++ b/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc
@@ -625,12 +625,12 @@
 }
 
 TEST_F(ArcPolicyBridgeTest,
-       DeveloperToolsPolicyDisallowedForForceInstalledExtensionsTest) {
+       DeveloperToolsPolicyDisallowedForSensitiveExtensionsTest) {
   profile()->GetTestingPrefService()->SetManagedPref(
       ::prefs::kDevToolsAvailability,
       std::make_unique<base::Value>(
           static_cast<int>(policy::DeveloperToolsPolicyHandler::Availability::
-                               kDisallowedForForceInstalledExtensions)));
+                               kDisallowedForSenstiveExtensions)));
   GetPoliciesAndVerifyResult(
       "{\"apkCacheEnabled\":true,\"debuggingFeaturesDisabled\":false,"
       "\"guid\":\"" +

chrome/browser/ash/crosapi/crosapi_util.cc

diff --git a/chrome/browser/ash/crosapi/crosapi_util.cc b/chrome/browser/ash/crosapi/crosapi_util.cc
index 68e71a8..3ad8197 100644
--- a/chrome/browser/ash/crosapi/crosapi_util.cc
+++ b/chrome/browser/ash/crosapi/crosapi_util.cc
@@ -608,6 +608,9 @@
   params->enable_cpu_mappable_native_gpu_memory_buffers =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableNativeGpuMemoryBuffers);
+
+  params->oop_video_decoding_enabled = base::FeatureList::IsEnabled(
+      media::kExposeOutOfProcessVideoDecodingToLacros);
 }
 
 template <typename BrowserParams>

chrome/browser/ash/login/screens/display_size_screen.cc

diff --git a/chrome/browser/ash/login/screens/display_size_screen.cc b/chrome/browser/ash/login/screens/display_size_screen.cc
new file mode 100644
index 0000000..38b0224
--- /dev/null
+++ b/chrome/browser/ash/login/screens/display_size_screen.cc
@@ -0,0 +1,64 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ash/login/screens/display_size_screen.h"
+
+#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ui/webui/ash/login/display_size_screen_handler.h"
+
+namespace ash {
+namespace {
+
+constexpr const char kUserActionNext[] = "next";
+
+}  // namespace
+
+// static
+std::string DisplaySizeScreen::GetResultString(Result result) {
+  switch (result) {
+    case Result::kNext:
+      return "Next";
+    case Result::kNotApplicable:
+      return BaseScreen::kNotApplicable;
+  }
+}
+
+DisplaySizeScreen::DisplaySizeScreen(base::WeakPtr<DisplaySizeScreenView> view,
+                                     const ScreenExitCallback& exit_callback)
+    : BaseScreen(DisplaySizeScreenView::kScreenId, OobeScreenPriority::DEFAULT),
+      view_(std::move(view)),
+      exit_callback_(exit_callback) {}
+
+DisplaySizeScreen::~DisplaySizeScreen() = default;
+
+bool DisplaySizeScreen::MaybeSkip(WizardContext& context) {
+  if (context.skip_post_login_screens_for_tests) {
+    exit_callback_.Run(Result::kNotApplicable);
+    return true;
+  }
+
+  return false;
+}
+
+void DisplaySizeScreen::ShowImpl() {
+  if (!view_) {
+    return;
+  }
+
+  view_->Show();
+}
+
+void DisplaySizeScreen::HideImpl() {}
+
+void DisplaySizeScreen::OnUserAction(const base::Value::List& args) {
+  const std::string& action_id = args[0].GetString();
+  if (action_id == kUserActionNext) {
+    // TODO(b/275556512): Include the screen In CHOOBE flow.
+    NOTIMPLEMENTED();
+    return;
+  }
+  BaseScreen::OnUserAction(args);
+}
+
+}  // namespace ash

chrome/browser/ash/login/screens/display_size_screen.h

diff --git a/chrome/browser/ash/login/screens/display_size_screen.h b/chrome/browser/ash/login/screens/display_size_screen.h
new file mode 100644
index 0000000..11c279d
--- /dev/null
+++ b/chrome/browser/ash/login/screens/display_size_screen.h
@@ -0,0 +1,56 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_DISPLAY_SIZE_SCREEN_H_
+#define CHROME_BROWSER_ASH_LOGIN_SCREENS_DISPLAY_SIZE_SCREEN_H_
+
+#include <memory>
+#include <string>
+
+#include "base/functional/callback.h"
+#include "base/memory/weak_ptr.h"
+#include "chrome/browser/ash/login/screens/base_screen.h"
+
+namespace ash {
+class DisplaySizeScreenView;
+
+// Controller for the display size screen.
+class DisplaySizeScreen : public BaseScreen {
+ public:
+  using TView = DisplaySizeScreenView;
+
+  enum class Result { kNext, kNotApplicable };
+
+  using ScreenExitCallback = base::RepeatingCallback<void(Result result)>;
+
+  DisplaySizeScreen(base::WeakPtr<DisplaySizeScreenView> view,
+                    const ScreenExitCallback& exit_callback);
+
+  DisplaySizeScreen(const DisplaySizeScreen&) = delete;
+  DisplaySizeScreen& operator=(const DisplaySizeScreen&) = delete;
+
+  ~DisplaySizeScreen() override;
+
+  static std::string GetResultString(Result result);
+
+ private:
+  // BaseScreen:
+  bool MaybeSkip(WizardContext& context) override;
+  void ShowImpl() override;
+  void HideImpl() override;
+  void OnUserAction(const base::Value::List& args) override;
+
+  base::WeakPtr<DisplaySizeScreenView> view_;
+  ScreenExitCallback exit_callback_;
+};
+
+}  // namespace ash
+
+// TODO(https://crbug.com/1164001): remove after the //chrome/browser/chromeos
+// source migration is finished.
+namespace chromeos {
+using ::ash ::DisplaySizeScreen;
+}
+
+#endif  // CHROME_BROWSER_ASH_LOGIN_SCREENS_DISPLAY_SIZE_SCREEN_H_

chrome/browser/ash/login/users/user_manager_unittest.cc

diff --git a/chrome/browser/ash/login/users/user_manager_unittest.cc b/chrome/browser/ash/login/users/user_manager_unittest.cc
index 8ec57889..d23032e24 100644
--- a/chrome/browser/ash/login/users/user_manager_unittest.cc
+++ b/chrome/browser/ash/login/users/user_manager_unittest.cc
@@ -404,8 +404,6 @@
   ASSERT_EQ(2U, user_manager->GetUsers().size());
   ASSERT_EQ(0U, user_manager->GetLoggedInUsers().size());
 
-  // Removing non-owner account is acceptable.
-  EXPECT_CALL(*user_manager, AsyncRemoveCryptohome(testing::_)).Times(1);
   // Get a pointer to the user that will be removed.
   user_manager::User* user_to_remove = nullptr;
   for (user_manager::User* user : user_manager->GetUsers()) {
@@ -416,18 +414,29 @@
   }
   ASSERT_TRUE(user_to_remove);
   ASSERT_EQ(account_id0_at_invalid_domain_, user_to_remove->GetAccountId());
+
+  // Removing non-owner account is acceptable.
+  EXPECT_CALL(*user_manager,
+              AsyncRemoveCryptohome(account_id0_at_invalid_domain_))
+      .Times(1);
+
   // Pass the account id of the user to be removed from the user list to verify
   // that a reference to the account id will not be used after user removal.
-  user_manager->RemoveUser(user_to_remove->GetAccountId(),
+  user_manager->RemoveUser(account_id0_at_invalid_domain_,
                            user_manager::UserRemovalReason::UNKNOWN);
+  testing::Mock::VerifyAndClearExpectations(user_manager.get());
   EXPECT_EQ(1, observer_test.OnUserToBeRemovedCallCount());
   EXPECT_EQ(1, observer_test.OnUserRemovedCallCount());
   EXPECT_EQ(1U, user_manager->GetUsers().size());
 
   // Removing owner account is unacceptable.
+  EXPECT_CALL(*user_manager,
+              AsyncRemoveCryptohome(owner_account_id_at_invalid_domain_))
+      .Times(0);
   observer_test.ResetCallCounts();
   user_manager->RemoveUser(owner_account_id_at_invalid_domain_,
                            user_manager::UserRemovalReason::UNKNOWN);
+  testing::Mock::VerifyAndClearExpectations(user_manager.get());
   EXPECT_EQ(0, observer_test.OnUserToBeRemovedCallCount());
   EXPECT_EQ(0, observer_test.OnUserRemovedCallCount());
   EXPECT_EQ(1U, user_manager->GetUsers().size());

chrome/browser/ash/login/wizard_controller.cc

diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc
index e277674e..248a2a52 100644
--- a/chrome/browser/ash/login/wizard_controller.cc
+++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -64,6 +64,7 @@
 #include "chrome/browser/ash/login/screens/demo_preferences_screen.h"
 #include "chrome/browser/ash/login/screens/demo_setup_screen.h"
 #include "chrome/browser/ash/login/screens/device_disabled_screen.h"
+#include "chrome/browser/ash/login/screens/display_size_screen.h"
 #include "chrome/browser/ash/login/screens/edu_coexistence_login_screen.h"
 #include "chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h"
 #include "chrome/browser/ash/login/screens/enable_debugging_screen.h"
@@ -143,6 +144,7 @@
 #include "chrome/browser/ui/webui/ash/login/demo_preferences_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/device_disabled_screen_handler.h"
+#include "chrome/browser/ui/webui/ash/login/display_size_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/enable_adb_sideloading_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/encryption_migration_screen_handler.h"
@@ -876,7 +878,12 @@
         base::BindRepeating(&WizardController::OnTouchpadScreenExit,
                             weak_factory_.GetWeakPtr())));
   }
-
+  if (features::IsOobeChoobeEnabled() && features::IsOobeDisplaySizeEnabled()) {
+    append(std::make_unique<DisplaySizeScreen>(
+        oobe_ui->GetView<DisplaySizeScreenHandler>()->AsWeakPtr(),
+        base::BindRepeating(&WizardController::OnDisplaySizeScreenExit,
+                            weak_factory_.GetWeakPtr())));
+  }
   return result;
 }
 
@@ -1113,6 +1120,10 @@
   SetCurrentScreen(GetScreen(TouchpadScrollScreenView::kScreenId));
 }
 
+void WizardController::ShowDisplaySizeScreen() {
+  SetCurrentScreen(GetScreen(DisplaySizeScreenView::kScreenId));
+}
+
 void WizardController::ShowCryptohomeRecoverySetupScreen() {
   CHECK(features::IsCryptohomeRecoveryEnabled());
   SetCurrentScreen(GetScreen(CryptohomeRecoverySetupScreenView::kScreenId));
@@ -1504,6 +1515,14 @@
   }
 }
 
+void WizardController::OnDisplaySizeScreenExit(
+    DisplaySizeScreen::Result result) {
+  OnScreenExit(DisplaySizeScreenView::kScreenId,
+               DisplaySizeScreen::GetResultString(result));
+  // TODO(b/275556512): Include the screen In CHOOBE flow.
+  NOTIMPLEMENTED();
+}
+
 void WizardController::SkipToLoginForTesting() {
   VLOG(1) << "WizardController::SkipToLoginForTesting()";
   if (current_screen_ && current_screen_->screen_id() == GaiaView::kScreenId) {

chrome/browser/ash/login/wizard_controller.h

diff --git a/chrome/browser/ash/login/wizard_controller.h b/chrome/browser/ash/login/wizard_controller.h
index cea9ce1..23509e2 100644
--- a/chrome/browser/ash/login/wizard_controller.h
+++ b/chrome/browser/ash/login/wizard_controller.h
@@ -30,6 +30,7 @@
 #include "chrome/browser/ash/login/screens/cryptohome_recovery_setup_screen.h"
 #include "chrome/browser/ash/login/screens/demo_preferences_screen.h"
 #include "chrome/browser/ash/login/screens/demo_setup_screen.h"
+#include "chrome/browser/ash/login/screens/display_size_screen.h"
 #include "chrome/browser/ash/login/screens/edu_coexistence_login_screen.h"
 #include "chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h"
 #include "chrome/browser/ash/login/screens/enable_debugging_screen.h"
@@ -326,6 +327,7 @@
   void ShowThemeSelectionScreen();
   void ShowChoobeScreen();
   void ShowTouchpadScrollScreen();
+  void ShowDisplaySizeScreen();
   void ShowGaiaPasswordChangedScreen(std::unique_ptr<UserContext> user_context);
 
   // Shows images login screen.
@@ -413,6 +415,7 @@
   void OnCryptohomeRecoveryScreenExit(CryptohomeRecoveryScreen::Result result);
   void OnChoobeScreenExit(ChoobeScreen::Result result);
   void OnTouchpadScreenExit(TouchpadScrollScreen::Result result);
+  void OnDisplaySizeScreenExit(DisplaySizeScreen::Result result);
 
   // Callback invoked once it has been determined whether the device is disabled
   // or not.

chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc

diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc
index 3ef0e8a..61930a2 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc
@@ -322,6 +322,11 @@
     // logged-in session is not possible. Fix this either by delaying the
     // cryptohome deletion operation or by getting rid of the in-session
     // wildcard check.
+    // Also note that, following |fatal_error_callback_| is practically
+    // OnUserPolicyFatalError above, so is attempting to shutting down Chrome.
+    // Thus, some asynchronous operations such as reporting in
+    // UserAddedRemovedReporter are not guaranteed to be completed unless
+    // task runners' priority/shutdown-behavior are configured.
     user_manager::UserManager::Get()->RemoveUserFromList(
         AccountId::FromUserEmail(username));
     if (fatal_error_callback_)

chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer.cc

diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer.cc
index 620347b..1d647a3 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer.cc
@@ -37,10 +37,10 @@
 
 BASE_FEATURE(kEnableWifiSignalEventsReporting,
              "EnableWifiSignalEventsReporting",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 BASE_FEATURE(kEnableNetworkConnectionStateEventsReporting,
              "EnableNetworkConnectionStateEventsReporting",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 BASE_FEATURE(kEnableVpnConnectionStateEventsReporting,
              "EnableVpnConnectionStateEventsReporting",
              base::FEATURE_DISABLED_BY_DEFAULT);

chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer_browsertest.cc

diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer_browsertest.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer_browsertest.cc
index 62acda3..925cade8 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer_browsertest.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/network/network_events_observer_browsertest.cc
@@ -72,10 +72,6 @@
  protected:
   NetworkEventsBrowserTest() {
     crypto_home_mixin_.MarkUserAsExisting(affiliation_mixin_.account_id());
-    scoped_feature_list_.InitWithFeatures(
-        /*enabled_features=*/{kEnableWifiSignalEventsReporting,
-                              kEnableNetworkConnectionStateEventsReporting},
-        /*disabled_features=*/{});
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {

chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc

diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc
index fde09161..deef9fd0 100644
--- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc
+++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc
@@ -214,6 +214,16 @@
             data:
                 "wilco_dtc_supportd's proprietary data."
             destination: OTHER
+            internal {
+              contacts {
+                email: "chromeos-oem-services@google.com"
+              }
+            }
+            user_data {
+                type: IP_ADDRESS
+                type: DEVICE_ID
+            }
+            last_reviewed: "2023-04-13"
           }
           policy {
             cookies_allowed: NO

chrome/browser/creator/android/java/src/org/chromium/chrome/browser/creator/CreatorCoordinator.java

diff --git a/chrome/browser/creator/android/java/src/org/chromium/chrome/browser/creator/CreatorCoordinator.java b/chrome/browser/creator/android/java/src/org/chromium/chrome/browser/creator/CreatorCoordinator.java
index 13d93071a..bad1b13 100644
--- a/chrome/browser/creator/android/java/src/org/chromium/chrome/browser/creator/CreatorCoordinator.java
+++ b/chrome/browser/creator/android/java/src/org/chromium/chrome/browser/creator/CreatorCoordinator.java
@@ -27,7 +27,7 @@
 import org.chromium.chrome.browser.feed.FeedListContentManager;
 import org.chromium.chrome.browser.feed.FeedListContentManager.FeedContent;
 import org.chromium.chrome.browser.feed.FeedStream;
-import org.chromium.chrome.browser.feed.FeedSurfaceScopeDependencyProviderImpl;
+import org.chromium.chrome.browser.feed.FeedSurfaceScopeDependencyProvider;
 import org.chromium.chrome.browser.feed.FeedSurfaceTracker;
 import org.chromium.chrome.browser.feed.NativeViewListRenderer;
 import org.chromium.chrome.browser.feed.SingleWebFeedEntryPoint;
@@ -92,7 +92,7 @@
     private ViewGroup mLayoutView;
     private HybridListRenderer mHybridListRenderer;
     private SurfaceScope mSurfaceScope;
-    private FeedSurfaceScopeDependencyProviderImpl mDependencyProvider;
+    private FeedSurfaceScopeDependencyProvider mDependencyProvider;
     private PropertyModel mCreatorModel;
     private PropertyModelChangeProcessor<PropertyModel, CreatorProfileView, PropertyKey>
             mCreatorProfileModelChangeProcessor;
@@ -288,7 +288,7 @@
         ProcessScope processScope = FeedSurfaceTracker.getInstance().getXSurfaceProcessScope();
 
         if (processScope != null) {
-            mDependencyProvider = new FeedSurfaceScopeDependencyProviderImpl(
+            mDependencyProvider = new FeedSurfaceScopeDependencyProvider(
                     mActivity, mActivity, ColorUtils.inNightMode(mActivity));
             mSurfaceScope = processScope.obtainSurfaceScope(mDependencyProvider);
         } else {

chrome/browser/devtools/chrome_devtools_manager_delegate.cc

diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index 0d2f2d5..46e63ba5 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -247,7 +247,7 @@
       return false;
     case Availability::kAllowed:
       return true;
-    case Availability::kDisallowedForForceInstalledExtensions:
+    case Availability::kDisallowedForSenstiveExtensions:
       if (!extension) {
         return true;
       }
@@ -278,7 +278,7 @@
       return false;
     case Availability::kAllowed:
       return true;
-    case Availability::kDisallowedForForceInstalledExtensions:
+    case Availability::kDisallowedForSenstiveExtensions:
       return !web_app || !web_app->IsKioskInstalledApp();
     default:
       NOTREACHED() << "Unknown developer tools policy";

chrome/browser/devtools/devtools_browsertest.cc

diff --git a/chrome/browser/devtools/devtools_browsertest.cc b/chrome/browser/devtools/devtools_browsertest.cc
index 5c4ebc8..fb98635e 100644
--- a/chrome/browser/devtools/devtools_browsertest.cc
+++ b/chrome/browser/devtools/devtools_browsertest.cc
@@ -236,11 +236,11 @@
   SwitchToPanel(window, (prefix + panel_name).c_str());
 }
 
-void DisallowDevToolsForForceInstalledExtenions(Browser* browser) {
+void DisallowDevToolsForSensitiveExtenions(Browser* browser) {
   browser->profile()->GetPrefs()->SetInteger(
       prefs::kDevToolsAvailability,
       static_cast<int>(policy::DeveloperToolsPolicyHandler::Availability::
-                           kDisallowedForForceInstalledExtensions));
+                           kDisallowedForSenstiveExtensions));
 }
 
 void DisallowDevTools(Browser* browser) {
@@ -2313,7 +2313,7 @@
 }
 
 using ManifestLocation = extensions::mojom::ManifestLocation;
-class DevToolsDisallowedForForceInstalledExtensionsPolicyTest
+class DevToolsDisallowedForSensitiveExtensionsPolicyTest
     : public extensions::ExtensionBrowserTest {
  public:
   // Installs an extension from the test/data/devtools/extensions folder, using
@@ -2351,7 +2351,7 @@
   }
 };
 
-IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForForceInstalledExtensionsPolicyTest,
+IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForSensitiveExtensionsPolicyTest,
                        DisallowedForExternalPolicyDownloadExtension) {
   // DevTools are disallowed for force-installed extensions by default.
   auto extension = ForceInstallExtension("simple_background_page");
@@ -2365,7 +2365,7 @@
   EXPECT_FALSE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForForceInstalledExtensionsPolicyTest,
+IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForSensitiveExtensionsPolicyTest,
                        DisallowedForManagementExternalComponentExtension) {
   // DevTools are disallowed for component extensions with the management
   // permission by default.
@@ -2380,9 +2380,9 @@
   EXPECT_FALSE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForForceInstalledExtensionsPolicyTest,
+IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForSensitiveExtensionsPolicyTest,
                        AllowedForNonManagementExternalComponentExtension) {
-  // DevTools are disallowed for component extensions with the management
+  // DevTools are allowed for component extensions without the management
   // permission by default.
   auto extension = InstallComponentExtension("simple_background_page");
   ASSERT_TRUE(extension);
@@ -2395,7 +2395,7 @@
   EXPECT_TRUE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForForceInstalledExtensionsPolicyTest,
+IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForSensitiveExtensionsPolicyTest,
                        ExtensionConnectionClosedOnPolicyChange) {
   AllowDevTools(browser());
   auto extension = ForceInstallExtension("simple_background_page");
@@ -2410,11 +2410,11 @@
   EXPECT_TRUE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
 
   // Policy change must close the connection with the force installed extension.
-  DisallowDevToolsForForceInstalledExtenions(browser());
+  DisallowDevToolsForSensitiveExtenions(browser());
   EXPECT_FALSE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForForceInstalledExtensionsPolicyTest,
+IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForSensitiveExtensionsPolicyTest,
                        ClosedAfterNavigationToExtension) {
   // DevTools are disallowed for force-installed extensions by default.
   auto extension = ForceInstallExtension("simple_background_page");
@@ -2435,7 +2435,7 @@
   EXPECT_FALSE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForForceInstalledExtensionsPolicyTest,
+IN_PROC_BROWSER_TEST_F(DevToolsDisallowedForSensitiveExtensionsPolicyTest,
                        AboutBlankConnectionKeptOnPolicyChange) {
   AllowDevTools(browser());
 
@@ -2451,12 +2451,12 @@
 
   // Policy change to must not disrupt CDP coneciton unrelated to a force
   // installed extension.
-  DisallowDevToolsForForceInstalledExtenions(browser());
+  DisallowDevToolsForSensitiveExtenions(browser());
   EXPECT_TRUE(DevToolsWindow::FindDevToolsWindow(agent_host.get()));
 }
 
 class DevToolsAllowedByCommandLineSwitch
-    : public DevToolsDisallowedForForceInstalledExtensionsPolicyTest {
+    : public DevToolsDisallowedForSensitiveExtensionsPolicyTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     extensions::ExtensionBrowserTest::SetUpCommandLine(command_line);

chrome/browser/devtools/devtools_embedder_message_dispatcher.cc

diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc b/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc
index 59ba0e1..486ba2a5 100644
--- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc
+++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc
@@ -49,10 +49,11 @@
 bool GetValue(const base::Value& value, gfx::Rect* rect) {
   if (!value.is_dict())
     return false;
-  absl::optional<int> x = value.FindIntKey("x");
-  absl::optional<int> y = value.FindIntKey("y");
-  absl::optional<int> width = value.FindIntKey("width");
-  absl::optional<int> height = value.FindIntKey("height");
+  const base::Value::Dict& dict = value.GetDict();
+  absl::optional<int> x = dict.FindInt("x");
+  absl::optional<int> y = dict.FindInt("y");
+  absl::optional<int> width = dict.FindInt("width");
+  absl::optional<int> height = dict.FindInt("height");
   if (!x.has_value() || !y.has_value() || !width.has_value() ||
       !height.has_value()) {
     return false;
@@ -66,7 +67,7 @@
   if (!value.is_dict())
     return false;
 
-  const bool synced = value.FindBoolKey("synced").value_or(false);
+  const bool synced = value.GetDict().FindBool("synced").value_or(false);
   options->sync_mode = synced ? RegisterOptions::SyncMode::kSync
                               : RegisterOptions::SyncMode::kDontSync;
   return true;

chrome/browser/devtools/devtools_window.cc

diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index fd85dcf..88788ad 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -290,10 +290,10 @@
   for (const auto& list_item : parsed_message->GetList()) {
     if (!list_item.is_dict())
       continue;
-    int key_code = list_item.FindIntKey("keyCode").value_or(0);
+    int key_code = list_item.GetDict().FindInt("keyCode").value_or(0);
     if (key_code == 0)
       continue;
-    int modifiers = list_item.FindIntKey("modifiers").value_or(0);
+    int modifiers = list_item.GetDict().FindInt("modifiers").value_or(0);
     if (!KeyWhitelistingAllowed(key_code, modifiers)) {
       LOG(WARNING) << "Key whitelisting forbidden: "
                    << "(" << key_code << "," << modifiers << ")";
@@ -327,17 +327,16 @@
   if (whitelisted_keys_.find(key) == whitelisted_keys_.end())
     return false;
 
-  base::Value event_data(base::Value::Type::DICT);
-  event_data.SetStringKey("type", event_type);
-  event_data.SetStringKey("key", ui::KeycodeConverter::DomKeyToKeyString(
-                                     static_cast<ui::DomKey>(event.dom_key)));
-  event_data.SetStringKey("code",
-                          ui::KeycodeConverter::DomCodeToCodeString(
-                              static_cast<ui::DomCode>(event.dom_code)));
-  event_data.SetIntKey("keyCode", key_code);
-  event_data.SetIntKey("modifiers", modifiers);
+  base::Value::Dict event_data;
+  event_data.Set("type", event_type);
+  event_data.Set("key", ui::KeycodeConverter::DomKeyToKeyString(
+                            static_cast<ui::DomKey>(event.dom_key)));
+  event_data.Set("code", ui::KeycodeConverter::DomCodeToCodeString(
+                             static_cast<ui::DomCode>(event.dom_code)));
+  event_data.Set("keyCode", key_code);
+  event_data.Set("modifiers", modifiers);
   devtools_window_->bindings_->CallClientMethod(
-      "DevToolsAPI", "keyEventUnhandled", std::move(event_data));
+      "DevToolsAPI", "keyEventUnhandled", base::Value(std::move(event_data)));
   return true;
 }
 

chrome/browser/download/download_status_updater_linux.cc

diff --git a/chrome/browser/download/download_status_updater_linux.cc b/chrome/browser/download/download_status_updater_linux.cc
index 280f74f..4ae4b4f 100644
--- a/chrome/browser/download/download_status_updater_linux.cc
+++ b/chrome/browser/download/download_status_updater_linux.cc
@@ -67,8 +67,10 @@
   // The "icon-tasks" KDE task manager also honors Unity Launcher API.
   if (desktop_env != base::nix::DESKTOP_ENVIRONMENT_UNITY &&
       desktop_env != base::nix::DESKTOP_ENVIRONMENT_KDE4 &&
-      desktop_env != base::nix::DESKTOP_ENVIRONMENT_KDE5)
+      desktop_env != base::nix::DESKTOP_ENVIRONMENT_KDE5 &&
+      desktop_env != base::nix::DESKTOP_ENVIRONMENT_KDE6) {
     return;
+  }
 
   // Ubuntu still hasn't given us a nice libunity.so symlink.
   void* unity_lib = dlopen("libunity.so.4", RTLD_LAZY);

chrome/browser/feed/android/BUILD.gn

diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/BUILD.gn
index a05f634..1bad6c26 100644
--- a/chrome/browser/feed/android/BUILD.gn
+++ b/chrome/browser/feed/android/BUILD.gn
@@ -35,7 +35,7 @@
     "java/src/org/chromium/chrome/browser/feed/FeedSurfaceDelegate.java",
     "java/src/org/chromium/chrome/browser/feed/FeedSurfaceLifecycleManager.java",
     "java/src/org/chromium/chrome/browser/feed/FeedSurfaceProvider.java",
-    "java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProviderImpl.java",
+    "java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProvider.java",
     "java/src/org/chromium/chrome/browser/feed/FeedSurfaceScrollDelegate.java",
     "java/src/org/chromium/chrome/browser/feed/FeedSurfaceTracker.java",
     "java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java",

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLogger.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLogger.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLogger.java
index d8a25764..f1a97c3 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLogger.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLogger.java
@@ -114,4 +114,4 @@
     private static long now() {
         return SystemClock.elapsedRealtimeNanos();
     }
-}
+}
\ No newline at end of file

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggerTest.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggerTest.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggerTest.java
index dc0be42..fdcce1af 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggerTest.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggerTest.java
@@ -131,4 +131,4 @@
                 .logLaunchFinished(
                         anyLong(), eq(DiscoverLaunchResult.NAVIGATED_TO_ANOTHER_TAB.getNumber()));
     }
-}
+}
\ No newline at end of file

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggingBridge.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggingBridge.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggingBridge.java
index 9eaab8d..0d65c28 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggingBridge.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggingBridge.java
@@ -161,4 +161,4 @@
         long init(FeedReliabilityLoggingBridge thisRef);
         void destroy(long nativeFeedReliabilityLoggingBridge);
     }
-}
+}
\ No newline at end of file

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java
index 5821dbc..bd61ea5 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStream.java
@@ -48,7 +48,9 @@
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+import org.chromium.chrome.browser.xsurface.FeedActionsHandler;
 import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
+import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType;
 import org.chromium.chrome.browser.xsurface.FeedUserInteractionReliabilityLogger;
 import org.chromium.chrome.browser.xsurface.HybridListRenderer;
 import org.chromium.chrome.browser.xsurface.ListLayoutHelper;
@@ -57,8 +59,6 @@
 import org.chromium.chrome.browser.xsurface.SurfaceActionsHandler.OpenMode;
 import org.chromium.chrome.browser.xsurface.SurfaceActionsHandler.OpenWebFeedEntryPoint;
 import org.chromium.chrome.browser.xsurface.SurfaceScope;
-import org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler;
-import org.chromium.chrome.browser.xsurface.feed.StreamType;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController.StateChangeReason;
@@ -807,7 +807,7 @@
         FeedStreamJni.get().surfaceOpened(mNativeFeedStream, FeedStream.this);
 
         if (mFeedUserInteractionReliabilityLogger != null) {
-            mFeedUserInteractionReliabilityLogger.onStreamOpened(getStreamType());
+            mFeedUserInteractionReliabilityLogger.onStreamOpened(getXSurfaceStreamType());
         }
     }
 
@@ -1205,6 +1205,20 @@
         }
     }
 
+    // TODO(jianli): Consolidate 2 StreamType defined in different places.
+    private @org.chromium.chrome.browser.xsurface.StreamType int getXSurfaceStreamType() {
+        switch (mStreamKind) {
+            case StreamKind.FOR_YOU:
+                return org.chromium.chrome.browser.xsurface.StreamType.FOR_YOU;
+            case StreamKind.FOLLOWING:
+                return org.chromium.chrome.browser.xsurface.StreamType.WEB_FEED;
+            case StreamKind.SINGLE_WEB_FEED:
+                return org.chromium.chrome.browser.xsurface.StreamType.SINGLE_WEB_FEED;
+            default:
+                return org.chromium.chrome.browser.xsurface.StreamType.UNSPECIFIED;
+        }
+    }
+
     /**
      * Restores the scroll state serialized to |savedInstanceState|.
      * @return true if the scroll state was restored, or if the state could never be restored.

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStreamTest.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStreamTest.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStreamTest.java
index 3b3fbde..5a56d8c 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStreamTest.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedStreamTest.java
@@ -68,6 +68,7 @@
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+import org.chromium.chrome.browser.xsurface.FeedActionsHandler;
 import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
 import org.chromium.chrome.browser.xsurface.FeedUserInteractionReliabilityLogger;
 import org.chromium.chrome.browser.xsurface.HybridListRenderer;
@@ -76,7 +77,6 @@
 import org.chromium.chrome.browser.xsurface.SurfaceActionsHandler.OpenUrlOptions;
 import org.chromium.chrome.browser.xsurface.SurfaceActionsHandler.WebFeedFollowUpdate;
 import org.chromium.chrome.browser.xsurface.SurfaceScope;
-import org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.feed.proto.FeedUiProto;

chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProvider.java

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProviderImpl.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProvider.java
similarity index 79%
rename from chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProviderImpl.java
rename to chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProvider.java
index 4511c78..c1f38013 100644
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProviderImpl.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProvider.java
@@ -20,16 +20,15 @@
 /**
  * Provides activity, darkmode and logging context for a single surface.
  */
-public class FeedSurfaceScopeDependencyProviderImpl
-        implements org.chromium.chrome.browser.xsurface.feed.FeedSurfaceScopeDependencyProvider,
-                   ScrollListener {
+public class FeedSurfaceScopeDependencyProvider
+        implements SurfaceScopeDependencyProvider, ScrollListener {
     private static final String TAG = "Feed";
     private final Activity mActivity;
     private final Context mActivityContext;
     private final boolean mDarkMode;
     private final ObserverList<SurfaceHeaderOffsetObserver> mObserverList = new ObserverList<>();
 
-    public FeedSurfaceScopeDependencyProviderImpl(
+    public FeedSurfaceScopeDependencyProvider(
             Activity activity, Context activityContext, boolean darkMode) {
         mActivityContext = FeedProcessScopeDependencyProvider.createFeedContext(activityContext);
         mDarkMode = darkMode;
@@ -51,26 +50,8 @@
         return mDarkMode;
     }
 
-    @Deprecated
     @Override
-    public SurfaceScopeDependencyProvider.AutoplayPreference getAutoplayPreference() {
-        assert ThreadUtils.runningOnUiThread();
-        @VideoPreviewsType
-        int videoPreviewsType = FeedServiceBridge.getVideoPreviewsTypePreference();
-        switch (videoPreviewsType) {
-            case VideoPreviewsType.NEVER:
-                return SurfaceScopeDependencyProvider.AutoplayPreference.AUTOPLAY_DISABLED;
-            case VideoPreviewsType.WIFI_AND_MOBILE_DATA:
-                return SurfaceScopeDependencyProvider.AutoplayPreference
-                        .AUTOPLAY_ON_WIFI_AND_MOBILE_DATA;
-            case VideoPreviewsType.WIFI:
-            default:
-                return SurfaceScopeDependencyProvider.AutoplayPreference.AUTOPLAY_ON_WIFI_ONLY;
-        }
-    }
-
-    @Override
-    public AutoplayPreference getAutoplayPreference2() {
+    public AutoplayPreference getAutoplayPreference() {
         assert ThreadUtils.runningOnUiThread();
         @VideoPreviewsType
         int videoPreviewsType = FeedServiceBridge.getVideoPreviewsTypePreference();

chrome/browser/flag-metadata.json

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 21c78d0..671d32b 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1363,6 +1363,11 @@
     "expiry_milestone": 115
   },
   {
+    "name": "data-retention-policies-disable-sync-types-needed",
+    "owners": [ "esalma@google.com", "ftirelo@google.com"],
+    "expiry_milestone": 118
+  },
+  {
     "name": "dcheck-is-fatal",
     "owners": [ "wez" ],
     // Used to debug failed assertions in environments where debug builds cannot
@@ -4211,6 +4216,11 @@
     "expiry_milestone":120
   },
   {
+    "name": "gainmap-hdr-images",
+    "owners": [ "ccameron", "chrome-color@google.com" ],
+    "expiry_milestone":120
+  },
+  {
     "name": "gallery-app-pdf-edit-notification",
     "owners": ["yawano@google.com", "assistive-eng@google.com"],
     "expiry_milestone": 120
@@ -6204,6 +6214,13 @@
     "expiry_milestone": 122
   },
   {
+    "name": "printer-settings-revamp",
+    "owners": [
+      "//ash/webui/print_management/OWNERS"
+    ],
+    "expiry_milestone": 120
+  },
+  {
     "name": "printing-ppd-channel",
     "owners": [
       "bmgordon",

chrome/browser/flag_descriptions.cc

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index a571cdd..569bc4f 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -164,6 +164,10 @@
     "If enabled, starts fetching gaia id from android accounts in "
     "AccountManagerFacade (AMF)";
 
+const char kGainmapHdrImagesName[] = "Gainmap HDR image rendering";
+const char kGainmapHdrImagesDescription[] =
+    "If enabled, renders images that include an gainmap in HDR";
+
 const char kIdentityStatusConsistencyName[] = "Identity Status Consistency";
 const char kIdentityStatusConsistencyDescription[] =
     "If enabled, always show identity status - even for signed-out users";
@@ -6127,6 +6131,10 @@
 const char kPreferDcheckDescription[] =
     "Use a DCHECK-enabled build when available.";
 
+const char kPrinterSettingsRevampName[] = "Enable Printer Settings Revamped UI";
+const char kPrinterSettingsRevampDescription[] =
+    "Show the enhanced UI for the OS Printer settings page.";
+
 const char kPrintingPpdChannelName[] = "Printing PPD channel";
 const char kPrintingPpdChannelDescription[] =
     "The channel from which PPD index "
@@ -6962,6 +6970,17 @@
     "illustration, strings and an enterprise disclaimer.";
 #endif
 
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
+const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
+    "Data Retention Policies Disable Sync Types";
+const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
+    "Relaxes the requirements for setting BrowsingDataLifetime, "
+    "ClearBrowsingDataOnExit and IdleTimeout. Setting any of these will "
+    "disable sync for the respective browsing data types that need to be "
+    "cleared if neither sync nor browser sign in is disabled by policy.";
+#endif
+
 #if defined(WEBRTC_USE_PIPEWIRE)
 const char kWebrtcPipeWireCapturerName[] = "WebRTC PipeWire support";
 const char kWebrtcPipeWireCapturerDescription[] =

chrome/browser/flag_descriptions.h

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index c6eec26..ef120fcb 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -134,6 +134,9 @@
 extern const char kGaiaIdCacheInAccountManagerFacadeName[];
 extern const char kGaiaIdCacheInAccountManagerFacadeDescription[];
 
+extern const char kGainmapHdrImagesName[];
+extern const char kGainmapHdrImagesDescription[];
+
 extern const char kIdentityStatusConsistencyName[];
 extern const char kIdentityStatusConsistencyDescription[];
 
@@ -3523,6 +3526,9 @@
 extern const char kPreferDcheckName[];
 extern const char kPreferDcheckDescription[];
 
+extern const char kPrinterSettingsRevampName[];
+extern const char kPrinterSettingsRevampDescription[];
+
 extern const char kPrintingPpdChannelName[];
 extern const char kPrintingPpdChannelDescription[];
 
@@ -4037,6 +4043,12 @@
 extern const char kSigninInterceptBubbleV2Description[];
 #endif
 
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
+extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
+extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
+#endif
+
 #if defined(WEBRTC_USE_PIPEWIRE)
 extern const char kWebrtcPipeWireCapturerName[];
 extern const char kWebrtcPipeWireCapturerDescription[];

chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc

diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
index e3efb20..2928e02 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -969,8 +969,6 @@
   // Force navigation to another page, which should force logging of histograms
   // persisted at the end of the page load lifetime.
   NavigateToUntrackedUrl();
-  histogram_tester_->ExpectTotalCount(internal::kHistogramPageLoadTotalBytes,
-                                      1);
   histogram_tester_->ExpectTotalCount(
       internal::kHistogramPageTimingForegroundDuration, 1);
 
@@ -1006,8 +1004,6 @@
   // Force navigation to another page, which should force logging of histograms
   // persisted at the end of the page load lifetime.
   NavigateToUntrackedUrl();
-  histogram_tester_->ExpectTotalCount(internal::kHistogramPageLoadTotalBytes,
-                                      1);
   histogram_tester_->ExpectTotalCount(
       internal::kHistogramPageTimingForegroundDuration, 1);
 
@@ -1037,8 +1033,6 @@
   // Force navigation to another page, which should force logging of histograms
   // persisted at the end of the page load lifetime.
   NavigateToUntrackedUrl();
-  histogram_tester_->ExpectTotalCount(internal::kHistogramPageLoadTotalBytes,
-                                      1);
   histogram_tester_->ExpectTotalCount(
       internal::kHistogramPageTimingForegroundDuration, 1);
 
@@ -1618,14 +1612,6 @@
   // Payload histograms are only logged when a page load terminates, so force
   // navigation to another page.
   NavigateToUntrackedUrl();
-
-  histogram_tester_->ExpectTotalCount(internal::kHistogramPageLoadTotalBytes,
-                                      1);
-
-  // Verify that there is a single sample recorded in the 10kB bucket (the size
-  // of the main HTML response).
-  histogram_tester_->ExpectBucketCount(internal::kHistogramPageLoadTotalBytes,
-                                       10, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PayloadSizeChildFrame) {
@@ -1641,14 +1627,6 @@
   // Payload histograms are only logged when a page load terminates, so force
   // navigation to another page.
   NavigateToUntrackedUrl();
-
-  histogram_tester_->ExpectTotalCount(internal::kHistogramPageLoadTotalBytes,
-                                      1);
-
-  // Verify that there is a single sample recorded in the 10kB bucket (the size
-  // of the iframe response).
-  histogram_tester_->ExpectBucketCount(internal::kHistogramPageLoadTotalBytes,
-                                       10, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
@@ -1666,9 +1644,6 @@
   downloads_observer.WaitForFinished();
 
   NavigateToUntrackedUrl();
-
-  histogram_tester_->ExpectUniqueSample(internal::kHistogramPageLoadTotalBytes,
-                                        0, 1);
 }
 
 // Test UseCounter Features observed in the main frame are recorded, exactly

chrome/browser/password_manager/web_app_profile_switcher.cc

diff --git a/chrome/browser/password_manager/web_app_profile_switcher.cc b/chrome/browser/password_manager/web_app_profile_switcher.cc
index 0a42ebcd..c0e1e78 100644
--- a/chrome/browser/password_manager/web_app_profile_switcher.cc
+++ b/chrome/browser/password_manager/web_app_profile_switcher.cc
@@ -153,7 +153,8 @@
       ->scheduler()
       .LaunchAppWithCustomParams(
           std::move(params),
-          base::IgnoreArgs<Browser*, content::WebContents*,
+          base::IgnoreArgs<base::WeakPtr<Browser>,
+                           base::WeakPtr<content::WebContents>,
                            apps::LaunchContainer>(
               base::BindOnce(&WebAppProfileSwitcher::RunCompletionCallback,
                              weak_factory_.GetWeakPtr())));

chrome/browser/policy/developer_tools_policy_handler.cc

diff --git a/chrome/browser/policy/developer_tools_policy_handler.cc b/chrome/browser/policy/developer_tools_policy_handler.cc
index 69d567b8..f40eaf2 100644
--- a/chrome/browser/policy/developer_tools_policy_handler.cc
+++ b/chrome/browser/policy/developer_tools_policy_handler.cc
@@ -153,7 +153,7 @@
 // Returns the current policy-set developer tools availability according to
 // the values in |pref_service|. If no policy mandating developer tools
 // availability is set, the default will be
-// |Availability::kDisallowedForForceInstalledExtensions|.
+// |Availability::kDisallowedForSenstiveExtensions|.
 Availability GetDevToolsAvailability(const PrefService* pref_sevice) {
   int value = pref_sevice->GetInteger(prefs::kDevToolsAvailability);
   if (!IsValidDeveloperToolsAvailabilityValue(value)) {
@@ -184,9 +184,9 @@
       availability_2 == Availability::kDisallowed) {
     return Availability::kDisallowed;
   }
-  if (availability_1 == Availability::kDisallowedForForceInstalledExtensions ||
-      availability_2 == Availability::kDisallowedForForceInstalledExtensions) {
-    return Availability::kDisallowedForForceInstalledExtensions;
+  if (availability_1 == Availability::kDisallowedForSenstiveExtensions ||
+      availability_2 == Availability::kDisallowedForSenstiveExtensions) {
+    return Availability::kDisallowedForSenstiveExtensions;
   }
   return Availability::kAllowed;
 }
@@ -250,14 +250,14 @@
 // static
 void DeveloperToolsPolicyHandler::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  // The default for this pref is |kDisallowedForForceInstalledExtensions|, both
-  // for managed and for unmanaged users. This is fine for unmanaged users too,
+  // The default for this pref is |kDisallowedForSenstiveExtensions|, both for
+  // managed and for unmanaged users. This is fine for unmanaged users too,
   // because even if they have force-installed extensions (which could happen
   // e.g. through GPO for Chrome on Windows), developer tools should be disabled
   // for these by default.
   registry->RegisterIntegerPref(
       prefs::kDevToolsAvailability,
-      static_cast<int>(Availability::kDisallowedForForceInstalledExtensions));
+      static_cast<int>(Availability::kDisallowedForSenstiveExtensions));
 }
 
 policy::DeveloperToolsPolicyHandler::Availability

chrome/browser/policy/developer_tools_policy_handler.h

diff --git a/chrome/browser/policy/developer_tools_policy_handler.h b/chrome/browser/policy/developer_tools_policy_handler.h
index a1f7dad..932add1 100644
--- a/chrome/browser/policy/developer_tools_policy_handler.h
+++ b/chrome/browser/policy/developer_tools_policy_handler.h
@@ -31,7 +31,7 @@
   enum class Availability {
     // Default: Developer tools are allowed, except for force-installed
     // extensions and component extensions with the management permission.
-    kDisallowedForForceInstalledExtensions = 0,
+    kDisallowedForSenstiveExtensions = 0,
     // Developer tools allowed in all contexts.
     kAllowed = 1,
     // Developer tools disallowed in all contexts.

chrome/browser/policy/developer_tools_policy_handler_unittest.cc

diff --git a/chrome/browser/policy/developer_tools_policy_handler_unittest.cc b/chrome/browser/policy/developer_tools_policy_handler_unittest.cc
index 8d16bf6..b145592 100644
--- a/chrome/browser/policy/developer_tools_policy_handler_unittest.cc
+++ b/chrome/browser/policy/developer_tools_policy_handler_unittest.cc
@@ -44,20 +44,18 @@
   EXPECT_FALSE(store_->GetValue(prefs::kDevToolsAvailability, nullptr));
 
   PolicyMap policy;
-  policy.Set(
-      key::kDeveloperToolsAvailability, POLICY_LEVEL_MANDATORY,
-      POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-      base::Value(0 /*DeveloperToolsDisallowedForForceInstalledExtensions*/),
-      nullptr);
+  policy.Set(key::kDeveloperToolsAvailability, POLICY_LEVEL_MANDATORY,
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+             base::Value(0 /*DeveloperToolsDisallowedForSensitiveExtensions*/),
+             nullptr);
   policy.Set(key::kDeveloperToolsDisabled, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(true),
              nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* value = nullptr;
   ASSERT_TRUE(store_->GetValue(prefs::kDevToolsAvailability, &value));
-  EXPECT_EQ(
-      static_cast<int>(Availability::kDisallowedForForceInstalledExtensions),
-      value->GetInt());
+  EXPECT_EQ(static_cast<int>(Availability::kDisallowedForSenstiveExtensions),
+            value->GetInt());
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   // No force-disabling of developer mode on extensions UI.
@@ -105,21 +103,19 @@
   EXPECT_EQ(static_cast<int>(Availability::kAllowed), value->GetInt());
 }
 
-TEST_F(DeveloperToolsPolicyHandlerTest, DisallowedForForceInstalledExtensions) {
+TEST_F(DeveloperToolsPolicyHandlerTest, DisallowedForSenstiveExtensions) {
   EXPECT_FALSE(store_->GetValue(prefs::kDevToolsAvailability, nullptr));
 
   PolicyMap policy;
-  policy.Set(
-      key::kDeveloperToolsAvailability, POLICY_LEVEL_MANDATORY,
-      POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-      base::Value(0 /*DeveloperToolsDisallowedForForceInstalledExtensions*/),
-      nullptr);
+  policy.Set(key::kDeveloperToolsAvailability, POLICY_LEVEL_MANDATORY,
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+             base::Value(0 /*DeveloperToolsDisallowedForSensitiveExtensions*/),
+             nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* value = nullptr;
   ASSERT_TRUE(store_->GetValue(prefs::kDevToolsAvailability, &value));
-  EXPECT_EQ(
-      static_cast<int>(Availability::kDisallowedForForceInstalledExtensions),
-      value->GetInt());
+  EXPECT_EQ(static_cast<int>(Availability::kDisallowedForSenstiveExtensions),
+            value->GetInt());
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   // No force-disabling of developer mode on extensions UI.
@@ -256,7 +252,7 @@
 TEST_F(DeveloperToolsPolicyHandlerWithProfileTest,
        GetEffectiveAvailabilityForced) {
   EXPECT_EQ(
-      Availability::kDisallowedForForceInstalledExtensions,
+      Availability::kDisallowedForSenstiveExtensions,
       DeveloperToolsPolicyHandler::GetEffectiveAvailability(primary_profile_));
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -295,23 +291,23 @@
         TestParam(
             /* primary_profile_availability= */ Availability::kAllowed,
             /* secondary_profile_availability= */
-            Availability::kDisallowedForForceInstalledExtensions,
+            Availability::kDisallowedForSenstiveExtensions,
             /* expected_result= */
-            Availability::kDisallowedForForceInstalledExtensions),
+            Availability::kDisallowedForSenstiveExtensions),
         TestParam(
             /* primary_profile_availability= */ Availability::
-                kDisallowedForForceInstalledExtensions,
+                kDisallowedForSenstiveExtensions,
             /* secondary_profile_availability= */ Availability::kAllowed,
             /* expected_result= */
-            Availability::kDisallowedForForceInstalledExtensions),
+            Availability::kDisallowedForSenstiveExtensions),
         TestParam(
             /* primary_profile_availability= */ Availability::kDisallowed,
             /* secondary_profile_availability= */
-            Availability::kDisallowedForForceInstalledExtensions,
+            Availability::kDisallowedForSenstiveExtensions,
             /* expected_result= */ Availability::kDisallowed),
         TestParam(
             /* primary_profile_availability= */ Availability::
-                kDisallowedForForceInstalledExtensions,
+                kDisallowedForSenstiveExtensions,
             /* secondary_profile_availability= */ Availability::kDisallowed,
             /* expected_result= */ Availability::kDisallowed),
         TestParam(

chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
index d34b574..3433a66 100644
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -106,6 +106,7 @@
     public static final String BOOKMARKS_LAST_USED_URL = "enhanced_bookmark_last_used_url";
     public static final String BOOKMARKS_LAST_USED_PARENT =
             "enhanced_bookmark_last_used_parent_folder";
+    public static final String BOOKMARK_VISUALS_PREF = "Chrome.Bookmarks.BookmarkRowDisplay";
 
     /**
      * Whether Chrome is set as the default browser.
@@ -995,6 +996,7 @@
                 APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
                 APPLICATION_OVERRIDE_LANGUAGE,
                 BLUETOOTH_NOTIFICATION_IDS,
+                BOOKMARK_VISUALS_PREF,
                 CHROME_SURVEY_DOWNLOAD_ATTEMPTS.pattern(),
                 CHROME_SURVEY_PROMPT_DISPLAYED_TIMESTAMP.pattern(),
                 CLIPBOARD_SHARED_URI,

chrome/browser/printing/printer_manager_dialog_linux.cc

diff --git a/chrome/browser/printing/printer_manager_dialog_linux.cc b/chrome/browser/printing/printer_manager_dialog_linux.cc
index c97d2045..47454d2 100644
--- a/chrome/browser/printing/printer_manager_dialog_linux.cc
+++ b/chrome/browser/printing/printer_manager_dialog_linux.cc
@@ -30,6 +30,8 @@
                                                   "kcm_printer_manager"};
 constexpr const char* kKde5KcmPrinterCommand[] = {"kcmshell5",
                                                   "kcm_printer_manager"};
+constexpr const char* kKde6KcmPrinterCommand[] = {"kcmshell6",
+                                                  "kcm_printer_manager"};
 
 // Older GNOME printer manager. Used as a fallback.
 constexpr const char* kGnomeControlCenterPrintersCommand[] = {
@@ -73,6 +75,10 @@
       opened = OpenPrinterConfigDialog(kKde5KcmPrinterCommand) ||
                OpenPrinterConfigDialog(kSystemConfigPrinterCommand);
       break;
+    case base::nix::DESKTOP_ENVIRONMENT_KDE6:
+      opened = OpenPrinterConfigDialog(kKde6KcmPrinterCommand) ||
+               OpenPrinterConfigDialog(kSystemConfigPrinterCommand);
+      break;
     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
     case base::nix::DESKTOP_ENVIRONMENT_PANTHEON:
     case base::nix::DESKTOP_ENVIRONMENT_UNITY:

chrome/browser/privacy_sandbox/mock_privacy_sandbox_service.h

diff --git a/chrome/browser/privacy_sandbox/mock_privacy_sandbox_service.h b/chrome/browser/privacy_sandbox/mock_privacy_sandbox_service.h
index 276e493..f3443bc 100644
--- a/chrome/browser/privacy_sandbox/mock_privacy_sandbox_service.h
+++ b/chrome/browser/privacy_sandbox/mock_privacy_sandbox_service.h
@@ -30,6 +30,7 @@
   MOCK_METHOD(bool, IsPromptOpenForBrowser, (Browser*), (override));
   // Mock this method to enable opening the settings page in tests.
   MOCK_METHOD(bool, IsPrivacySandboxRestricted, (), (override));
+  MOCK_METHOD(bool, IsRestrictedNoticeEnabled, (), (override));
   MOCK_METHOD((base::flat_map<net::SchemefulSite, net::SchemefulSite>),
               GetSampleFirstPartySets,
               (),

chrome/browser/privacy_sandbox/privacy_sandbox_service.cc

diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc
index 4a61ab9..c7e5fae 100644
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service.cc
@@ -424,6 +424,10 @@
   return privacy_sandbox_settings_->IsPrivacySandboxRestricted();
 }
 
+bool PrivacySandboxService::IsRestrictedNoticeEnabled() {
+  return privacy_sandbox_settings_->IsRestrictedNoticeEnabled();
+}
+
 void PrivacySandboxService::SetPrivacySandboxEnabled(bool enabled) {
   pref_service_->SetBoolean(prefs::kPrivacySandboxManuallyControlledV2, true);
   privacy_sandbox_settings_->SetPrivacySandboxEnabled(enabled);

chrome/browser/privacy_sandbox/privacy_sandbox_service.h

diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service.h b/chrome/browser/privacy_sandbox/privacy_sandbox_service.h
index 86c169c..a72cfae6 100644
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_service.h
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service.h
@@ -207,6 +207,10 @@
   // Privacy Sandbox related UI is updated appropriately.
   virtual bool IsPrivacySandboxRestricted();
 
+  // Returns whether the Privacy Sandbox is configured to show a restricted
+  // notice.
+  virtual bool IsRestrictedNoticeEnabled();
+
   // Called when the V2 Privacy Sandbox preference is changed.
   void OnPrivacySandboxV2PrefChanged();
 

chrome/browser/profiles/profile.h

diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
index 5bf81cf..606561a 100644
--- a/chrome/browser/profiles/profile.h
+++ b/chrome/browser/profiles/profile.h
@@ -298,6 +298,10 @@
   virtual const Profile* GetOriginalProfile() const = 0;
 
   // Returns whether the profile is associated with the account of a child.
+  // This method should not be used in new code to gate child-specific
+  // functionality. Prefer a feture specific method
+  // (eg. `SupervisedUserService::IsURLFilteringEnabled()`) or alternatively
+  // use `SupervisedUserService::IsSubjectToParentalControls()`.
   virtual bool IsChild() const = 0;
 
   // Returns whether opening browser windows is allowed in this profile. For

chrome/browser/resources/chromeos/login/BUILD.gn

diff --git a/chrome/browser/resources/chromeos/login/BUILD.gn b/chrome/browser/resources/chromeos/login/BUILD.gn
index 57faee3b..54711e7 100644
--- a/chrome/browser/resources/chromeos/login/BUILD.gn
+++ b/chrome/browser/resources/chromeos/login/BUILD.gn
@@ -274,6 +274,7 @@
     "screens/common/consolidated_consent.js",
     "screens/common/cryptohome_recovery_setup.js",
     "screens/common/device_disabled.js",
+    "screens/common/display_size.js",
     "screens/common/enable_kiosk.js",
     "screens/common/error_message.js",
     "screens/common/family_link_notice.js",

chrome/browser/resources/chromeos/login/components/oobe_icons.html

diff --git a/chrome/browser/resources/chromeos/login/components/oobe_icons.html b/chrome/browser/resources/chromeos/login/components/oobe_icons.html
index ad0b358c..491a5f5 100644
--- a/chrome/browser/resources/chromeos/login/components/oobe_icons.html
+++ b/chrome/browser/resources/chromeos/login/components/oobe_icons.html
@@ -216,6 +216,10 @@
       <g id="scroll-direction">
         <path fill-rule="evenodd" clip-rule="evenodd" d="M5.39961 5.86341L2.40441 8.99088L0.599609 7.14506L6.99961 0.599609L13.3996 7.14506L11.5948 8.99088L8.59961 5.99307V24.1358L11.5948 21.0083L13.3996 22.8542L6.99961 29.3996L0.599609 22.8542L2.40441 21.0083L5.39961 24.0062V5.86341Z" fill="#1A73E8"></path>
       </g>
+      <g id="display">
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M10 6C8.89543 6 8 6.89543 8 8V17H13C14.1046 17 15 17.8954 15 19V25H25C26.1046 25 27 24.1046 27 23V8C27 6.89543 26.1046 6 25 6H10Z"></path>
+        <rect x="5" y="19" width="8" height="8" rx="2"></rect>
+      </g>
       <!-- OS Sync Consent Icons -->
       <g id="sync-app">
         <path d="M21.985 13.5C23.085 13.5 23.985 12.6 23.985 11.5C23.985 10.4 23.085 9.5 21.985 9.5C20.885 9.5 19.985 10.4 19.985 11.5C19.985 12.6 20.885 13.5 21.985 13.5Z" fill="#1A73E8"></path>

chrome/browser/resources/chromeos/login/screens.js

diff --git a/chrome/browser/resources/chromeos/login/screens.js b/chrome/browser/resources/chromeos/login/screens.js
index 8cca757..2694c9e 100644
--- a/chrome/browser/resources/chromeos/login/screens.js
+++ b/chrome/browser/resources/chromeos/login/screens.js
@@ -15,6 +15,7 @@
 import './screens/common/consolidated_consent.js';
 import './screens/common/cryptohome_recovery_setup.js';
 import './screens/common/device_disabled.js';
+import './screens/common/display_size.js';
 import './screens/common/enable_kiosk.js';
 import './screens/common/error_message.js';
 import './screens/common/family_link_notice.js';
@@ -84,6 +85,11 @@
   {tag: 'consolidated-consent-element', id: 'consolidated-consent'},
   {tag: 'cryptohome-recovery-setup-element', id: 'cryptohome-recovery-setup'},
   {tag: 'device-disabled-element', id: 'device-disabled'},
+  {
+    tag: 'display-size-element',
+    id: 'display-size',
+    condition: 'isDisplaySizeEnabled',
+  },
   {tag: 'enable-kiosk-element', id: 'kiosk-enable'},
   {tag: 'error-message-element', id: 'error-message'},
   {tag: 'family-link-notice-element', id: 'family-link-notice'},

chrome/browser/resources/chromeos/login/screens/common/BUILD.gn

diff --git a/chrome/browser/resources/chromeos/login/screens/common/BUILD.gn b/chrome/browser/resources/chromeos/login/screens/common/BUILD.gn
index 874cae7..4c85089 100644
--- a/chrome/browser/resources/chromeos/login/screens/common/BUILD.gn
+++ b/chrome/browser/resources/chromeos/login/screens/common/BUILD.gn
@@ -36,6 +36,7 @@
     ":consolidated_consent",
     ":cryptohome_recovery_setup",
     ":device_disabled",
+    ":display_size",
     ":enable_kiosk",
     ":error_message",
     ":family_link_notice",
@@ -200,6 +201,20 @@
   extra_deps = [ ":web_components" ]
 }
 
+js_library("display_size") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/screens/common/display_size.js" ]
+  deps = [
+    "../../components/behaviors:login_screen_behavior",
+    "../../components/behaviors:oobe_dialog_host_behavior",
+    "../../components/behaviors:oobe_i18n_behavior",
+    "../../components/buttons:oobe_next_button",
+    "../../components/dialogs:oobe_adaptive_dialog",
+  ]
+  externs_list =
+      [ "//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js" ]
+  extra_deps = [ ":web_components" ]
+}
+
 js_library("enable_kiosk") {
   sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/screens/common/enable_kiosk.js" ]
   deps = [
@@ -663,6 +678,7 @@
     "choobe.js",
     "consolidated_consent.js",
     "device_disabled.js",
+    "display_size.js",
     "enable_kiosk.js",
     "error_message.js",
     "family_link_notice.js",

chrome/browser/resources/chromeos/login/screens/common/display_size.html

diff --git a/chrome/browser/resources/chromeos/login/screens/common/display_size.html b/chrome/browser/resources/chromeos/login/screens/common/display_size.html
new file mode 100644
index 0000000..dca78bb
--- /dev/null
+++ b/chrome/browser/resources/chromeos/login/screens/common/display_size.html
@@ -0,0 +1,36 @@
+<!--
+Copyright 2023 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+<style include="oobe-dialog-host-styles">
+</style>
+
+<oobe-adaptive-dialog id="displaySizeDialog">
+  <iron-icon slot="icon" icon="oobe-32:display"></iron-icon>
+  <h1 slot="title" id="display-size-title">
+    [[i18nDynamic(locale, 'DisplaySizeTitle')]]
+  </h1>
+  <div slot="subtitle" id="display-size-subtitle">
+    <p>
+      [[i18nDynamic(locale, 'DisplaySizeDescription')]]
+    </p>
+    <p>
+      [[i18nDynamic(locale,'DisplaySizeAdditionalDescription')]]
+    </p>
+  </div>
+
+  <div slot="content" class="layout vertical center-justified">
+    <p>
+      [[i18nDynamic(locale,'DisplaySizeSliderTitle')]]
+    </p>
+    <p>
+      [[i18nDynamic(locale,'DisplaySizeSliderDescription')]]
+    </p>
+  </div>
+  <div slot="bottom-buttons">
+    <oobe-next-button id="nextButton" class="focus-on-show"
+      on-click="onNextClicked_">
+    </oobe-next-button>
+  </div>
+</oobe-adaptive-dialog>

chrome/browser/resources/chromeos/login/screens/common/display_size.js

diff --git a/chrome/browser/resources/chromeos/login/screens/common/display_size.js b/chrome/browser/resources/chromeos/login/screens/common/display_size.js
new file mode 100644
index 0000000..bc6f909
--- /dev/null
+++ b/chrome/browser/resources/chromeos/login/screens/common/display_size.js
@@ -0,0 +1,76 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+/**
+ * @fileoverview Polymer element for touchpad scroll screen.
+ */
+
+import '//resources/polymer/v3_0/iron-iconset-svg/iron-iconset-svg.js';
+import '../../components/buttons/oobe_next_button.js';
+import '../../components/common_styles/oobe_common_styles.css.js';
+import '../../components/common_styles/oobe_dialog_host_styles.css.js';
+import '../../components/dialogs/oobe_adaptive_dialog.js';
+import '../../components/oobe_icons.html.js';
+
+import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+
+import {LoginScreenBehavior, LoginScreenBehaviorInterface} from '../../components/behaviors/login_screen_behavior.js';
+import {OobeDialogHostBehavior} from '../../components/behaviors/oobe_dialog_host_behavior.js';
+import {OobeI18nBehavior, OobeI18nBehaviorInterface} from '../../components/behaviors/oobe_i18n_behavior.js';
+import {OOBE_UI_STATE} from '../../components/display_manager_types.js';
+
+/**
+ * @constructor
+ * @extends {PolymerElement}
+ * @implements {LoginScreenBehaviorInterface}
+ * @implements {OobeI18nBehaviorInterface}
+ */
+const DisplaySizeScreenElementBase = mixinBehaviors(
+    [OobeI18nBehavior, OobeDialogHostBehavior, LoginScreenBehavior],
+    PolymerElement);
+
+/**
+ * Available user actions.
+ * @enum {string}
+ */
+const UserAction = {
+  NEXT: 'next',
+};
+
+/**
+ * @polymer
+ */
+class DisplaySizeScreen extends DisplaySizeScreenElementBase {
+  static get is() {
+    return 'display-size-element';
+  }
+
+  static get template() {
+    return html`{__html_template__}`;
+  }
+
+  static get properties() {
+    return {};
+  }
+
+  get EXTERNAL_API() {
+    return [];
+  }
+
+  /** @override */
+  ready() {
+    super.ready();
+    this.initializeLoginScreen('DisplaySizeScreen');
+  }
+
+
+  getOobeUIInitialState() {
+    return OOBE_UI_STATE.ONBOARDING;
+  }
+
+  onNextClicked_() {
+    this.userActed(UserAction.NEXT);
+  }
+}
+
+customElements.define(DisplaySizeScreen.is, DisplaySizeScreen);

chrome/browser/resources/password_manager/checkup_list_item.html

diff --git a/chrome/browser/resources/password_manager/checkup_list_item.html b/chrome/browser/resources/password_manager/checkup_list_item.html
index 883f1cf..d87a56a 100644
--- a/chrome/browser/resources/password_manager/checkup_list_item.html
+++ b/chrome/browser/resources/password_manager/checkup_list_item.html
@@ -40,6 +40,7 @@
     align-items: flex-end;
     display: flex;
     flex-direction: column;
+    margin-inline-start: var(--cr-icon-button-margin-start);
   }
 
   #change-password-link-icon {

chrome/browser/resources/password_manager/password_manager_app.html

diff --git a/chrome/browser/resources/password_manager/password_manager_app.html b/chrome/browser/resources/password_manager/password_manager_app.html
index 2b903c1c..ffad152 100644
--- a/chrome/browser/resources/password_manager/password_manager_app.html
+++ b/chrome/browser/resources/password_manager/password_manager_app.html
@@ -45,11 +45,11 @@
     padding-bottom: 28px;
   }
 
-  /* The breakpoint of 1027px was decided on by the rounded sum of sidebar
-   * width, search bar width and help button width. Smaller value will force
-   * overlapping of search bar and page tittle.
+  /* The breakpoint of 1200px was decided on by the rounded sum of sidebar
+   * width, search bar width and help button width with very large font. Smaller
+   * value will force overlapping of search bar and page tittle.
    */
-  @media (max-width: 1027px) {
+  @media (max-width: 1200px) {
     #content {
       min-width: auto;
       /* Add some padding to make room for borders and to prevent focus
@@ -71,6 +71,10 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
+
+  password-manager-side-bar {
+    min-width: var(--side-bar-width);
+  }
 </style>
 <settings-prefs id="prefs" prefs="{{prefs_}}"></settings-prefs>
 <password-manager-toolbar id="toolbar" narrow="[[narrow_]]"
@@ -119,7 +123,7 @@
     </template>
   </div>
 </cr-drawer>
-<iron-media-query query="(max-width: 1027px)"
+<iron-media-query query="(max-width: 1200px)"
     query-matches="{{narrow_}}">
 </iron-media-query>
 <cr-toast id="removalToast" duration="5000">

chrome/browser/resources/password_manager/shared_vars.css

diff --git a/chrome/browser/resources/password_manager/shared_vars.css b/chrome/browser/resources/password_manager/shared_vars.css
index 1fe6e152..7726dbc2 100644
--- a/chrome/browser/resources/password_manager/shared_vars.css
+++ b/chrome/browser/resources/password_manager/shared_vars.css
@@ -10,7 +10,7 @@
 
 html {
   --card-max-width: 960px;
-  --side-bar-width: 250px;
+  --side-bar-width: 300px;
   --toolbar-height: 56px;
   /* Centered cards has a max-width of var(--cr-centered-card-max-width)
    * and a width of a certain percentage. Therefore, to make room for the

chrome/browser/resources/password_manager/side_bar.html

diff --git a/chrome/browser/resources/password_manager/side_bar.html b/chrome/browser/resources/password_manager/side_bar.html
index eed0d89..8b00577 100644
--- a/chrome/browser/resources/password_manager/side_bar.html
+++ b/chrome/browser/resources/password_manager/side_bar.html
@@ -6,7 +6,7 @@
     overflow: auto;
     overscroll-behavior: contain;
     padding-top: 8px;
-    width: var(--side-bar-width);
+    width: 250px;
   }
 
   #compromisedPasswords {

chrome/browser/resources/password_manager/toolbar.html

diff --git a/chrome/browser/resources/password_manager/toolbar.html b/chrome/browser/resources/password_manager/toolbar.html
index c148b196..d68d1c4 100644
--- a/chrome/browser/resources/password_manager/toolbar.html
+++ b/chrome/browser/resources/password_manager/toolbar.html
@@ -21,7 +21,8 @@
     page-name="$i18n{title}" clear-label="$i18n{clearSearch}"
     search-prompt="$i18n{searchPrompt}"
     autofocus on-search-changed="onSearchChanged_"
-    role="banner" show-menu="[[narrow]]" narrow="[[narrow]]">
+    role="banner" show-menu="[[narrow]]" narrow="[[narrow]]"
+    narrow-threshold="1200">
   <picture slot="product-logo">
     <img id="product-logo"
         srcset="chrome://password-manager/images/password_manager_logo.svg"

chrome/browser/resources/settings/chromeos/OWNERS

diff --git a/chrome/browser/resources/settings/chromeos/OWNERS b/chrome/browser/resources/settings/chromeos/OWNERS
index 3c9be034..df0d785 100644
--- a/chrome/browser/resources/settings/chromeos/OWNERS
+++ b/chrome/browser/resources/settings/chromeos/OWNERS
@@ -10,7 +10,7 @@
 xiaohuic@chromium.org
 
 # Backup reviewers
-cowmoo@chromium.org
+cowmoo@google.com
 
 # Subdir OWNERS can approve global changes related to their subdir.
 per-file lazy_load.ts,os_settings.gni,os_settings.ts=file://chrome/browser/resources/settings/chromeos/crostini_page/OWNERS

chrome/browser/resources/settings/chromeos/device_page/keyboard_remap_modifier_key_row.html

diff --git a/chrome/browser/resources/settings/chromeos/device_page/keyboard_remap_modifier_key_row.html b/chrome/browser/resources/settings/chromeos/device_page/keyboard_remap_modifier_key_row.html
index 90f9bd7..eacfc05d 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/keyboard_remap_modifier_key_row.html
+++ b/chrome/browser/resources/settings/chromeos/device_page/keyboard_remap_modifier_key_row.html
@@ -17,7 +17,11 @@
     line-height: 20px;
     margin-inline-end: 8px;
     min-width: 28px;
-    padding-inline: 8px;
+    padding: 6px;
+  }
+
+  #keyLabel {
+    padding-inline: 6px;
   }
 
   :host([key-state='default-remapping']) .key-container {

chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.html

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.html b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.html
index 334eebd..1bda1df 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.html
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.html
@@ -8,11 +8,11 @@
   }
 
   cr-policy-indicator {
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
   }
 
   cr-policy-network-indicator-mojo {
-    margin: 0 var(--settings-controlled-by-spacing);
+    margin: 0 var(--cr-controlled-by-spacing);
   }
 
   #networkState[connected] {
@@ -42,7 +42,7 @@
 
   .warning {
     color: var(--cr-secondary-text-color);
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
   }
 
   .signin-button {

chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.ts b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.ts
index d92824a..ae2db334 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_subpage.ts
@@ -20,6 +20,7 @@
 import 'chrome://resources/cr_components/settings_prefs/prefs.js';
 import 'chrome://resources/cr_elements/cr_button/cr_button.js';
 import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.js';
+import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
 import 'chrome://resources/cr_elements/cr_toggle/cr_toggle.js';
 import 'chrome://resources/cr_elements/icons.html.js';
 import 'chrome://resources/cr_elements/policy/cr_policy_indicator.js';

chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.html

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.html b/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.html
index dceb5b2..f5cd216 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.html
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.html
@@ -1,6 +1,6 @@
 <style include="internet-shared iron-flex">
   cr-policy-indicator {
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
   }
 </style>
 

chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.ts

diff --git a/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.ts b/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.ts
index aa3ec64..fec64d5 100644
--- a/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.ts
+++ b/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_subpage.ts
@@ -10,8 +10,8 @@
 import 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js';
 import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
 import 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js';
+import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
 import 'chrome://resources/cr_elements/icons.html.js';
-import '../../settings_shared.css.js';
 import './internet_shared.css.js';
 
 import {CrPolicyNetworkBehaviorMojo, CrPolicyNetworkBehaviorMojoInterface} from 'chrome://resources/ash/common/network/cr_policy_network_behavior_mojo.js';

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.html

diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.html b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.html
index 8cf75399..3962a90 100644
--- a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.html
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.html
@@ -10,7 +10,7 @@
   }
 
   cr-policy-pref-indicator {
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
     /* Enable pointer events for the indicator so :hover works. Disable
       * clicks/taps via onIndicatorClick_ so outer on-tap doesn't trigger. */
     pointer-events: all;

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.ts

diff --git a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.ts b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.ts
index ab6ebb7..d8d9423c 100644
--- a/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.ts
+++ b/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.ts
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'chrome://resources/cr_elements/cr_radio_button/cr_radio_button_style.css.js';
+import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
 import 'chrome://resources/cr_elements/policy/cr_policy_indicator.js';
-import '../../settings_shared.css.js';
 
 import {CrRadioButtonMixin, CrRadioButtonMixinInterface} from 'chrome://resources/cr_elements/cr_radio_button/cr_radio_button_mixin.js';
 import {PaperRippleBehavior} from 'chrome://resources/polymer/v3_0/paper-behaviors/paper-ripple-behavior.js';

chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_management_cros_shared_vars.css

diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_management_cros_shared_vars.css b/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_management_cros_shared_vars.css
index 43f6132..a6fd5d0 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_management_cros_shared_vars.css
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_management_cros_shared_vars.css
@@ -14,5 +14,5 @@
   --primary-text-color: var(--cros-text-color-primary);
   --secondary-text-color: var(--cros-text-color-secondary);
   --app-management-controlled-by-spacing:
-      var(--settings-controlled-by-spacing);
+      var(--cr-controlled-by-spacing);
 }

chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.html

diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.html b/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.html
index 5c54163..f176eba5 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.html
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.html
@@ -28,7 +28,7 @@
   }
 
   cr-policy-indicator {
-    padding-inline-end: var(--settings-controlled-by-spacing);
+    padding-inline-end: var(--cr-controlled-by-spacing);
   }
 </style>
 <div id="container" class="cr-row" on-click="onNotificationRowClicked_"

chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.ts b/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.ts
index 6723b9b0..1ff624d 100644
--- a/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.ts
+++ b/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notification_row.ts
@@ -8,6 +8,9 @@
  * Notifications Subpage. Each row contains an app icon, app name, and toggle.
  */
 
+import 'chrome://resources/cr_elements/cr_shared_style.css.js';
+import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
+
 import {TriState} from 'chrome://resources/cr_components/app_management/app_management.mojom-webui.js';
 import {createBoolPermissionValue, createTriStatePermissionValue, isBoolValue, isPermissionEnabled, isTriStateValue} from 'chrome://resources/cr_components/app_management/permission_util.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';

chrome/browser/resources/settings/chromeos/os_languages_page/input_page.html

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.html b/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.html
index 2873320..d1d3e8e 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.html
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.html
@@ -4,7 +4,7 @@
   }
 
   cr-policy-pref-indicator {
-    margin-inline-end: var(--settings-controlled-by-spacing);
+    margin-inline-end: var(--cr-controlled-by-spacing);
   }
 
   cr-policy-pref-indicator + cr-icon-button {

chrome/browser/resources/settings/chromeos/os_languages_page/input_page.ts

diff --git a/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.ts b/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.ts
index a50ef58e..e485375 100644
--- a/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.ts
+++ b/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.ts
@@ -10,6 +10,7 @@
 import 'chrome://resources/cr_components/localized_link/localized_link.js';
 import 'chrome://resources/cr_elements/cr_button/cr_button.js';
 import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js';
+import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
 import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
 import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
 import './add_input_methods_dialog.js';

chrome/browser/resources/settings/controls/controlled_radio_button.html

diff --git a/chrome/browser/resources/settings/controls/controlled_radio_button.html b/chrome/browser/resources/settings/controls/controlled_radio_button.html
index 428b6c5..0919f68b 100644
--- a/chrome/browser/resources/settings/controls/controlled_radio_button.html
+++ b/chrome/browser/resources/settings/controls/controlled_radio_button.html
@@ -10,7 +10,7 @@
   }
 
   cr-policy-pref-indicator {
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
     /* Enable pointer events for the indicator so :hover works. Disable
      * clicks/taps via onIndicatorClick_ so outer on-tap doesn't trigger. */
     pointer-events: all;

chrome/browser/resources/settings/controls/controlled_radio_button.ts

diff --git a/chrome/browser/resources/settings/controls/controlled_radio_button.ts b/chrome/browser/resources/settings/controls/controlled_radio_button.ts
index fd50991..d017224e 100644
--- a/chrome/browser/resources/settings/controls/controlled_radio_button.ts
+++ b/chrome/browser/resources/settings/controls/controlled_radio_button.ts
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import '//resources/cr_elements/cr_radio_button/cr_radio_button_style.css.js';
+import '//resources/cr_elements/cr_shared_vars.css.js';
 import '//resources/cr_elements/policy/cr_policy_pref_indicator.js';
-import '../settings_vars.css.js';
 
 import {CrRadioButtonMixin, CrRadioButtonMixinInterface} from '//resources/cr_elements/cr_radio_button/cr_radio_button_mixin.js';
 import {assert} from '//resources/js/assert_ts.js';

chrome/browser/resources/settings/controls/settings_checkbox.html

diff --git a/chrome/browser/resources/settings/controls/settings_checkbox.html b/chrome/browser/resources/settings/controls/settings_checkbox.html
index 8934bb6..5638cfe 100644
--- a/chrome/browser/resources/settings/controls/settings_checkbox.html
+++ b/chrome/browser/resources/settings/controls/settings_checkbox.html
@@ -18,7 +18,7 @@
   }
 
   cr-policy-pref-indicator {
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
   }
 </style>
 <div id="outerRow" noSubLabel$="[[!hasSubLabel_(subLabel, subLabelHtml)]]">

chrome/browser/resources/settings/controls/settings_dropdown_menu.html

diff --git a/chrome/browser/resources/settings/controls/settings_dropdown_menu.html b/chrome/browser/resources/settings/controls/settings_dropdown_menu.html
index 6ba2c27..2c07af8 100644
--- a/chrome/browser/resources/settings/controls/settings_dropdown_menu.html
+++ b/chrome/browser/resources/settings/controls/settings_dropdown_menu.html
@@ -10,7 +10,7 @@
    */
   cr-policy-pref-indicator {
     height: var(--iron-icon-width, 24px);
-    margin: 0 var(--settings-controlled-by-spacing);
+    margin: 0 var(--cr-controlled-by-spacing);
     order: var(--settings-dropdown-menu-policy-order, 0);
     width: var(--iron-icon-width, 24px);
   }

chrome/browser/resources/settings/controls/settings_dropdown_menu.ts

diff --git a/chrome/browser/resources/settings/controls/settings_dropdown_menu.ts b/chrome/browser/resources/settings/controls/settings_dropdown_menu.ts
index 4f30cc68..574ffd3 100644
--- a/chrome/browser/resources/settings/controls/settings_dropdown_menu.ts
+++ b/chrome/browser/resources/settings/controls/settings_dropdown_menu.ts
@@ -11,9 +11,9 @@
  *   <settings-dropdown-menu pref="{{prefs.foo}}">
  *   </settings-dropdown-menu>
  */
+import '//resources/cr_elements/cr_shared_vars.css.js';
 import '//resources/cr_elements/md_select.css.js';
 import '//resources/cr_elements/policy/cr_policy_pref_indicator.js';
-import '../settings_vars.css.js';
 
 import {assert} from '//resources/js/assert_ts.js';
 import {microTask, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';

chrome/browser/resources/settings/controls/settings_slider.html

diff --git a/chrome/browser/resources/settings/controls/settings_slider.html b/chrome/browser/resources/settings/controls/settings_slider.html
index 1792f7f7..9a822c4 100644
--- a/chrome/browser/resources/settings/controls/settings_slider.html
+++ b/chrome/browser/resources/settings/controls/settings_slider.html
@@ -9,7 +9,7 @@
 
   cr-policy-pref-indicator {
     align-self: center;
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
   }
 
   #labels[disabled] {

chrome/browser/resources/settings/controls/settings_slider.ts

diff --git a/chrome/browser/resources/settings/controls/settings_slider.ts b/chrome/browser/resources/settings/controls/settings_slider.ts
index eb11978..e51367b 100644
--- a/chrome/browser/resources/settings/controls/settings_slider.ts
+++ b/chrome/browser/resources/settings/controls/settings_slider.ts
@@ -8,8 +8,8 @@
  * linear UI range to a range of real values.  When |value| does not map exactly
  * to a tick mark, it interpolates to the nearest tick.
  */
-import '../settings_vars.css.js';
 import '../strings.m.js';
+import '//resources/cr_elements/cr_shared_vars.css.js';
 import '//resources/cr_elements/cr_slider/cr_slider.js';
 // <if expr='chromeos_ash'>
 import 'chrome://resources/cr_elements/chromeos/cros_color_overrides.css.js';

chrome/browser/resources/settings/controls/settings_toggle_button.html

diff --git a/chrome/browser/resources/settings/controls/settings_toggle_button.html b/chrome/browser/resources/settings/controls/settings_toggle_button.html
index 55fdd954..7275034 100644
--- a/chrome/browser/resources/settings/controls/settings_toggle_button.html
+++ b/chrome/browser/resources/settings/controls/settings_toggle_button.html
@@ -43,7 +43,7 @@
   }
 
   cr-policy-pref-indicator {
-    margin-inline-end: var(--settings-controlled-by-spacing);
+    margin-inline-end: var(--cr-controlled-by-spacing);
   }
 </style>
 <div id="outerRow" noSubLabel$="[[!subLabel]]">

chrome/browser/resources/settings/languages_page/languages_page.html

diff --git a/chrome/browser/resources/settings/languages_page/languages_page.html b/chrome/browser/resources/settings/languages_page/languages_page.html
index 8784a41..d16da15 100644
--- a/chrome/browser/resources/settings/languages_page/languages_page.html
+++ b/chrome/browser/resources/settings/languages_page/languages_page.html
@@ -51,7 +51,7 @@
   }
 
   #restartButton {
-    margin-inline-start: var(--settings-controlled-by-spacing);
+    margin-inline-start: var(--cr-controlled-by-spacing);
   }
 </if>
 

chrome/browser/resources/settings/languages_page/spell_check_page.html

diff --git a/chrome/browser/resources/settings/languages_page/spell_check_page.html b/chrome/browser/resources/settings/languages_page/spell_check_page.html
index 44e0189..b792a85 100644
--- a/chrome/browser/resources/settings/languages_page/spell_check_page.html
+++ b/chrome/browser/resources/settings/languages_page/spell_check_page.html
@@ -27,7 +27,7 @@
   }
 
   cr-policy-pref-indicator {
-    margin-inline-end: var(--settings-controlled-by-spacing);
+    margin-inline-end: var(--cr-controlled-by-spacing);
   }
 
   .spell-check-radio-group {

chrome/browser/resources/settings/privacy_page/privacy_page.html

diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 4110107..77d8f05 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -67,7 +67,10 @@
           </cr-link-row>
         </template>
         <template is="dom-if" if=
-            "[[isPrivacySandboxSettings4Enabled_(isPrivacySandboxRestricted_, isPrivacySandboxSettings4_)]]">
+            "[[isPrivacySandboxSettings4Enabled_(
+                isPrivacySandboxRestricted_,
+                isPrivacySandboxRestrictedNoticeEnabled_,
+                isPrivacySandboxSettings4_)]]">
           <cr-link-row id="privacySandboxLinkRow"
               start-icon="settings20:ads-click"
               class="hr"
@@ -155,7 +158,10 @@
       </template>
 
       <template is="dom-if" if=
-          "[[isPrivacySandboxSettings4Enabled_(isPrivacySandboxRestricted_, isPrivacySandboxSettings4_)]]">
+          "[[isPrivacySandboxSettings4Enabled_(
+              isPrivacySandboxRestricted_,
+              isPrivacySandboxRestrictedNoticeEnabled_,
+              isPrivacySandboxSettings4_)]]">
         <template is="dom-if" route-path="/adPrivacy">
           <settings-subpage id="privacy-sandbox"
               page-title="$i18n{adPrivacyPageTitle}"

chrome/browser/resources/settings/privacy_page/privacy_page.ts

diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
index 9d1041d..41e72fa5 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -166,6 +166,12 @@
         value: () => loadTimeData.getBoolean('isPrivacySandboxRestricted'),
       },
 
+      isPrivacySandboxRestrictedNoticeEnabled_: {
+        type: Boolean,
+        value: () =>
+            loadTimeData.getBoolean('isPrivacySandboxRestrictedNoticeEnabled'),
+      },
+
       isPrivacySandboxSettings4_: {
         type: Boolean,
         value: () => loadTimeData.getBoolean('isPrivacySandboxSettings4'),
@@ -280,6 +286,7 @@
   private enableWebBluetoothNewPermissionsBackend_: boolean;
   private showNotificationPermissionsReview_: boolean;
   private isPrivacySandboxRestricted_: boolean;
+  private isPrivacySandboxRestrictedNoticeEnabled_: boolean;
   private isPrivacySandboxSettings4_: boolean;
   private privateStateTokensEnabled_: boolean;
   private safetyCheckNotificationPermissionsEnabled_: boolean;
@@ -473,7 +480,9 @@
   }
 
   private isPrivacySandboxSettings4Enabled_(): boolean {
-    return !this.isPrivacySandboxRestricted_ && this.isPrivacySandboxSettings4_;
+    return (!this.isPrivacySandboxRestricted_ ||
+            this.isPrivacySandboxRestrictedNoticeEnabled_) &&
+        this.isPrivacySandboxSettings4_;
   }
 }
 

chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.html

diff --git a/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.html b/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.html
index 865a7fc4..da4cf74 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.html
@@ -11,21 +11,23 @@
   <img id="banner" alt=""
       src="chrome://settings/images/ad_privacy_banner.svg">
 </picture>
-<cr-link-row
-    id="privacySandboxTopicsLinkRow"
-    start-icon="settings20:interests"
-    label="$i18n{adPrivacyPageTopicsLinkRowLabel}"
-    sub-label="[[computePrivacySandboxTopicsSublabel_(
-        prefs.privacy_sandbox.m1.topics_enabled.value)]]"
-    on-click="onPrivacySandboxTopicsClick_"></cr-link-row>
-<cr-link-row
-    id="privacySandboxFledgeLinkRow"
-    start-icon="settings20:checklist"
-    class="hr"
-    label="$i18n{adPrivacyPageFledgeLinkRowLabel}"
-    sub-label="[[computePrivacySandboxFledgeSublabel_(
-        prefs.privacy_sandbox.m1.fledge_enabled.value)]]"
-    on-click="onPrivacySandboxFledgeClick_"></cr-link-row>
+<template is="dom-if" if="[[!isPrivacySandboxRestrictedNoticeEnabled_]]">
+  <cr-link-row
+      id="privacySandboxTopicsLinkRow"
+      start-icon="settings20:interests"
+      label="$i18n{adPrivacyPageTopicsLinkRowLabel}"
+      sub-label="[[computePrivacySandboxTopicsSublabel_(
+          prefs.privacy_sandbox.m1.topics_enabled.value)]]"
+      on-click="onPrivacySandboxTopicsClick_"></cr-link-row>
+  <cr-link-row
+      id="privacySandboxFledgeLinkRow"
+      start-icon="settings20:checklist"
+      class="hr"
+      label="$i18n{adPrivacyPageFledgeLinkRowLabel}"
+      sub-label="[[computePrivacySandboxFledgeSublabel_(
+          prefs.privacy_sandbox.m1.fledge_enabled.value)]]"
+      on-click="onPrivacySandboxFledgeClick_"></cr-link-row>
+</template>
 <cr-link-row
     id="privacySandboxAdMeasurementLinkRow"
     start-icon="settings20:bar-chart"

chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.ts

diff --git a/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.ts
index afa6e55..eee0b2f 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_sandbox/privacy_sandbox_page.ts
@@ -11,6 +11,7 @@
 import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js';
 import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
+import {loadTimeData} from '../../i18n_setup.js';
 import {MetricsBrowserProxy, MetricsBrowserProxyImpl} from '../../metrics_browser_proxy.js';
 import {routes} from '../../route.js';
 import {Router} from '../../router.js';
@@ -20,8 +21,6 @@
 export interface SettingsPrivacySandboxPageElement {
   $: {
     privacySandboxAdMeasurementLinkRow: CrLinkRowElement,
-    privacySandboxFledgeLinkRow: CrLinkRowElement,
-    privacySandboxTopicsLinkRow: CrLinkRowElement,
   };
 }
 
@@ -47,9 +46,16 @@
         type: Object,
         notify: true,
       },
+
+      isPrivacySandboxRestrictedNoticeEnabled_: {
+        type: Boolean,
+        value: () =>
+            loadTimeData.getBoolean('isPrivacySandboxRestrictedNoticeEnabled'),
+      },
     };
   }
 
+  private isPrivacySandboxRestrictedNoticeEnabled_: boolean;
   private metricsBrowserProxy_: MetricsBrowserProxy =
       MetricsBrowserProxyImpl.getInstance();
 

chrome/browser/resources/settings/route.ts

diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
index d12a49f..4d36890 100644
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -35,6 +35,13 @@
         r.PRIVACY_SANDBOX.createChild('/adPrivacy/sites');
     r.PRIVACY_SANDBOX_AD_MEASUREMENT =
         r.PRIVACY_SANDBOX.createChild('/adPrivacy/measurement');
+  } else if (loadTimeData.getBoolean(
+                 'isPrivacySandboxRestrictedNoticeEnabled')) {
+    r.PRIVACY_SANDBOX = r.PRIVACY.createChild('/adPrivacy');
+    // When the view is restricted, but the notice is configured to show, allow
+    // measurement settings only.
+    r.PRIVACY_SANDBOX_AD_MEASUREMENT =
+        r.PRIVACY_SANDBOX.createChild('/adPrivacy/measurement');
   }
 
   // <if expr="use_nss_certs">

chrome/browser/resources/settings/settings_vars.css

diff --git a/chrome/browser/resources/settings/settings_vars.css b/chrome/browser/resources/settings/settings_vars.css
index 4a44bae..aefa6f0 100644
--- a/chrome/browser/resources/settings/settings_vars.css
+++ b/chrome/browser/resources/settings/settings_vars.css
@@ -24,9 +24,6 @@
   /* Spacing between a control (e.g. checkbox) and its label. */
   --settings-control-label-spacing: 20px;
 
-  /* Spacing between policy (controlledBy) indicator and control. */
-  --settings-controlled-by-spacing: var(--cr-controlled-by-spacing);
-
   --iron-icon-fill-color: var(--google-grey-700);
   --iron-icon-height: var(--cr-icon-size);
   --iron-icon-width: var(--cr-icon-size);

chrome/browser/resources/side_panel/bookmarks/BUILD.gn

diff --git a/chrome/browser/resources/side_panel/bookmarks/BUILD.gn b/chrome/browser/resources/side_panel/bookmarks/BUILD.gn
index 8f0bab45..a24b97c 100644
--- a/chrome/browser/resources/side_panel/bookmarks/BUILD.gn
+++ b/chrome/browser/resources/side_panel/bookmarks/BUILD.gn
@@ -65,7 +65,7 @@
     "//ui/webui/resources/mojo:build_ts",
   ]
   ts_path_mappings =
-      [ "chrome://bookmarks-side-panel.top-chrome/shared/*|" +
+      [ "//bookmarks-side-panel.top-chrome/shared/*|" +
         rebase_path(
             "$root_gen_dir/chrome/browser/resources/side_panel/shared/tsc/*",
             target_gen_dir) ]

chrome/browser/resources/side_panel/read_anything/BUILD.gn

diff --git a/chrome/browser/resources/side_panel/read_anything/BUILD.gn b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
index d517a84..3a86dc8 100644
--- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn
+++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
@@ -28,7 +28,7 @@
     "//tools/typescript/definitions/pending.d.ts",
   ]
   ts_path_mappings =
-      [ "chrome://read-anything-side-panel.top-chrome/shared/*|" +
+      [ "//read-anything-side-panel.top-chrome/shared/*|" +
         rebase_path(
             "$root_gen_dir/chrome/browser/resources/side_panel/shared/tsc/*",
             target_gen_dir) ]

chrome/browser/resources/side_panel/read_anything/app.ts

diff --git a/chrome/browser/resources/side_panel/read_anything/app.ts b/chrome/browser/resources/side_panel/read_anything/app.ts
index b9ec0acf..54b2182 100644
--- a/chrome/browser/resources/side_panel/read_anything/app.ts
+++ b/chrome/browser/resources/side_panel/read_anything/app.ts
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'chrome://read-anything-side-panel.top-chrome/shared/sp_empty_state.js';
-import 'chrome://resources/cr_elements/cr_hidden_style.css.js';
+import '//read-anything-side-panel.top-chrome/shared/sp_empty_state.js';
+import '//resources/cr_elements/cr_hidden_style.css.js';
 import '../strings.m.js';
 
-import {WebUiListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
-import {assert} from 'chrome://resources/js/assert_ts.js';
-import {rgbToSkColor, skColorToRgba} from 'chrome://resources/js/color_utils.js';
-import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
-import {SkColor} from 'chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js';
-import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {WebUiListenerMixin} from '//resources/cr_elements/web_ui_listener_mixin.js';
+import {assert} from '//resources/js/assert_ts.js';
+import {rgbToSkColor, skColorToRgba} from '//resources/js/color_utils.js';
+import {loadTimeData} from '//resources/js/load_time_data.js';
+import {SkColor} from '//resources/mojo/skia/public/mojom/skcolor.mojom-webui.js';
+import {PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {getTemplate} from './app.html.js';
 
@@ -226,9 +226,9 @@
   }
 
   showLoading() {
-    this.emptyStateImagePath_ = 'chrome://resources/images/throbber_small.svg';
+    this.emptyStateImagePath_ = '//resources/images/throbber_small.svg';
     this.emptyStateDarkImagePath_ =
-        'chrome://resources/images/throbber_small_dark.svg';
+        '//resources/images/throbber_small_dark.svg';
     this.emptyStateHeading_ =
         loadTimeData.getString('readAnythingLoadingMessage');
     this.emptyStateSubheading_ = '';

chrome/browser/resources/side_panel/read_anything/read_anything.html

diff --git a/chrome/browser/resources/side_panel/read_anything/read_anything.html b/chrome/browser/resources/side_panel/read_anything/read_anything.html
index f446a00..f7bac1d 100644
--- a/chrome/browser/resources/side_panel/read_anything/read_anything.html
+++ b/chrome/browser/resources/side_panel/read_anything/read_anything.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <title>$i18n{readAnythingTabTitle}</title>
   <meta name="color-scheme" content="light dark">
-  <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
-  <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
+  <link rel="stylesheet" href="//resources/css/text_defaults_md.css">
+  <link rel="stylesheet" href="//resources/css/md_colors.css">
   <style>
     html,
     body {

chrome/browser/resources/side_panel/shared/sp_empty_state.ts

diff --git a/chrome/browser/resources/side_panel/shared/sp_empty_state.ts b/chrome/browser/resources/side_panel/shared/sp_empty_state.ts
index 8a644a2..cd89294 100644
--- a/chrome/browser/resources/side_panel/shared/sp_empty_state.ts
+++ b/chrome/browser/resources/side_panel/shared/sp_empty_state.ts
@@ -8,7 +8,7 @@
 
 import '//resources/cr_elements/cr_shared_vars.css.js';
 
-import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+import {PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {getTemplate} from './sp_empty_state.html.js';
 

chrome/browser/shell_integration_win.cc

diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 6976b7e..30fe1f8 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -63,7 +63,7 @@
 
 BASE_FEATURE(kWin10UnattendedDefault,
              "Win10UnattendedDefault",
-             base::FEATURE_ENABLED_BY_DEFAULT);
+             base::FEATURE_DISABLED_BY_DEFAULT);
 
 bool CanSetAsDefaultDirectly() {
   return base::FeatureList::IsEnabled(kWin10UnattendedDefault);

chrome/browser/storage/storage_notification_service_impl.cc

diff --git a/chrome/browser/storage/storage_notification_service_impl.cc b/chrome/browser/storage/storage_notification_service_impl.cc
index 197a21607..66f7c28 100644
--- a/chrome/browser/storage/storage_notification_service_impl.cc
+++ b/chrome/browser/storage/storage_notification_service_impl.cc
@@ -12,6 +12,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "third_party/blink/public/common/storage_key/storage_key.h"
 
 namespace {
 
@@ -40,7 +41,7 @@
       &StorageNotificationServiceImpl::MaybeShowStoragePressureNotification,
       weak_ptr_factory_.GetWeakPtr());
   return base::BindRepeating(
-      [](StoragePressureNotificationCallback cb, blink::StorageKey key) {
+      [](StoragePressureNotificationCallback cb, const blink::StorageKey& key) {
         content::GetUIThreadTaskRunner({})->PostTask(
             FROM_HERE,
             base::BindOnce([](StoragePressureNotificationCallback callback,
@@ -51,7 +52,7 @@
 }
 
 void StorageNotificationServiceImpl::MaybeShowStoragePressureNotification(
-    const blink::StorageKey storage_key) {
+    const blink::StorageKey& storage_key) {
   auto origin = storage_key.origin();
   if (!disk_pressure_notification_last_sent_at_.is_null() &&
       base::TimeTicks::Now() - disk_pressure_notification_last_sent_at_ <

chrome/browser/storage/storage_notification_service_impl.h

diff --git a/chrome/browser/storage/storage_notification_service_impl.h b/chrome/browser/storage/storage_notification_service_impl.h
index 6212053..ea94012f 100644
--- a/chrome/browser/storage/storage_notification_service_impl.h
+++ b/chrome/browser/storage/storage_notification_service_impl.h
@@ -9,7 +9,10 @@
 #include "base/time/time.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/storage_notification_service.h"
-#include "third_party/blink/public/common/storage_key/storage_key.h"
+
+namespace blink {
+class StorageKey;
+}
 
 class StorageNotificationServiceImpl
     : public content::StorageNotificationService,
@@ -17,13 +20,20 @@
  public:
   StorageNotificationServiceImpl();
   ~StorageNotificationServiceImpl() override;
+
+  StorageNotificationServiceImpl(const StorageNotificationServiceImpl& other) =
+      delete;
+  StorageNotificationServiceImpl operator=(
+      const StorageNotificationServiceImpl& other) = delete;
+
   // Called from the UI thread, this method returns a callback that can passed
   // to any thread, and proxies calls to
   // `MaybeShowStoragePressureNotification()` back to the UI thread. It wraps a
   // weak pointer to `this`.
   StoragePressureNotificationCallback
   CreateThreadSafePressureNotificationCallback() override;
-  void MaybeShowStoragePressureNotification(const blink::StorageKey) override;
+  void MaybeShowStoragePressureNotification(
+      const blink::StorageKey& storage_key) override;
   base::TimeTicks GetLastSentAtForTesting() {
     return disk_pressure_notification_last_sent_at_;
   }

chrome/browser/supervised_user/child_accounts/child_account_service.cc

diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.cc b/chrome/browser/supervised_user/child_accounts/child_account_service.cc
index 333ff83..f11d669 100644
--- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc
+++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/profiles/profile_key.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h"
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
 #include "chrome/browser/supervised_user/kids_chrome_management/kids_management_service.h"
 #include "chrome/browser/supervised_user/kids_chrome_management/kids_profile_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
@@ -30,6 +29,7 @@
 #include "components/signin/public/identity_manager/account_info.h"
 #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
 #include "components/signin/public/identity_manager/tribool.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 #include "components/supervised_user/core/browser/proto/families_common.pb.h"
 #include "components/supervised_user/core/browser/proto/kidschromemanagement_messages.pb.h"
 #include "components/supervised_user/core/browser/supervised_user_settings_service.h"

chrome/browser/supervised_user/child_accounts/child_account_service.h

diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.h b/chrome/browser/supervised_user/child_accounts/child_account_service.h
index 64f720ad..7d520ad8 100644
--- a/chrome/browser/supervised_user/child_accounts/child_account_service.h
+++ b/chrome/browser/supervised_user/child_accounts/child_account_service.h
@@ -15,13 +15,13 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/supervised_user/child_accounts/family_info_fetcher.h"
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
 #include "chrome/browser/supervised_user/kids_chrome_management/kids_profile_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 #include "components/supervised_user/core/browser/proto/kidschromemanagement_messages.pb.h"
 #include "net/base/backoff_entry.h"
 

chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc

diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc
index 4e7b79a..5617284 100644
--- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc
+++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc
@@ -16,11 +16,11 @@
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
 #include "components/signin/public/base/consent_level.h"
 #include "components/signin/public/identity_manager/access_token_info.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/primary_account_access_token_fetcher.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 #include "components/supervised_user/core/common/supervised_user_constants.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/base/load_flags.h"

chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc

diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc b/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc
index 16169ee..56d364d2d 100644
--- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc
+++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc
@@ -18,10 +18,10 @@
 #include "base/test/task_environment.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
 #include "components/signin/public/base/consent_level.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/identity_test_environment.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"

chrome/browser/supervised_user/kids_chrome_management/kids_management_service.cc

diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.cc b/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.cc
index 0967e10..7c694a6 100644
--- a/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.cc
+++ b/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h"
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
 #include "chrome/browser/supervised_user/kids_chrome_management/kids_profile_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
@@ -28,6 +27,7 @@
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/primary_account_change_event.h"
 #include "components/signin/public/identity_manager/tribool.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 #include "components/supervised_user/core/browser/proto/families_common.pb.h"
 #include "components/supervised_user/core/browser/proto/kidschromemanagement_messages.pb.h"
 #include "components/supervised_user/core/common/buildflags.h"

chrome/browser/supervised_user/kids_chrome_management/kids_management_service.h

diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.h b/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.h
index 744192b..63a34fb 100644
--- a/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.h
+++ b/chrome/browser/supervised_user/kids_chrome_management/kids_management_service.h
@@ -19,7 +19,6 @@
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
 #include "chrome/browser/supervised_user/kids_chrome_management/kids_profile_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "components/keyed_service/core/keyed_service.h"
@@ -27,6 +26,7 @@
 #include "components/signin/public/identity_manager/account_info.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/signin/public/identity_manager/primary_account_change_event.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 #include "components/supervised_user/core/browser/proto/kidschromemanagement_messages.pb.h"
 #include "content/public/browser/browser_context.h"
 #include "net/base/backoff_entry.h"

chrome/browser/supervised_user/supervised_user_service.cc

diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 23b722d..8c13bfec 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -121,7 +121,7 @@
       base::BindRepeating(&SupervisedUserService::OnSupervisedUserIdChanged,
                           base::Unretained(this)));
 
-  SetActive(IsChild());
+  SetActive(IsSubjectToParentalControls());
 }
 
 void SupervisedUserService::SetDelegate(Delegate* delegate) {
@@ -187,9 +187,9 @@
 bool SupervisedUserService::IsURLFilteringEnabled() const {
 // TODO(b/271413641): Use capabilities to verify if filtering is enabled on iOS.
 #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
-  return profile_->IsChild();
+  return IsSubjectToParentalControls();
 #else
-  return profile_->IsChild() &&
+  return IsSubjectToParentalControls() &&
          base::FeatureList::IsEnabled(
              supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS);
 #endif
@@ -198,9 +198,9 @@
 bool SupervisedUserService::AreExtensionsPermissionsEnabled() const {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
-  return profile_->IsChild();
+  return IsSubjectToParentalControls();
 #else
-  return profile_->IsChild() &&
+  return IsSubjectToParentalControls() &&
          base::FeatureList::IsEnabled(
              supervised_user::
                  kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
@@ -278,7 +278,7 @@
 
 bool SupervisedUserService::
     GetSupervisedUserExtensionsMayRequestPermissionsPref() const {
-  DCHECK(IsChild())
+  DCHECK(IsSubjectToParentalControls())
       << "Calling GetSupervisedUserExtensionsMayRequestPermissionsPref() only "
          "makes sense for supervised users";
   return user_prefs_->GetBoolean(
@@ -407,8 +407,9 @@
   }
 }
 
-bool SupervisedUserService::IsChild() const {
-  return profile_->IsChild();
+bool SupervisedUserService::IsSubjectToParentalControls() const {
+  return user_prefs_->GetString(prefs::kSupervisedUserId) ==
+         supervised_user::kChildAccountSUID;
 }
 
 void SupervisedUserService::OnCustodianInfoChanged() {
@@ -417,7 +418,7 @@
 }
 
 void SupervisedUserService::OnSupervisedUserIdChanged() {
-  SetActive(IsChild());
+  SetActive(IsSubjectToParentalControls());
 }
 
 void SupervisedUserService::OnDefaultFilteringBehaviorChanged() {
@@ -441,7 +442,7 @@
 }
 
 bool SupervisedUserService::IsSafeSitesEnabled() const {
-  return profile_->IsChild() &&
+  return IsSubjectToParentalControls() &&
          user_prefs_->GetBoolean(prefs::kSupervisedUserSafeSites);
 }
 
@@ -518,7 +519,7 @@
     return;
   DCHECK(!did_shutdown_);
   did_shutdown_ = true;
-  if (IsChild()) {
+  if (IsSubjectToParentalControls()) {
     base::RecordAction(UserMetricsAction("ManagedUsers_QuitBrowser"));
   }
   SetActive(false);
@@ -596,7 +597,7 @@
 
 bool SupervisedUserService::UserMayLoad(const Extension* extension,
                                         std::u16string* error) const {
-  DCHECK(IsChild());
+  DCHECK(IsSubjectToParentalControls());
   ExtensionState result = GetExtensionState(*extension);
   bool may_load = result != ExtensionState::BLOCKED;
   if (!may_load && error)
@@ -608,7 +609,7 @@
     const Extension* extension,
     extensions::disable_reason::DisableReason* reason,
     std::u16string* error) const {
-  DCHECK(IsChild());
+  DCHECK(IsSubjectToParentalControls());
   ExtensionState state = GetExtensionState(*extension);
   // Only extensions that require approval should be disabled.
   // Blocked extensions should be not loaded at all, and are taken care of
@@ -652,7 +653,7 @@
   // shouldn't be needed.
   if (!active_)
     return;
-  DCHECK(IsChild());
+  DCHECK(IsSubjectToParentalControls());
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile_);
   const Extension* extension = registry->GetInstalledExtension(extension_id);
   // If the extension is not installed (yet), do nothing.

chrome/browser/supervised_user/supervised_user_service.h

diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
index 473b4a25..4bd31eb 100644
--- a/chrome/browser/supervised_user/supervised_user_service.h
+++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -197,6 +197,12 @@
   // metrics. Ignores reporting when AreWebFilterPrefsDefault() is true.
   void ReportNonDefaultWebFilterValue() const;
 
+  // Returns true if both: the user is a type of Family Link supervised account
+  // and the platform supports Family Link supervision features.
+  // This method should be prefered on gating child-specific features if there
+  // is no dedicated method for the feature (e.g IsURLFilteringEnabled).
+  bool IsSubjectToParentalControls() const;
+
  private:
   friend class SupervisedUserServiceExtensionTestBase;
   friend class SupervisedUserServiceFactory;
@@ -222,10 +228,6 @@
 
   void SetActive(bool active);
 
-  // Returns true if the user is a type of Family Link supervised account, this
-  // includes Unicorn, Geller, and Griffin accounts.
-  bool IsChild() const;
-
   void OnCustodianInfoChanged();
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)

chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc

diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc
index 2fd7aeb..bed047af 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_cros.cc
@@ -18,6 +18,24 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_7Standalone_11Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
     WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_7Standalone_11Standalone_41_10Standalone_42_11Standalone_7Standalone) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -253,22 +271,5 @@
   helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_7Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc

diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
index 5b5e765..3c136b35 100644
--- a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
+++ b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
@@ -17,6 +17,123 @@
 
 using WebAppIntegration = TwoClientWebAppsIntegrationTestBase;
 
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.InstallLocally(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.InstallLocally(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SwitchProfileClients(ProfileClient::kClient2);
+  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
 IN_PROC_BROWSER_TEST_F(WebAppIntegration,
                        WAI_41_29StandaloneWindowed_42_40Client2_45Standalone) {
   // Test contents are generated by script. Please do not modify!
@@ -117,34 +234,6 @@
   helper_.CheckLaunchIconNotShown();
 }
 
-// TODO(crbug.com/1427296): Mac LaunchFromPlatformShortcut behavior does not
-// match other platforms.
-#if BUILDFLAG(IS_MAC)
-#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One \
-  DISABLED_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One
-#else
-#define MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One \
-  WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One
-#endif
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    MAYBE_WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.InstallLocally(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
     WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_41_10Standalone_42_45Standalone) {
@@ -1080,97 +1169,5 @@
   helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_40Client2_45Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_46Standalone_7Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.InstallLocally(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_40Client2_45Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SwitchProfileClients(ProfileClient::kClient2);
-  helper_.CheckAppInListNotLocallyInstalled(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/BUILD.gn

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 583a4c2..9349fb9 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2824,6 +2824,8 @@
       "webui/ash/login/demo_setup_screen_handler.h",
       "webui/ash/login/device_disabled_screen_handler.cc",
       "webui/ash/login/device_disabled_screen_handler.h",
+      "webui/ash/login/display_size_screen_handler.cc",
+      "webui/ash/login/display_size_screen_handler.h",
       "webui/ash/login/enable_adb_sideloading_screen_handler.cc",
       "webui/ash/login/enable_adb_sideloading_screen_handler.h",
       "webui/ash/login/enable_debugging_screen_handler.cc",

chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl.cc

diff --git a/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl.cc b/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl.cc
index fdd9bf1..572e51913 100644
--- a/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl.cc
+++ b/chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/ash/global_media_controls/media_notification_provider_impl.h"
 
+#include "ash/system/media/media_color_theme.h"
 #include "ash/system/media/media_notification_provider.h"
 #include "ash/system/media/media_notification_provider_observer.h"
 #include "base/metrics/histogram_functions.h"
@@ -167,7 +168,7 @@
       BuildDeviceSelector(
           id, item, GetDeviceService(item), &device_selector_delegate_, profile,
           global_media_controls::GlobalMediaControlsEntryPoint::kSystemTray),
-      color_theme_,
+      color_theme_, GetCrosMediaColorTheme(),
       media_message_center::MediaDisplayPage::kQuickSettingsMediaDetailedView);
   auto* item_ui_ptr = item_ui.get();
   item_ui_observer_set_.Observe(id, item_ui_ptr);

chrome/browser/ui/ash/user_education/views/help_bubble_factory_views_ash_browsertest.cc

diff --git a/chrome/browser/ui/ash/user_education/views/help_bubble_factory_views_ash_browsertest.cc b/chrome/browser/ui/ash/user_education/views/help_bubble_factory_views_ash_browsertest.cc
new file mode 100644
index 0000000..6469ca4
--- /dev/null
+++ b/chrome/browser/ui/ash/user_education/views/help_bubble_factory_views_ash_browsertest.cc
@@ -0,0 +1,96 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/user_education/views/help_bubble_factory_views_ash.h"
+
+#include <memory>
+
+#include "ash/user_education/user_education_class_properties.h"
+#include "ash/user_education/views/help_bubble_view_ash.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/user_education/user_education_service.h"
+#include "chrome/browser/ui/user_education/user_education_service_factory.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "components/user_education/common/help_bubble.h"
+#include "components/user_education/common/help_bubble_factory_registry.h"
+#include "components/user_education/common/help_bubble_params.h"
+#include "components/user_education/views/help_bubble_factory_views.h"
+#include "content/public/test/browser_test.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "ui/views/interaction/element_tracker_views.h"
+#include "ui/views/view_utils.h"
+#include "ui/views/widget/unique_widget_ptr.h"
+#include "ui/views/widget/widget.h"
+
+// Aliases.
+using ash::HelpBubbleContext;
+using ash::HelpBubbleViewAsh;
+using ash::HelpBubbleViewsAsh;
+using ash::kHelpBubbleContextKey;
+using user_education::HelpBubbleView;
+using user_education::HelpBubbleViews;
+
+// HelpBubbleFactoryViewsAshBrowserTest ----------------------------------------
+
+// Base class for browser tests of `HelpBubbleFactoryViewsAsh`, parameterized
+// by help bubble context.
+class HelpBubbleFactoryViewsAshBrowserTest
+    : public InProcessBrowserTest,
+      public testing::WithParamInterface<absl::optional<HelpBubbleContext>> {
+ public:
+  // Returns the help bubble context to use given test parameterization.
+  absl::optional<HelpBubbleContext> GetHelpBubbleContext() const {
+    return GetParam();
+  }
+
+  // Returns the help bubble factory registry for the active browser profile.
+  user_education::HelpBubbleFactoryRegistry& GetHelpBubbleFactoryRegistry() {
+    return UserEducationServiceFactory::GetForProfile(browser()->profile())
+        ->help_bubble_factory_registry();
+  }
+};
+
+INSTANTIATE_TEST_SUITE_P(
+    All,
+    HelpBubbleFactoryViewsAshBrowserTest,
+    testing::Values(absl::make_optional(HelpBubbleContext::kDefault),
+                    absl::make_optional(HelpBubbleContext::kAsh),
+                    absl::nullopt));
+
+// Tests -----------------------------------------------------------------------
+
+// Verifies that an Ash-specific help bubble will only take precedence over a
+// standard Views-specific help bubble if the tracked element's help bubble
+// context is explicitly set to `ash::HelpBubbleContext::kAsh`.
+IN_PROC_BROWSER_TEST_P(HelpBubbleFactoryViewsAshBrowserTest, CreateBubble) {
+  // Create an anchor `view` with parameterized help bubble `context`.
+  auto view = std::make_unique<views::View>();
+  absl::optional<HelpBubbleContext> context = GetHelpBubbleContext();
+  if (context.has_value()) {
+    view->SetProperty(kHelpBubbleContextKey, context.value());
+  }
+
+  // Show the anchor `view` in a `widget`.
+  views::UniqueWidgetPtr widget(std::make_unique<views::Widget>());
+  widget->Init(views::Widget::InitParams());
+  auto* view_ptr = widget->GetContentsView()->AddChildView(std::move(view));
+  widget->ShowInactive();
+
+  // Register the anchor `view` and cache the associated `element`.
+  ui::TrackedElement* element =
+      views::ElementTrackerViews::GetInstance()->GetElementForView(
+          view_ptr, /*assign_temporary_id=*/true);
+  ASSERT_TRUE(element);
+
+  // Create a help `bubble` anchored to `element`.
+  auto bubble = GetHelpBubbleFactoryRegistry().CreateHelpBubble(
+      element, user_education::HelpBubbleParams());
+  ASSERT_TRUE(bubble);
+
+  // The help `bubble` should be Ash-specific depending on `context`.
+  bool is_ash_context = context == HelpBubbleContext::kAsh;
+  ASSERT_EQ(bubble->IsA<HelpBubbleViewsAsh>(), is_ash_context);
+  ASSERT_NE(bubble->IsA<HelpBubbleViews>(), is_ash_context);
+}

chrome/browser/ui/ash/user_education/welcome_tour/welcome_tour_interactive_uitest.cc

diff --git a/chrome/browser/ui/ash/user_education/welcome_tour/welcome_tour_interactive_uitest.cc b/chrome/browser/ui/ash/user_education/welcome_tour/welcome_tour_interactive_uitest.cc
index be60309..d23215b 100644
--- a/chrome/browser/ui/ash/user_education/welcome_tour/welcome_tour_interactive_uitest.cc
+++ b/chrome/browser/ui/ash/user_education/welcome_tour/welcome_tour_interactive_uitest.cc
@@ -4,11 +4,11 @@
 
 #include "ash/constants/ash_features.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/user_education/views/help_bubble_view_ash.h"
 #include "ash/user_education/welcome_tour/welcome_tour_controller.h"
 #include "base/test/scoped_feature_list.h"
 #include "chrome/test/interaction/interactive_browser_test.h"
 #include "components/strings/grit/components_strings.h"
-#include "components/user_education/views/help_bubble_view.h"
 #include "content/public/test/browser_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/label_button.h"
@@ -44,31 +44,29 @@
 
   // Returns a builder for an interaction step that waits for a help bubble.
   [[nodiscard]] static auto WaitForHelpBubble() {
-    return WaitForShow(
-        user_education::HelpBubbleView::kHelpBubbleElementIdForTesting);
+    return WaitForShow(ash::HelpBubbleViewAsh::kHelpBubbleElementIdForTesting);
   }
 
   // Returns a builder for an interaction step that checks that the body text of
   // a help bubble matches the specified `message_id`.
   [[nodiscard]] static auto CheckHelpBubbleBodyText(int message_id) {
-    return CheckViewProperty(
-        user_education::HelpBubbleView::kBodyTextIdForTesting,
-        &views::Label::GetText, l10n_util::GetStringUTF16(message_id));
+    return CheckViewProperty(ash::HelpBubbleViewAsh::kBodyTextIdForTesting,
+                             &views::Label::GetText,
+                             l10n_util::GetStringUTF16(message_id));
   }
 
   // Returns a builder for an interaction step that checks that the default
   // button text of a help bubble matches the specified `message_id`.
   [[nodiscard]] static auto CheckHelpBubbleDefaultButtonText(int message_id) {
-    return CheckViewProperty(
-        user_education::HelpBubbleView::kDefaultButtonIdForTesting,
-        &views::LabelButton::GetText, l10n_util::GetStringUTF16(message_id));
+    return CheckViewProperty(ash::HelpBubbleViewAsh::kDefaultButtonIdForTesting,
+                             &views::LabelButton::GetText,
+                             l10n_util::GetStringUTF16(message_id));
   }
 
   // Returns a builder for an interaction step that presses the default button
   // of a help bubble.
   [[nodiscard]] auto PressHelpBubbleDefaultButton() {
-    return PressButton(
-        user_education::HelpBubbleView::kDefaultButtonIdForTesting);
+    return PressButton(ash::HelpBubbleViewAsh::kDefaultButtonIdForTesting);
   }
 
  private:

chrome/browser/ui/color/chrome_color_id.h

diff --git a/chrome/browser/ui/color/chrome_color_id.h b/chrome/browser/ui/color/chrome_color_id.h
index 4047a6b3a..1ccc285c6b 100644
--- a/chrome/browser/ui/color/chrome_color_id.h
+++ b/chrome/browser/ui/color/chrome_color_id.h
@@ -467,8 +467,11 @@
   E_CPONLY(kColorToolbarButtonIconPressed) \
   E_CPONLY(kColorToolbarButtonText) \
   E_CPONLY(kColorToolbarContentAreaSeparator) \
+  E_CPONLY(kColorToolbarExtensionSeparatorDisabled) \
+  E_CPONLY(kColorToolbarExtensionSeparatorEnabled) \
   E_CPONLY(kColorToolbarFeaturePromoHighlight) \
   E_CPONLY(kColorToolbarInkDrop) \
+  E_CPONLY(kColorToolbarInkDropHover) \
   E_CPONLY(kColorToolbarInkDropRipple) \
   E_CPONLY(kColorToolbarSeparator) \
   E_CPONLY(kColorToolbarSeparatorDefault) \

chrome/browser/ui/color/chrome_color_mixer.cc

diff --git a/chrome/browser/ui/color/chrome_color_mixer.cc b/chrome/browser/ui/color/chrome_color_mixer.cc
index 10f4bcb..d22c3e78 100644
--- a/chrome/browser/ui/color/chrome_color_mixer.cc
+++ b/chrome/browser/ui/color/chrome_color_mixer.cc
@@ -687,6 +687,13 @@
       ui::PickGoogleColor(ui::kColorAccent, kColorToolbar,
                           color_utils::kMinimumVisibleContrastRatio);
   mixer[kColorToolbarInkDrop] = ui::GetColorWithMaxContrast(kColorToolbar);
+  mixer[kColorToolbarInkDropHover] =
+      ui::SetAlpha(kColorToolbarInkDrop, kToolbarInkDropHighlightVisibleAlpha);
+  mixer[kColorToolbarInkDropRipple] =
+      ui::SetAlpha(kColorToolbarInkDrop, std::ceil(0.06f * 255.0f));
+  mixer[kColorToolbarExtensionSeparatorEnabled] = {kColorToolbarButtonIcon};
+  mixer[kColorToolbarExtensionSeparatorDisabled] = {
+      kColorToolbarButtonIconInactive};
   mixer[kColorToolbarSeparator] = {kColorToolbarSeparatorDefault};
   mixer[kColorToolbarSeparatorDefault] =
       ui::SetAlpha(kColorToolbarButtonIcon, 0x4D);

chrome/browser/ui/color/material_chrome_color_mixer.cc

diff --git a/chrome/browser/ui/color/material_chrome_color_mixer.cc b/chrome/browser/ui/color/material_chrome_color_mixer.cc
index 8e6162f..025f529 100644
--- a/chrome/browser/ui/color/material_chrome_color_mixer.cc
+++ b/chrome/browser/ui/color/material_chrome_color_mixer.cc
@@ -96,8 +96,11 @@
   mixer[kColorToolbarButtonText] = {ui::kColorSysOnSurfaceSecondary};
   mixer[kColorToolbarContentAreaSeparator] = {ui::kColorSysOutline};
   mixer[kColorToolbarFeaturePromoHighlight] = {ui::kColorSysPrimary};
-  mixer[kColorToolbarInkDrop] = {ui::kColorSysStateHoverOnSubtle};
+  mixer[kColorToolbarInkDropHover] = {ui::kColorSysStateHoverOnSubtle};
   mixer[kColorToolbarInkDropRipple] = {ui::kColorSysStateRippleNeutralOnSubtle};
+  mixer[kColorToolbarExtensionSeparatorEnabled] = {ui::kColorSysSurfaceVariant};
+  mixer[kColorToolbarExtensionSeparatorDisabled] = {
+      kColorToolbarButtonIconInactive};
   mixer[kColorToolbarSeparator] = {kColorToolbarSeparatorDefault};
   mixer[kColorToolbarSeparatorDefault] =
       ui::AlphaBlend(kColorToolbarButtonIcon, kColorToolbar, 0x3A);

chrome/browser/ui/color/material_tab_strip_color_mixer.cc

diff --git a/chrome/browser/ui/color/material_tab_strip_color_mixer.cc b/chrome/browser/ui/color/material_tab_strip_color_mixer.cc
index a807b138..278e302 100644
--- a/chrome/browser/ui/color/material_tab_strip_color_mixer.cc
+++ b/chrome/browser/ui/color/material_tab_strip_color_mixer.cc
@@ -11,6 +11,14 @@
 #include "ui/color/color_provider.h"
 #include "ui/color/color_recipe.h"
 
+namespace {
+/* 70% opacity */
+constexpr SkAlpha kWebUiTabStripScrollbarThumbAlpha = 0.7 * 255;
+
+/* 16% opacity */
+constexpr SkAlpha kWebUiTabStripTabSeparatorAlpha = 0.16 * 255;
+}  // namespace
+
 void AddMaterialTabStripColorMixer(ui::ColorProvider* provider,
                                    const ui::ColorProviderManager::Key& key) {
   if (!ShouldApplyChromeMaterialOverrides(key)) {
@@ -37,4 +45,17 @@
   mixer[kColorTabBackgroundHoverFrameActive] = {ui::kColorSysStateHeaderHover};
   mixer[kColorTabBackgroundHoverFrameInactive] = {
       ui::kColorSysStateHoverOnSubtle};
+
+  /* WebUI Tab Strip colors. */
+  mixer[kColorWebUiTabStripBackground] = {ui::kColorSysHeader};
+  mixer[kColorWebUiTabStripFocusOutline] = {ui::kColorSysPrimary};
+  mixer[kColorWebUiTabStripScrollbarThumb] =
+      ui::SetAlpha(ui::GetColorWithMaxContrast(ui::kColorSysHeader),
+                   kWebUiTabStripScrollbarThumbAlpha);
+  mixer[kColorWebUiTabStripTabActiveTitleBackground] = {ui::kColorSysPrimary};
+  mixer[kColorWebUiTabStripTabActiveTitleContent] = {ui::kColorSysOnPrimary};
+  mixer[kColorWebUiTabStripTabBackground] = {ui::kColorSysSurface};
+  mixer[kColorWebUiTabStripTabSeparator] =
+      ui::SetAlpha(ui::kColorSysOnSurface, kWebUiTabStripTabSeparatorAlpha);
+  mixer[kColorWebUiTabStripTabText] = {ui::kColorSysOnSurface};
 }

chrome/browser/ui/startup/web_app_startup_utils.cc

diff --git a/chrome/browser/ui/startup/web_app_startup_utils.cc b/chrome/browser/ui/startup/web_app_startup_utils.cc
index 9c675c6..8078368 100644
--- a/chrome/browser/ui/startup/web_app_startup_utils.cc
+++ b/chrome/browser/ui/startup/web_app_startup_utils.cc
@@ -322,15 +322,15 @@
     }
   }
 
-  void OnAppLaunched(Browser* browser,
-                     content::WebContents* web_contents,
+  void OnAppLaunched(base::WeakPtr<Browser> browser,
+                     base::WeakPtr<content::WebContents> web_contents,
                      apps::LaunchContainer container) {
     // The finalization step should only occur for the first app launch.
     if (app_window_has_been_launched_)
       return;
 
-    FinalizeWebAppLaunch(open_mode_, command_line_, is_first_run_, browser,
-                         container);
+    FinalizeWebAppLaunch(open_mode_, command_line_, is_first_run_,
+                         browser.get(), container);
     app_window_has_been_launched_ = true;
   }
 

chrome/browser/ui/storage_pressure_bubble.h

diff --git a/chrome/browser/ui/storage_pressure_bubble.h b/chrome/browser/ui/storage_pressure_bubble.h
index 175fd1e..c8e8081 100644
--- a/chrome/browser/ui/storage_pressure_bubble.h
+++ b/chrome/browser/ui/storage_pressure_bubble.h
@@ -10,7 +10,7 @@
 namespace chrome {
 
 // Shows a BubbleView that alerts the user about storage pressure.
-void ShowStoragePressureBubble(const url::Origin origin);
+void ShowStoragePressureBubble(const url::Origin& origin);
 
 }  // namespace chrome
 

chrome/browser/ui/views/DEPS

diff --git a/chrome/browser/ui/views/DEPS b/chrome/browser/ui/views/DEPS
index 63d17a41..94188a7 100644
--- a/chrome/browser/ui/views/DEPS
+++ b/chrome/browser/ui/views/DEPS
@@ -15,6 +15,9 @@
     "+chrome/services/qrcode_generator/public/cpp/qrcode_generator_service.h",
     "+chrome/services/qrcode_generator/public/mojom/qrcode_generator.mojom.h",
   ],
+  "browser_user_education_service.cc": [
+    "+ash/user_education/views/help_bubble_factory_views_ash.h",
+  ],
   "chrome_views_delegate_chromeos\.cc": [
     "+ash/shell.h",
   ],

chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc

diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
index 3e22390f..e7e710d58 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
@@ -148,6 +148,7 @@
     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
     case base::nix::DESKTOP_ENVIRONMENT_KDE5:
+    case base::nix::DESKTOP_ENVIRONMENT_KDE6:
     case base::nix::DESKTOP_ENVIRONMENT_UKUI:
     case base::nix::DESKTOP_ENVIRONMENT_UNITY:
     case base::nix::DESKTOP_ENVIRONMENT_XFCE:

chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc

diff --git a/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc b/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc
index cd59da7f..7fd405b4 100644
--- a/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc
+++ b/chrome/browser/ui/views/storage/storage_pressure_bubble_view.cc
@@ -43,13 +43,13 @@
 namespace chrome {
 
 // static
-void ShowStoragePressureBubble(const url::Origin origin) {
-  StoragePressureBubbleView::ShowBubble(std::move(origin));
+void ShowStoragePressureBubble(const url::Origin& origin) {
+  StoragePressureBubbleView::ShowBubble(origin);
 }
 
 }  // namespace chrome
 
-void StoragePressureBubbleView::ShowBubble(const url::Origin origin) {
+void StoragePressureBubbleView::ShowBubble(const url::Origin& origin) {
   Browser* browser = BrowserList::GetInstance()->GetLastActive();
   if (!browser)
     return;
@@ -58,19 +58,18 @@
       BrowserView::GetBrowserViewForBrowser(browser)
           ->toolbar_button_provider()
           ->GetAppMenuButton(),
-      browser, std::move(origin));
+      browser, origin);
   views::BubbleDialogDelegateView::CreateBubble(bubble)->Show();
 
   RecordBubbleHistogramValue(StoragePressureBubbleHistogramValue::kShown);
 }
 
-StoragePressureBubbleView::StoragePressureBubbleView(
-    views::View* anchor_view,
-    Browser* browser,
-    const url::Origin origin)
+StoragePressureBubbleView::StoragePressureBubbleView(views::View* anchor_view,
+                                                     Browser* browser,
+                                                     const url::Origin& origin)
     : BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       browser_(browser),
-      origin_(std::move(origin)),
+      origin_(origin),
       ignored_(true) {
   SetButtons(ui::DIALOG_BUTTON_OK);
   SetTitle(IDS_SETTINGS_STORAGE_PRESSURE_BUBBLE_VIEW_TITLE);

chrome/browser/ui/views/storage/storage_pressure_bubble_view.h

diff --git a/chrome/browser/ui/views/storage/storage_pressure_bubble_view.h b/chrome/browser/ui/views/storage/storage_pressure_bubble_view.h
index 135df0ce..ac2b7f47 100644
--- a/chrome/browser/ui/views/storage/storage_pressure_bubble_view.h
+++ b/chrome/browser/ui/views/storage/storage_pressure_bubble_view.h
@@ -16,12 +16,12 @@
  public:
   METADATA_HEADER(StoragePressureBubbleView);
 
-  static void ShowBubble(const url::Origin origin);
+  static void ShowBubble(const url::Origin& origin);
 
  private:
   StoragePressureBubbleView(views::View* anchor_view,
                             Browser* browser,
-                            const url::Origin origin);
+                            const url::Origin& origin);
   ~StoragePressureBubbleView() override;
 
   void OnDialogAccepted();

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

diff --git a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc
index db513cd..629b306 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc
@@ -93,9 +93,9 @@
           // is handled with chrome refresh.
           const auto* color_provider = host->GetColorProvider();
           const SkColor pressed_color =
-              color_provider ? color_provider->GetColor(
-                                   ui::kColorSysStateRippleNeutralOnSubtle)
-                             : gfx::kPlaceholderColor;
+              color_provider
+                  ? color_provider->GetColor(kColorToolbarInkDropRipple)
+                  : gfx::kPlaceholderColor;
           const float pressed_alpha = SkColorGetA(pressed_color);
 
           return std::make_unique<views::FloodFillInkDropRipple>(
@@ -112,7 +112,7 @@
           const auto* color_provider = host->GetColorProvider();
           const SkColor hover_color =
               color_provider
-                  ? color_provider->GetColor(ui::kColorSysStateHoverOnSubtle)
+                  ? color_provider->GetColor(kColorToolbarInkDropHover)
                   : gfx::kPlaceholderColor;
           const float hover_alpha = SkColorGetA(hover_color);
 

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

diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index beefe8f..9ef041a 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -808,9 +808,6 @@
   }
 
   if (toolbar_divider_) {
-    SkColor color = GetColorProvider()->GetColor(ui::kColorSysOutline);
-    toolbar_divider_->SetBackground(
-        views::CreateRoundedRectBackground(color, kToolbarDividerCornerRadius));
     toolbar_divider_->SetProperty(views::kMarginsKey,
                                   gfx::Insets::VH(0, kToolbarDividerSpacing));
   }
@@ -838,6 +835,10 @@
 
   if (toolbar_divider_ && extensions_container_) {
     toolbar_divider_->SetVisible(extensions_container_->GetVisible());
+    const SkColor toolbar_extension_separator_color =
+        GetColorProvider()->GetColor(kColorToolbarExtensionSeparatorEnabled);
+    toolbar_divider_->SetBackground(views::CreateRoundedRectBackground(
+        toolbar_extension_separator_color, kToolbarDividerCornerRadius));
   }
   // Cast button visibility is controlled externally.
 }

chrome/browser/ui/views/user_education/browser_user_education_service.cc

diff --git a/chrome/browser/ui/views/user_education/browser_user_education_service.cc b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
index 62ed3b1d..03a8431 100644
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -52,9 +52,13 @@
 #include "ui/views/view_utils.h"
 #include "ui/views/widget/widget.h"
 
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "ash/user_education/views/help_bubble_factory_views_ash.h"
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+
 #if BUILDFLAG(IS_MAC)
 #include "components/user_education/views/help_bubble_factory_mac.h"
-#endif
+#endif  // BUILDFLAG(IS_MAC)
 
 namespace {
 
@@ -185,6 +189,14 @@
     user_education::HelpBubbleFactoryRegistry& registry) {
   const user_education::HelpBubbleDelegate* const delegate =
       GetHelpBubbleDelegate();
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+  // TODO(http://b/277994050): Move registration after Lacros launch.
+  // Try to create an Ash-specific help bubble first. Note that an Ash-specific
+  // help bubble will only take precedence over a standard Views-specific help
+  // bubble if the tracked element's help bubble context is explicitly set to
+  // `ash::HelpBubbleContext::kAsh`.
+  registry.MaybeRegister<ash::HelpBubbleFactoryViewsAsh>(delegate);
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
   registry.MaybeRegister<user_education::HelpBubbleFactoryViews>(delegate);
   // Try to create a floating bubble first, if it's allowed.
   registry.MaybeRegister<FloatingWebUIHelpBubbleFactoryBrowser>(delegate);

chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
index b6c60154..dce81b3 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest.cc
@@ -197,6 +197,117 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
+  helper_.CheckCustomToolbar();
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
+  helper_.CheckCustomToolbar();
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
+  helper_.CheckCustomToolbar();
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.OpenInChrome();
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
     WAI_29StandaloneBrowser_11Standalone_7Standalone_37Standalone_18_19) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -5037,280 +5148,5 @@
   helper_.CheckWindowDisplayTabbed();
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
-  helper_.CheckCustomToolbar();
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
-  helper_.CheckCustomToolbar();
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_39StandaloneMinimalUi_16_71_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.NavigatePwa(Site::kStandalone, Site::kMinimalUi);
-  helper_.CheckCustomToolbar();
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_71_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.OpenInChrome();
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_34NotPromotable_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.LaunchFromChromeApps(Site::kNotPromotable);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_34NotPromotable_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromChromeApps(Site::kNotPromotable);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_34NotPromotable_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromChromeApps(Site::kNotPromotable);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/views/web_apps/web_app_integration_browsertest_cros.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_cros.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_cros.cc
index 05a2b60..8dde33a0 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_cros.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_cros.cc
@@ -12,6 +12,184 @@
 using WebAppIntegration = WebAppIntegrationTest;
 
 // Generated tests:
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_34NotPromotable_22One_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_34NotPromotable_22One_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_34NotPromotable_22One_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
 IN_PROC_BROWSER_TEST_F(WebAppIntegration, WAI_29FileHandlerBrowser) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or

chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc
index b659faa..f975bba 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac.cc
@@ -74,24 +74,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_1Standalone_127_26) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckWindowNotCreated();
-  helper_.CheckWindowDisplayStandalone();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_94) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -130,6 +112,220 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_94) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_94) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_94) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_94) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.ClosePwa();
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_1Standalone_127_26) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckWindowNotCreated();
+  helper_.CheckWindowDisplayStandalone();
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_74Standalone_72Standalone_1Standalone_127) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -208,44 +404,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_94) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabNotCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_94) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabNotCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_74Standalone_72Standalone_1Standalone_127) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -324,44 +482,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_94) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabNotCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_94) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabNotCreated();
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_74Standalone_72Standalone_1Standalone_127) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -1122,119 +1242,5 @@
   helper_.CheckWindowDisplayMinimal();
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_149Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_28_147Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.ClosePwa();
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc
index 69c926d..ceeb3f3 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc
@@ -155,10 +155,471 @@
   helper_.CheckPwaWindowCreated(Site::kFileHandler, Number::kTwo);
 }
 
+IN_PROC_BROWSER_TEST_F(WebAppIntegration, AppLaunchedInTab) {
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
 // Generated tests:
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_34NotPromotable_94_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_34NotPromotable_94_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_34NotPromotable_94_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromChromeApps(Site::kNotPromotable);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_1NotPromotable_22One_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_1NotPromotable_22One_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_1NotPromotable_22One_163NotPromotable) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kNotPromotable);
+  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
+  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kNotPromotable);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneNoShortcutBrowserWebApp_11Standalone_72Standalone_7Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kBrowser, InstallMode::kWebApp);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CreateShortcutsFromList(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_74Standalone_72Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.DeletePlatformShortcut(Site::kStandalone);
+  helper_.CreateShortcutsFromList(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_34Standalone_94_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromChromeApps(Site::kStandalone);
+  helper_.CheckTabNotCreated();
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
+                           WindowOptions::kWindowed, InstallMode::kWebApp);
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
     WAI_29NotPromotableWindowed_12NotPromotable_7NotPromotable_43NotPromotable_15Standalone) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -3376,267 +3837,6 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_149Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneNoShortcutWindowedWebApp_12Standalone_147Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneNoShortcutBrowserWebApp_11Standalone_72Standalone_7Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CreateShortcutsFromList(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_74Standalone_72Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.DeletePlatformShortcut(Site::kStandalone);
-  helper_.CreateShortcutsFromList(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneWithShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneBrowser_11Standalone_7Standalone_32StandaloneNoShortcutWindowedWebApp_7Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_149Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32StandaloneWithShortcutWindowedWebApp_12Standalone_7Standalone_147Standalone_34Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kStandalone, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kWindowed, InstallMode::kWebApp);
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.LaunchFromChromeApps(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32NotPromotableNoShortcutBrowserWebApp_11NotPromotable_1NotPromotable_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kNoShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29NotPromotableBrowser_11NotPromotable_7NotPromotable_1NotPromotable_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kNotPromotable, WindowOptions::kBrowser);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_32NotPromotableWithShortcutBrowserWebApp_11NotPromotable_7NotPromotable_1NotPromotable_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallPolicyApp(Site::kNotPromotable, ShortcutOptions::kWithShortcut,
-                           WindowOptions::kBrowser, InstallMode::kWebApp);
-  helper_.CheckAppInListTabbed(Site::kNotPromotable);
-  helper_.CheckPlatformShortcutAndIcon(Site::kNotPromotable);
-  helper_.LaunchFromPlatformShortcut(Site::kNotPromotable);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
     WAI_29FileHandlerWindowed_118FileHandlerFoo_118FileHandlerBar_149FileHandler_120FileHandlerOneFooFileAllowAskAgain_22One_126FileHandlerOneFooFile) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or

chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc
index 9b236cc..251d861 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_win_linux.cc
@@ -16,6 +16,126 @@
 
 IN_PROC_BROWSER_TEST_F(
     WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
+    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One_163Standalone) {
+  // Test contents are generated by script. Please do not modify!
+  // See `docs/webapps/why-is-this-test-failing.md` or
+  // `docs/webapps/integration-testing-framework` for more info.
+  // Sheriffs: Disabling this test is supported.
+  helper_.InstallMenuOption(InstallableSite::kStandalone);
+  helper_.CheckWindowCreated();
+  helper_.CheckAppInListWindowed(Site::kStandalone);
+  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
+  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
+                                           IsShown::kNotShown);
+  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
+  helper_.CheckAppInListTabbed(Site::kStandalone);
+  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
+  helper_.CheckTabCreated(Number::kOne);
+  helper_.CheckAppLoadedInTab(Site::kStandalone);
+}
+
+IN_PROC_BROWSER_TEST_F(
+    WebAppIntegration,
     WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_1Standalone_24_26) {
   // Test contents are generated by script. Please do not modify!
   // See `docs/webapps/why-is-this-test-failing.md` or
@@ -426,119 +546,5 @@
   helper_.CheckWindowDisplayMinimal();
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_29StandaloneWindowed_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.CreateShortcut(Site::kStandalone, WindowOptions::kWindowed);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_31Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallOmniboxIcon(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_149Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppSettings(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
-IN_PROC_BROWSER_TEST_F(
-    WebAppIntegration,
-    WAI_47Standalone_24_12Standalone_7Standalone_112StandaloneNotShown_147Standalone_11Standalone_1Standalone_22One) {
-  // Test contents are generated by script. Please do not modify!
-  // See `docs/webapps/why-is-this-test-failing.md` or
-  // `docs/webapps/integration-testing-framework` for more info.
-  // Sheriffs: Disabling this test is supported.
-  helper_.InstallMenuOption(InstallableSite::kStandalone);
-  helper_.CheckWindowCreated();
-  helper_.CheckAppInListWindowed(Site::kStandalone);
-  helper_.CheckPlatformShortcutAndIcon(Site::kStandalone);
-  helper_.CheckWindowControlsOverlayToggle(Site::kStandalone,
-                                           IsShown::kNotShown);
-  helper_.SetOpenInTabFromAppHome(Site::kStandalone);
-  helper_.CheckAppInListTabbed(Site::kStandalone);
-  helper_.LaunchFromPlatformShortcut(Site::kStandalone);
-  helper_.CheckTabCreated(Number::kOne);
-}
-
 }  // namespace
 }  // namespace web_app::integration_tests

chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
index 06ffb3d..2a6d1e4f 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -1387,7 +1387,7 @@
   base::RunLoop run_loop;
   BrowserAddedWaiter browser_added_waiter;
 #if BUILDFLAG(IS_MAC)
-  web_app::SetMacShimStartupDoneCallbackForTesting(run_loop.QuitClosure());
+  apps::SetMacShimStartupDoneCallbackForTesting(run_loop.QuitClosure());
 #else
   web_app::startup::SetStartupDoneCallbackForTesting(run_loop.QuitClosure());
 #endif
@@ -1436,7 +1436,7 @@
   base::RunLoop run_loop;
   BrowserAddedWaiter browser_added_waiter;
 #if BUILDFLAG(IS_MAC)
-  web_app::SetMacShimStartupDoneCallbackForTesting(run_loop.QuitClosure());
+  apps::SetMacShimStartupDoneCallbackForTesting(run_loop.QuitClosure());
 #else
   web_app::startup::SetStartupDoneCallbackForTesting(run_loop.QuitClosure());
 #endif
@@ -1470,17 +1470,47 @@
       << "No app installed for site: " << static_cast<int>(site);
 
   WebAppRegistrar& app_registrar = provider()->registrar_unsafe();
+#if BUILDFLAG(IS_CHROMEOS)
   DisplayMode display_mode = app_registrar.GetAppEffectiveDisplayMode(app_id);
-  if (display_mode == blink::mojom::DisplayMode::kBrowser) {
+  bool is_open_in_app_browser =
+      (display_mode != blink::mojom::DisplayMode::kBrowser);
+  if (is_open_in_app_browser) {
+    app_browser_ = LaunchWebAppBrowserAndWait(profile(), app_id);
+    active_app_id_ = app_id;
+  } else {
     ui_test_utils::UrlLoadObserver url_observer(
         app_registrar.GetAppLaunchUrl(app_id),
         content::NotificationService::AllSources());
     LaunchBrowserForWebAppInTab(profile(), app_id);
     url_observer.Wait();
-  } else {
-    app_browser_ = LaunchWebAppBrowserAndWait(profile(), app_id);
-    active_app_id_ = app_id;
   }
+#else
+  content::TestWebUI test_web_ui;
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetWebContentsAt(0);
+  CHECK(web_contents);
+  test_web_ui.set_web_contents(web_contents);
+  webapps::AppHomePageHandler app_home_page_handler =
+      GetTestAppHomePageHandler(&test_web_ui);
+
+  auto event_ptr = app_home::mojom::ClickEvent::New();
+  event_ptr->button = 0.0;
+  event_ptr->alt_key = false;
+  event_ptr->ctrl_key = false;
+  event_ptr->meta_key = false;
+  event_ptr->shift_key = false;
+
+  ui_test_utils::UrlLoadObserver url_observer(
+      app_registrar.GetAppLaunchUrl(app_id),
+      content::NotificationService::AllSources());
+  app_home_page_handler.LaunchApp(app_id, std::move(event_ptr));
+  url_observer.Wait();
+
+  // The app_browser_ is needed only for apps that open in a new window, and is
+  // nullptr for apps that launch in a tab.
+  app_browser_ = GetBrowserForAppId(profile(), app_id);
+  active_app_id_ = app_id;
+#endif
   AfterStateChangeAction();
 }
 
@@ -1566,7 +1596,10 @@
     // expected to open a new one, so only wait for a new browser to be added
     // if there wasn't an open one already.
     app_browser_ = GetBrowserForAppId(profile(), app_id);
+    base::RunLoop run_loop;
+    apps::SetMacShimStartupDoneCallbackForTesting(run_loop.QuitClosure());
     LaunchFromAppShim(site, /*urls=*/{}, /*wait_for_complete_launch=*/true);
+    run_loop.Run();
     if (!app_browser_) {
       browser_added_waiter.Wait();
       app_browser_ = browser_added_waiter.browser_added();
@@ -1574,7 +1607,10 @@
     active_app_id_ = app_id;
     EXPECT_TRUE(AppBrowserController::IsForWebApp(app_browser(), app_id));
   } else {
+    base::RunLoop run_loop;
+    apps::SetMacShimStartupDoneCallbackForTesting(run_loop.QuitClosure());
     LaunchFromAppShim(site, /*urls=*/{}, /*wait_for_complete_launch=*/true);
+    run_loop.Run();
   }
 #else
   if (is_open_in_app_browser) {
@@ -2876,7 +2912,7 @@
   } else {
 #endif
     ASSERT_TRUE(previous_browser_state.has_value());
-    EXPECT_GT(most_recent_browser_state->tabs.size(),
+    EXPECT_GE(most_recent_browser_state->tabs.size(),
               previous_browser_state->tabs.size());
     int tab_diff = most_recent_browser_state->tabs.size() -
                    previous_browser_state->tabs.size();
@@ -3362,6 +3398,37 @@
   AfterStateCheckAction();
 }
 
+void WebAppIntegrationTestDriver::CheckAppLoadedInTab(Site site) {
+  if (!BeforeStateCheckAction(__FUNCTION__)) {
+    return;
+  }
+
+  bool app_launched = false;
+  auto* browser_list = BrowserList::GetInstance();
+  for (Browser* browser : *browser_list) {
+    // Bypass apps that open in standalone windows.
+    if (AppBrowserController::IsWebApp(browser)) {
+      continue;
+    }
+
+    for (int i = 0; i < browser->tab_strip_model()->GetTabCount(); i++) {
+      content::WebContents* web_contents =
+          browser->tab_strip_model()->GetWebContentsAt(i);
+      const AppId* app_id = WebAppTabHelper::GetAppId(web_contents);
+      if (!app_id) {
+        continue;
+      }
+
+      if (*app_id == GetAppIdBySiteMode(site)) {
+        app_launched = true;
+        break;
+      }
+    }
+  }
+  EXPECT_TRUE(app_launched);
+  AfterStateCheckAction();
+}
+
 void WebAppIntegrationTestDriver::OnWebAppManifestUpdated(
     const AppId& app_id,
     base::StringPiece old_name) {

chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h

diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h
index 6306e81..78c278b 100644
--- a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h
+++ b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.h
@@ -376,6 +376,7 @@
   void CheckNotHasSubApp(Site subapp);
   void CheckHasSubApp(Site subapp);
   void CheckNoSubApps();
+  void CheckAppLoadedInTab(Site site);
 
  protected:
   // WebAppInstallManagerObserver:

chrome/browser/ui/web_applications/commands/launch_web_app_command.cc

diff --git a/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc b/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc
index 903a96bc..12583140 100644
--- a/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc
+++ b/chrome/browser/ui/web_applications/commands/launch_web_app_command.cc
@@ -144,8 +144,9 @@
   }
   base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
       FROM_HERE,
-      base::BindOnce(std::move(callback), browser,
-                     base::UnsafeDanglingUntriaged(web_contents), container));
+      base::BindOnce(
+          std::move(callback), browser ? browser->AsWeakPtr() : nullptr,
+          web_contents ? web_contents->GetWeakPtr() : nullptr, container));
   return base::Value(std::move(debug_value));
 }
 

chrome/browser/ui/web_applications/commands/launch_web_app_command_browsertest.cc

diff --git a/chrome/browser/ui/web_applications/commands/launch_web_app_command_browsertest.cc b/chrome/browser/ui/web_applications/commands/launch_web_app_command_browsertest.cc
index d5a237c..3820bce 100644
--- a/chrome/browser/ui/web_applications/commands/launch_web_app_command_browsertest.cc
+++ b/chrome/browser/ui/web_applications/commands/launch_web_app_command_browsertest.cc
@@ -56,9 +56,12 @@
     return *web_app::WebAppProvider::GetForTest(profile());
   }
 
-  std::tuple<Browser*, content::WebContents*, apps::LaunchContainer> DoLaunch(
-      apps::AppLaunchParams params) {
-    base::test::TestFuture<Browser*, content::WebContents*,
+  std::tuple<base::WeakPtr<Browser>,
+             base::WeakPtr<content::WebContents>,
+             apps::LaunchContainer>
+  DoLaunch(apps::AppLaunchParams params) {
+    base::test::TestFuture<base::WeakPtr<Browser>,
+                           base::WeakPtr<content::WebContents>,
                            apps::LaunchContainer>
         future;
     provider().scheduler().LaunchAppWithCustomParams(std::move(params),
@@ -98,14 +101,14 @@
       WindowOpenDisposition::NEW_FOREGROUND_TAB,
       apps::LaunchSource::kFromCommandLine, {}, absl::nullopt, absl::nullopt);
 
-  Browser* launch_browser;
-  content::WebContents* web_contents;
+  base::WeakPtr<Browser> launch_browser;
+  base::WeakPtr<content::WebContents> web_contents;
   apps::LaunchContainer launch_container;
   std::tie(launch_browser, web_contents, launch_container) =
       DoLaunch(std::move(launch_params));
 
-  EXPECT_FALSE(AppBrowserController::IsWebApp(launch_browser));
-  EXPECT_EQ(launch_browser, browser());
+  EXPECT_FALSE(AppBrowserController::IsWebApp(launch_browser.get()));
+  EXPECT_EQ(launch_browser.get(), browser());
   EXPECT_EQ(launch_browser->tab_strip_model()->count(), 2);
   EXPECT_EQ(web_contents->GetVisibleURL(), kAppStartUrl);
 }
@@ -116,14 +119,14 @@
       WindowOpenDisposition::CURRENT_TAB, apps::LaunchSource::kFromCommandLine,
       {}, absl::nullopt, absl::nullopt);
 
-  Browser* launch_browser;
-  content::WebContents* web_contents;
+  base::WeakPtr<Browser> launch_browser;
+  base::WeakPtr<content::WebContents> web_contents;
   apps::LaunchContainer launch_container;
   std::tie(launch_browser, web_contents, launch_container) =
       DoLaunch(std::move(launch_params));
 
-  EXPECT_TRUE(AppBrowserController::IsWebApp(launch_browser));
-  EXPECT_NE(launch_browser, browser());
+  EXPECT_TRUE(AppBrowserController::IsWebApp(launch_browser.get()));
+  EXPECT_NE(launch_browser.get(), browser());
   EXPECT_EQ(BrowserList::GetInstance()->size(), 2ul);
   EXPECT_EQ(launch_browser->tab_strip_model()->count(), 1);
   EXPECT_EQ(web_contents->GetVisibleURL(), kAppStartUrl);

chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc

diff --git a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc
new file mode 100644
index 0000000..8bd1251
--- /dev/null
+++ b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.cc
@@ -0,0 +1,37 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/webui/ash/login/display_size_screen_handler.h"
+
+#include "base/logging.h"
+
+#include "chrome/browser/ash/login/oobe_screen.h"
+#include "chrome/browser/ash/login/wizard_controller.h"
+#include "chrome/browser/ui/webui/ash/login/base_screen_handler.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/login/localized_values_builder.h"
+
+namespace ash {
+
+DisplaySizeScreenHandler::DisplaySizeScreenHandler()
+    : BaseScreenHandler(kScreenId) {}
+
+DisplaySizeScreenHandler::~DisplaySizeScreenHandler() = default;
+
+void DisplaySizeScreenHandler::DeclareLocalizedValues(
+    ::login::LocalizedValuesBuilder* builder) {
+  builder->Add("DisplaySizeTitle", IDS_OOBE_DISPLAY_SIZE_TITLE);
+  builder->Add("DisplaySizeDescription", IDS_OOBE_DISPLAY_SIZE_DESCRIPTION);
+  builder->Add("DisplaySizeAdditionalDescription",
+               IDS_OOBE_DISPLAY_SIZE_DESCRIPTION_ADDITIONAL);
+  builder->Add("DisplaySizeSliderTitle", IDS_OOBE_DISPLAY_SIZE_SLIDER_TITLE);
+  builder->Add("DisplaySizeSliderDescription",
+               IDS_OOBE_DISPLAY_SIZE_SLIDER_DESCRIPTION);
+}
+
+void DisplaySizeScreenHandler::Show() {
+  ShowInWebUI();
+}
+
+}  // namespace ash

chrome/browser/ui/webui/ash/login/display_size_screen_handler.h

diff --git a/chrome/browser/ui/webui/ash/login/display_size_screen_handler.h b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.h
new file mode 100644
index 0000000..17456620
--- /dev/null
+++ b/chrome/browser/ui/webui/ash/login/display_size_screen_handler.h
@@ -0,0 +1,50 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_WEBUI_ASH_LOGIN_DISPLAY_SIZE_SCREEN_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_ASH_LOGIN_DISPLAY_SIZE_SCREEN_HANDLER_H_
+
+#include "base/memory/weak_ptr.h"
+#include "base/values.h"
+#include "chrome/browser/ui/webui/ash/login/base_screen_handler.h"
+
+namespace ash {
+
+// Interface for dependency injection between DisplaySizeScreen and its
+// WebUI representation.
+class DisplaySizeScreenView
+    : public base::SupportsWeakPtr<DisplaySizeScreenView> {
+ public:
+  inline constexpr static StaticOobeScreenId kScreenId{"display-size",
+                                                       "DisplaySizeScreen"};
+
+  virtual ~DisplaySizeScreenView() = default;
+
+  // Shows the contents of the screen.
+  virtual void Show() = 0;
+};
+
+class DisplaySizeScreenHandler : public BaseScreenHandler,
+                                 public DisplaySizeScreenView {
+ public:
+  using TView = DisplaySizeScreenView;
+
+  DisplaySizeScreenHandler();
+
+  DisplaySizeScreenHandler(const DisplaySizeScreenHandler&) = delete;
+  DisplaySizeScreenHandler& operator=(const DisplaySizeScreenHandler&) = delete;
+
+  ~DisplaySizeScreenHandler() override;
+
+  // BaseScreenHandler:
+  void DeclareLocalizedValues(
+      ::login::LocalizedValuesBuilder* builder) override;
+
+  // DisplaySizeScreenView:
+  void Show() override;
+};
+
+}  // namespace ash
+
+#endif  // CHROME_BROWSER_UI_WEBUI_ASH_LOGIN_DISPLAY_SIZE_SCREEN_HANDLER_H_

chrome/browser/ui/webui/ash/login/oobe_ui.cc

diff --git a/chrome/browser/ui/webui/ash/login/oobe_ui.cc b/chrome/browser/ui/webui/ash/login/oobe_ui.cc
index e882c846..5f155dd 100644
--- a/chrome/browser/ui/webui/ash/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/ash/login/oobe_ui.cc
@@ -59,6 +59,7 @@
 #include "chrome/browser/ui/webui/ash/login/demo_preferences_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/device_disabled_screen_handler.h"
+#include "chrome/browser/ui/webui/ash/login/display_size_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/enable_adb_sideloading_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.h"
 #include "chrome/browser/ui/webui/ash/login/encryption_migration_screen_handler.h"
@@ -302,6 +303,10 @@
       "printFrontendTimings",
       command_line->HasSwitch(switches::kOobePrintFrontendLoadTimings));
 
+  source->AddBoolean("isDisplaySizeEnabled",
+                     (features::IsOobeChoobeEnabled() &&
+                      features::IsOobeDisplaySizeEnabled()));
+
   // Configure shared resources
   AddProductLogoResources(source);
   AddProjectSimonResources(source);
@@ -495,6 +500,10 @@
     AddScreenHandler(std::make_unique<TouchpadScrollScreenHandler>());
   }
 
+  if (features::IsOobeChoobeEnabled() && features::IsOobeDisplaySizeEnabled()) {
+    AddScreenHandler(std::make_unique<DisplaySizeScreenHandler>());
+  }
+
   AddScreenHandler(std::make_unique<LocalStateErrorScreenHandler>());
 
   AddScreenHandler(std::make_unique<CryptohomeRecoveryScreenHandler>());

chrome/browser/ui/webui/settings/settings_ui.cc

diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
index c76632f..300529a 100644
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -472,15 +472,20 @@
                    profile, chrome::FaviconUrlFormat::kFavicon2));
 
   // Privacy Sandbox
+  PrivacySandboxService* privacy_sandbox_service =
+      PrivacySandboxServiceFactory::GetForProfile(profile);
   bool is_privacy_sandbox_restricted =
-      PrivacySandboxServiceFactory::GetForProfile(profile)
-          ->IsPrivacySandboxRestricted();
+      privacy_sandbox_service->IsPrivacySandboxRestricted();
   bool is_privacy_sandbox_settings_4 =
       base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings4);
+  bool is_restricted_notice_enabled =
+      privacy_sandbox_service->IsRestrictedNoticeEnabled();
   html_source->AddBoolean("isPrivacySandboxRestricted",
                           is_privacy_sandbox_restricted);
   html_source->AddBoolean("isPrivacySandboxSettings4",
                           is_privacy_sandbox_settings_4);
+  html_source->AddBoolean("isPrivacySandboxRestrictedNoticeEnabled",
+                          is_restricted_notice_enabled);
   if (!is_privacy_sandbox_restricted && !is_privacy_sandbox_settings_4) {
     html_source->AddResourcePath(
         "privacySandbox", IDR_SETTINGS_PRIVACY_SANDBOX_PRIVACY_SANDBOX_HTML);

chrome/browser/ui/webui/settings/settings_utils_linux.cc

diff --git a/chrome/browser/ui/webui/settings/settings_utils_linux.cc b/chrome/browser/ui/webui/settings/settings_utils_linux.cc
index f15366e0..f95eefe 100644
--- a/chrome/browser/ui/webui/settings/settings_utils_linux.cc
+++ b/chrome/browser/ui/webui/settings/settings_utils_linux.cc
@@ -43,6 +43,7 @@
 const char* const kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy"};
 const char* const kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy"};
 const char* const kKDE5ProxyConfigCommand[] = {"kcmshell5", "proxy"};
+const char* const kKDE6ProxyConfigCommand[] = {"kcmshell6", "proxy"};
 
 // In Deepin OS, we might need to run dde-control-center instead.
 const char* const kDeepinProxyConfigCommand[] = {"dde-control-center",
@@ -140,6 +141,10 @@
       launched = StartProxyConfigUtil(kKDE5ProxyConfigCommand);
       break;
 
+    case base::nix::DESKTOP_ENVIRONMENT_KDE6:
+      launched = StartProxyConfigUtil(kKDE6ProxyConfigCommand);
+      break;
+
     case base::nix::DESKTOP_ENVIRONMENT_XFCE:
     case base::nix::DESKTOP_ENVIRONMENT_LXQT:
     case base::nix::DESKTOP_ENVIRONMENT_OTHER:

chrome/browser/web_applications/app_service/web_app_publisher_helper.cc

diff --git a/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc b/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc
index e3d4c05..cda2c07 100644
--- a/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc
+++ b/chrome/browser/web_applications/app_service/web_app_publisher_helper.cc
@@ -1908,13 +1908,14 @@
     bool is_system_web_app,
     absl::optional<GURL> override_url,
     base::OnceCallback<void(content::WebContents*)> on_complete,
-    Browser* browser,
-    content::WebContents* web_contents,
+    base::WeakPtr<Browser> browser,
+    base::WeakPtr<content::WebContents> web_contents,
     apps::LaunchContainer container) {
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   // Save all launch information for system web apps, because the
   // browser session restore can't restore system web apps.
-  int session_id = apps::GetSessionIdForRestoreFromWebContents(web_contents);
+  int session_id =
+      apps::GetSessionIdForRestoreFromWebContents(web_contents.get());
   if (SessionID::IsValidValue(session_id)) {
     if (is_system_web_app) {
       std::unique_ptr<app_restore::AppLaunchInfo> launch_info =
@@ -1935,7 +1936,7 @@
   }
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
-  std::move(on_complete).Run(web_contents);
+  std::move(on_complete).Run(web_contents.get());
 }
 
 }  // namespace web_app

chrome/browser/web_applications/app_service/web_app_publisher_helper.h

diff --git a/chrome/browser/web_applications/app_service/web_app_publisher_helper.h b/chrome/browser/web_applications/app_service/web_app_publisher_helper.h
index daa23c8..30fc3310 100644
--- a/chrome/browser/web_applications/app_service/web_app_publisher_helper.h
+++ b/chrome/browser/web_applications/app_service/web_app_publisher_helper.h
@@ -422,8 +422,8 @@
       bool is_system_web_app,
       absl::optional<GURL> override_url,
       base::OnceCallback<void(content::WebContents*)> on_complete,
-      Browser* browser,
-      content::WebContents* web_contents,
+      base::WeakPtr<Browser> browser,
+      base::WeakPtr<content::WebContents> web_contents,
       apps::LaunchContainer container);
 
   const raw_ptr<Profile, DanglingUntriaged> profile_;

chrome/browser/web_applications/commands/install_from_manifest_command.cc

diff --git a/chrome/browser/web_applications/commands/install_from_manifest_command.cc b/chrome/browser/web_applications/commands/install_from_manifest_command.cc
index 634d8566..e81f0046 100644
--- a/chrome/browser/web_applications/commands/install_from_manifest_command.cc
+++ b/chrome/browser/web_applications/commands/install_from_manifest_command.cc
@@ -203,6 +203,9 @@
   WebAppInstallFinalizer::FinalizeOptions finalize_options(install_source_);
   finalize_options.add_to_quick_launch_bar = false;
   finalize_options.overwrite_existing_manifest_fields = false;
+  // TODO(crbug.com/1250011): apply host_allowlist instead of disabling origin
+  // association validate for all origins.
+  finalize_options.skip_origin_association_validation = true;
 
   app_lock_->install_finalizer().FinalizeInstall(
       *web_app_info_, finalize_options,

chrome/browser/web_applications/externally_managed_app_install_task.cc

diff --git a/chrome/browser/web_applications/externally_managed_app_install_task.cc b/chrome/browser/web_applications/externally_managed_app_install_task.cc
index ce8039d..71f12f7 100644
--- a/chrome/browser/web_applications/externally_managed_app_install_task.cc
+++ b/chrome/browser/web_applications/externally_managed_app_install_task.cc
@@ -176,6 +176,12 @@
   auto internal_install_source = ConvertExternalInstallSourceToInstallSource(
       install_options().install_source);
   auto install_params = ConvertExternalInstallOptionsToParams(install_options_);
+
+  // Do not fetch web_app_origin_association data over network.
+  if (install_options_.only_use_app_info_factory) {
+    install_params.skip_origin_association_validation = true;
+  }
+
   install_params.bypass_os_hooks = true;
   auto web_app_info = install_options_.app_info_factory.Run();
   for (std::string& search_term : install_params.additional_search_terms) {

chrome/browser/web_applications/proto/web_app.proto

diff --git a/chrome/browser/web_applications/proto/web_app.proto b/chrome/browser/web_applications/proto/web_app.proto
index c1f3875..4046c0c 100644
--- a/chrome/browser/web_applications/proto/web_app.proto
+++ b/chrome/browser/web_applications/proto/web_app.proto
@@ -415,4 +415,10 @@
 
   // Contains web origins that are part of the app's extended scope.
   repeated WebAppScopeExtensionProto scope_extensions = 61;
+
+  // The same as scope_extensions but filtered to origins that have validated
+  // associations with this web app. See
+  // https://github.com/WICG/manifest-incubations/blob/gh-pages/scope_extensions-explainer.md
+  // for association requirements.
+  repeated WebAppScopeExtensionProto scope_extensions_validated = 62;
 }

chrome/browser/web_applications/test/fake_web_app_provider.cc

diff --git a/chrome/browser/web_applications/test/fake_web_app_provider.cc b/chrome/browser/web_applications/test/fake_web_app_provider.cc
index bfeeb88d..19f300da 100644
--- a/chrome/browser/web_applications/test/fake_web_app_provider.cc
+++ b/chrome/browser/web_applications/test/fake_web_app_provider.cc
@@ -183,6 +183,13 @@
   preinstalled_web_app_manager_ = std::move(preinstalled_web_app_manager);
 }
 
+void FakeWebAppProvider::SetOriginAssociationManager(
+    std::unique_ptr<WebAppOriginAssociationManager>
+        origin_association_manager) {
+  CheckNotStarted();
+  origin_association_manager_ = std::move(origin_association_manager);
+}
+
 WebAppRegistrarMutable& FakeWebAppProvider::GetRegistrarMutable() const {
   DCHECK(registrar_);
   return *static_cast<WebAppRegistrarMutable*>(registrar_.get());

chrome/browser/web_applications/test/fake_web_app_provider.h

diff --git a/chrome/browser/web_applications/test/fake_web_app_provider.h b/chrome/browser/web_applications/test/fake_web_app_provider.h
index c984363..680336d7 100644
--- a/chrome/browser/web_applications/test/fake_web_app_provider.h
+++ b/chrome/browser/web_applications/test/fake_web_app_provider.h
@@ -98,6 +98,9 @@
   void SetCommandManager(std::unique_ptr<WebAppCommandManager> command_manager);
   void SetPreinstalledWebAppManager(
       std::unique_ptr<PreinstalledWebAppManager> preinstalled_web_app_manager);
+  void SetOriginAssociationManager(
+      std::unique_ptr<WebAppOriginAssociationManager>
+          origin_association_manager);
 
   // These getters can be called at any time: no
   // WebAppProvider::CheckIsConnected() check performed. See

chrome/browser/web_applications/test/web_app_test_utils.cc

diff --git a/chrome/browser/web_applications/test/web_app_test_utils.cc b/chrome/browser/web_applications/test/web_app_test_utils.cc
index 8cbb0444..e7bf5ebf 100644
--- a/chrome/browser/web_applications/test/web_app_test_utils.cc
+++ b/chrome/browser/web_applications/test/web_app_test_utils.cc
@@ -24,6 +24,7 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/numerics/clamped_math.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/ranges/algorithm.h"
 #include "base/run_loop.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_number_conversions.h"
@@ -679,6 +680,15 @@
   app->SetUrlHandlers(CreateRandomUrlHandlers(random.next_uint()));
   app->SetScopeExtensions(
       CreateRandomScopeExtensions(random.next_uint(), random));
+
+  ScopeExtensions validated_scope_extensions;
+  base::ranges::copy_if(app->scope_extensions(),
+                        std::back_inserter(validated_scope_extensions),
+                        [&random](const ScopeExtensionInfo& extension) {
+                          return random.next_bool();
+                        });
+  app->SetValidatedScopeExtensions(validated_scope_extensions);
+
   if (random.next_bool()) {
     app->SetLockScreenStartUrl(scope.Resolve(
         "lock_screen_start_url" + base::NumberToString(random.next_uint())));

chrome/browser/web_applications/web_app.cc

diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index a6dab7b2..bdc6963 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -458,6 +458,11 @@
   scope_extensions_ = std::move(scope_extensions);
 }
 
+void WebApp::SetValidatedScopeExtensions(
+    std::vector<ScopeExtensionInfo> validated_scope_extensions) {
+  validated_scope_extensions_ = std::move(validated_scope_extensions);
+}
+
 void WebApp::SetLockScreenStartUrl(const GURL& lock_screen_start_url) {
   DCHECK(lock_screen_start_url.is_empty() || lock_screen_start_url.is_valid());
   lock_screen_start_url_ = lock_screen_start_url;
@@ -755,6 +760,7 @@
         app.disallowed_launch_protocols_,
         app.url_handlers_,
         app.scope_extensions_,
+        app.validated_scope_extensions_,
         app.lock_screen_start_url_,
         app.note_taking_new_note_url_,
         app.last_badging_time_,
@@ -1016,6 +1022,9 @@
 
   root.Set("scope_extensions", ConvertDebugValueList(scope_extensions_));
 
+  root.Set("scope_extensions_validated",
+           ConvertDebugValueList(validated_scope_extensions_));
+
   root.Set("user_display_mode",
            user_display_mode_.has_value()
                ? ConvertUserDisplayModeToString(*user_display_mode_)

chrome/browser/web_applications/web_app.h

diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h
index 733361e..6ca9540 100644
--- a/chrome/browser/web_applications/web_app.h
+++ b/chrome/browser/web_applications/web_app.h
@@ -202,6 +202,10 @@
     return scope_extensions_;
   }
 
+  const std::vector<ScopeExtensionInfo>& validated_scope_extensions() const {
+    return validated_scope_extensions_;
+  }
+
   RunOnOsLoginMode run_on_os_login_mode() const {
     return run_on_os_login_mode_;
   }
@@ -403,6 +407,8 @@
       base::flat_set<std::string> disallowed_launch_protocols);
   void SetUrlHandlers(apps::UrlHandlers url_handlers);
   void SetScopeExtensions(std::vector<ScopeExtensionInfo> scope_extensions);
+  void SetValidatedScopeExtensions(
+      std::vector<ScopeExtensionInfo> validated_scope_extensions);
   void SetLockScreenStartUrl(const GURL& lock_screen_start_url);
   void SetNoteTakingNewNoteUrl(const GURL& note_taking_new_note_url);
   void SetLastBadgingTime(const base::Time& time);
@@ -512,6 +518,7 @@
   // TODO(crbug.com/1072058): No longer aiming to ship, remove.
   apps::UrlHandlers url_handlers_;
   std::vector<ScopeExtensionInfo> scope_extensions_;
+  std::vector<ScopeExtensionInfo> validated_scope_extensions_;
   GURL lock_screen_start_url_;
   GURL note_taking_new_note_url_;
   base::Time last_badging_time_;

chrome/browser/web_applications/web_app_database.cc

diff --git a/chrome/browser/web_applications/web_app_database.cc b/chrome/browser/web_applications/web_app_database.cc
index 21092f831..1770b240 100644
--- a/chrome/browser/web_applications/web_app_database.cc
+++ b/chrome/browser/web_applications/web_app_database.cc
@@ -677,6 +677,14 @@
         scope_extension.has_origin_wildcard);
   }
 
+  for (const auto& valid_extension : web_app.validated_scope_extensions()) {
+    WebAppScopeExtensionProto* scope_extension_proto =
+        local_data->add_scope_extensions_validated();
+    scope_extension_proto->set_origin(valid_extension.origin.Serialize());
+    scope_extension_proto->set_has_origin_wildcard(
+        valid_extension.has_origin_wildcard);
+  }
+
   if (web_app.lock_screen_start_url().is_valid()) {
     local_data->set_lock_screen_start_url(
         web_app.lock_screen_start_url().spec());
@@ -1320,6 +1328,26 @@
   }
   web_app->SetScopeExtensions(std::move(scope_extensions));
 
+  std::vector<ScopeExtensionInfo> valid_scope_extensions;
+  for (const auto& scope_extension_proto :
+       local_data.scope_extensions_validated()) {
+    ScopeExtensionInfo scope_extension;
+
+    url::Origin origin =
+        url::Origin::Create(GURL(scope_extension_proto.origin()));
+    if (origin.opaque()) {
+      DLOG(ERROR) << "WebApp ScopeExtension proto url parse error: "
+                  << origin.GetDebugString();
+      return nullptr;
+    }
+    scope_extension.origin = std::move(origin);
+    scope_extension.has_origin_wildcard =
+        scope_extension_proto.has_origin_wildcard();
+
+    valid_scope_extensions.push_back(std::move(scope_extension));
+  }
+  web_app->SetValidatedScopeExtensions(std::move(valid_scope_extensions));
+
   if (local_data.has_lock_screen_start_url()) {
     web_app->SetLockScreenStartUrl(GURL(local_data.lock_screen_start_url()));
   }

chrome/browser/web_applications/web_app_database_unittest.cc

diff --git a/chrome/browser/web_applications/web_app_database_unittest.cc b/chrome/browser/web_applications/web_app_database_unittest.cc
index 83b670bc..3ec9e81 100644
--- a/chrome/browser/web_applications/web_app_database_unittest.cc
+++ b/chrome/browser/web_applications/web_app_database_unittest.cc
@@ -380,6 +380,7 @@
   EXPECT_TRUE(app->disallowed_launch_protocols().empty());
   EXPECT_TRUE(app->url_handlers().empty());
   EXPECT_TRUE(app->scope_extensions().empty());
+  EXPECT_TRUE(app->validated_scope_extensions().empty());
   EXPECT_TRUE(app->last_badging_time().is_null());
   EXPECT_TRUE(app->last_launch_time().is_null());
   EXPECT_TRUE(app->install_time().is_null());
@@ -452,6 +453,7 @@
   EXPECT_TRUE(app_copy->disallowed_launch_protocols().empty());
   EXPECT_TRUE(app_copy->url_handlers().empty());
   EXPECT_TRUE(app_copy->scope_extensions().empty());
+  EXPECT_TRUE(app_copy->validated_scope_extensions().empty());
   EXPECT_TRUE(app_copy->shortcuts_menu_item_infos().empty());
   EXPECT_TRUE(app_copy->downloaded_shortcuts_menu_icons_sizes().empty());
   EXPECT_EQ(app_copy->run_on_os_login_mode(), RunOnOsLoginMode::kNotRun);

chrome/browser/web_applications/web_app_install_finalizer.cc

diff --git a/chrome/browser/web_applications/web_app_install_finalizer.cc b/chrome/browser/web_applications/web_app_install_finalizer.cc
index 70054ac..06af874 100644
--- a/chrome/browser/web_applications/web_app_install_finalizer.cc
+++ b/chrome/browser/web_applications/web_app_install_finalizer.cc
@@ -36,6 +36,7 @@
 #include "chrome/browser/web_applications/web_app_install_info.h"
 #include "chrome/browser/web_applications/web_app_install_manager.h"
 #include "chrome/browser/web_applications/web_app_install_utils.h"
+#include "chrome/browser/web_applications/web_app_origin_association_manager.h"
 #include "chrome/browser/web_applications/web_app_prefs_utils.h"
 #include "chrome/browser/web_applications/web_app_registrar.h"
 #include "chrome/browser/web_applications/web_app_registry_update.h"
@@ -131,6 +132,30 @@
 
   AppId app_id =
       GenerateAppId(web_app_info.manifest_id, web_app_info.start_url);
+  std::string app_id_unhashed =
+      GenerateAppIdUnhashed(web_app_info.manifest_id, web_app_info.start_url);
+  OnDidGetWebAppOriginAssociations origin_association_validated_callback =
+      base::BindOnce(&WebAppInstallFinalizer::OnOriginAssociationValidated,
+                     weak_ptr_factory_.GetWeakPtr(), web_app_info.Clone(),
+                     options, std::move(callback), app_id);
+
+  if (options.skip_origin_association_validation ||
+      web_app_info.scope_extensions.empty()) {
+    std::move(origin_association_validated_callback).Run(ScopeExtensions());
+    return;
+  }
+
+  origin_association_manager_->GetWebAppOriginAssociations(
+      GURL(app_id_unhashed), web_app_info.scope_extensions,
+      std::move(origin_association_validated_callback));
+}
+
+void WebAppInstallFinalizer::OnOriginAssociationValidated(
+    WebAppInstallInfo web_app_info,
+    FinalizeOptions options,
+    InstallFinalizedCallback callback,
+    AppId app_id,
+    ScopeExtensions validated_scope_extensions) {
   const WebApp* existing_web_app = GetWebAppRegistrar().GetAppById(app_id);
   std::unique_ptr<WebApp> web_app;
   if (existing_web_app) {
@@ -139,6 +164,8 @@
     web_app = std::make_unique<WebApp>(app_id);
   }
 
+  web_app->SetValidatedScopeExtensions(validated_scope_extensions);
+
   if (existing_web_app) {
     // There is a chance that existing sources type(s) are user uninstallable
     // but the newly added source type is NOT user uninstallable. In this
@@ -368,7 +395,8 @@
     WebAppIconManager* icon_manager,
     WebAppPolicyManager* policy_manager,
     WebAppTranslationManager* translation_manager,
-    WebAppCommandManager* command_manager) {
+    WebAppCommandManager* command_manager,
+    WebAppOriginAssociationManager* origin_association_manager) {
   install_manager_ = install_manager;
   registrar_ = registrar;
   ui_manager_ = ui_manager;
@@ -378,6 +406,7 @@
   policy_manager_ = policy_manager;
   translation_manager_ = translation_manager;
   command_manager_ = command_manager;
+  origin_association_manager_ = origin_association_manager;
 }
 
 void WebAppInstallFinalizer::SetWebAppManifestFieldsAndWriteData(

chrome/browser/web_applications/web_app_install_finalizer.h

diff --git a/chrome/browser/web_applications/web_app_install_finalizer.h b/chrome/browser/web_applications/web_app_install_finalizer.h
index 88615d3..27c6edf 100644
--- a/chrome/browser/web_applications/web_app_install_finalizer.h
+++ b/chrome/browser/web_applications/web_app_install_finalizer.h
@@ -16,6 +16,7 @@
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/web_applications/isolated_web_apps/isolated_web_app_location.h"
 #include "chrome/browser/web_applications/os_integration/os_integration_manager.h"
+#include "chrome/browser/web_applications/scope_extension_info.h"
 #include "chrome/browser/web_applications/web_app_chromeos_data.h"
 #include "chrome/browser/web_applications/web_app_constants.h"
 #include "chrome/browser/web_applications/web_app_id.h"
@@ -46,6 +47,7 @@
 class WebAppRegistrar;
 class WebAppTranslationManager;
 class WebAppCommandManager;
+class WebAppOriginAssociationManager;
 
 // An finalizer for the installation process, represents the last step.
 // Takes WebAppInstallInfo as input, writes data to disk (e.g icons, shortcuts)
@@ -88,6 +90,11 @@
     bool add_to_applications_menu = true;
     bool add_to_desktop = true;
     bool add_to_quick_launch_bar = true;
+
+    // Controls fetching and validation of web_app_origin_association data
+    // from web origins found in manifest scope_extensions entries. If true,
+    // do not validate even if scope_extensions has valid entries.
+    bool skip_origin_association_validation = false;
   };
 
   explicit WebAppInstallFinalizer(Profile* profile);
@@ -141,15 +148,17 @@
   void Start();
   void Shutdown();
 
-  void SetSubsystems(WebAppInstallManager* install_manager,
-                     WebAppRegistrar* registrar,
-                     WebAppUiManager* ui_manager,
-                     WebAppSyncBridge* sync_bridge,
-                     OsIntegrationManager* os_integration_manager,
-                     WebAppIconManager* icon_manager,
-                     WebAppPolicyManager* policy_manager,
-                     WebAppTranslationManager* translation_manager,
-                     WebAppCommandManager* command_manager);
+  void SetSubsystems(
+      WebAppInstallManager* install_manager,
+      WebAppRegistrar* registrar,
+      WebAppUiManager* ui_manager,
+      WebAppSyncBridge* sync_bridge,
+      OsIntegrationManager* os_integration_manager,
+      WebAppIconManager* icon_manager,
+      WebAppPolicyManager* policy_manager,
+      WebAppTranslationManager* translation_manager,
+      WebAppCommandManager* command_manager,
+      WebAppOriginAssociationManager* origin_association_manager);
 
   virtual void SetRemoveManagementTypeCallbackForTesting(
       base::RepeatingCallback<void(const AppId&)>);
@@ -200,6 +209,12 @@
                           CommitCallback commit_callback,
                           bool success);
 
+  void OnOriginAssociationValidated(WebAppInstallInfo web_app_info,
+                                    FinalizeOptions options,
+                                    InstallFinalizedCallback callback,
+                                    AppId app_id,
+                                    ScopeExtensions validated_scope_extensions);
+
   void OnDatabaseCommitCompletedForInstall(InstallFinalizedCallback callback,
                                            AppId app_id,
                                            FinalizeOptions finalize_options,
@@ -244,6 +259,8 @@
   raw_ptr<WebAppTranslationManager, DanglingUntriaged> translation_manager_ =
       nullptr;
   raw_ptr<WebAppCommandManager, DanglingUntriaged> command_manager_ = nullptr;
+  raw_ptr<WebAppOriginAssociationManager, DanglingUntriaged>
+      origin_association_manager_ = nullptr;
 
   const raw_ptr<Profile> profile_;
   bool started_ = false;

chrome/browser/web_applications/web_app_install_finalizer_unittest.cc

diff --git a/chrome/browser/web_applications/web_app_install_finalizer_unittest.cc b/chrome/browser/web_applications/web_app_install_finalizer_unittest.cc
index cfae61d..7f39eb9 100644
--- a/chrome/browser/web_applications/web_app_install_finalizer_unittest.cc
+++ b/chrome/browser/web_applications/web_app_install_finalizer_unittest.cc
@@ -18,7 +18,9 @@
 #include "build/build_config.h"
 #include "build/buildflag.h"
 #include "chrome/browser/web_applications/isolated_web_apps/isolated_web_app_location.h"
+#include "chrome/browser/web_applications/scope_extension_info.h"
 #include "chrome/browser/web_applications/test/fake_os_integration_manager.h"
+#include "chrome/browser/web_applications/test/fake_web_app_origin_association_manager.h"
 #include "chrome/browser/web_applications/test/fake_web_app_provider.h"
 #include "chrome/browser/web_applications/test/web_app_install_test_utils.h"
 #include "chrome/browser/web_applications/test/web_app_test.h"
@@ -41,6 +43,7 @@
 #include "third_party/blink/public/mojom/manifest/manifest.mojom-forward.h"
 #include "third_party/blink/public/mojom/manifest/manifest.mojom.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace web_app {
 
@@ -105,6 +108,8 @@
     provider->SetInstallManager(std::move(install_manager));
     provider->SetInstallFinalizer(
         std::make_unique<WebAppInstallFinalizer>(profile()));
+    provider->SetOriginAssociationManager(
+        std::make_unique<FakeWebAppOriginAssociationManager>());
 
     test::AwaitStartWebAppProviderAndSubsystems(profile());
   }
@@ -491,6 +496,60 @@
   EXPECT_EQ(location, installed_app->isolation_data()->location);
 }
 
+TEST_P(WebAppInstallFinalizerUnitTest, ValidateOriginAssociationsApproved) {
+  auto info = std::make_unique<WebAppInstallInfo>();
+  info->start_url = GURL("https://foo.example");
+  info->title = u"Foo Title";
+  WebAppInstallFinalizer::FinalizeOptions options(
+      webapps::WebappInstallSource::INTERNAL_DEFAULT);
+
+  ScopeExtensionInfo scope_extension =
+      ScopeExtensionInfo(url::Origin::Create(GURL("htps://foo.example")),
+                         /*has_origin_wildcard=*/true);
+  info->scope_extensions = {scope_extension};
+
+  // Set data such that scope_extension will be returned in validated data.
+  std::map<ScopeExtensionInfo, ScopeExtensionInfo> data = {
+      {scope_extension, scope_extension}};
+  static_cast<FakeWebAppOriginAssociationManager&>(
+      provider().origin_association_manager())
+      .SetData(data);
+
+  FinalizeInstallResult result = AwaitFinalizeInstall(*info, options);
+
+  EXPECT_EQ(webapps::InstallResultCode::kSuccessNewInstall, result.code);
+  const WebApp* installed_app = registrar().GetAppById(result.installed_app_id);
+  EXPECT_TRUE(installed_app->is_locally_installed());
+  EXPECT_EQ(ScopeExtensions({scope_extension}),
+            installed_app->validated_scope_extensions());
+}
+
+TEST_P(WebAppInstallFinalizerUnitTest, ValidateOriginAssociationsDenied) {
+  auto info = std::make_unique<WebAppInstallInfo>();
+  info->start_url = GURL("https://foo.example");
+  info->title = u"Foo Title";
+  WebAppInstallFinalizer::FinalizeOptions options(
+      webapps::WebappInstallSource::INTERNAL_DEFAULT);
+
+  ScopeExtensionInfo scope_extension =
+      ScopeExtensionInfo(url::Origin::Create(GURL("htps://foo.example")),
+                         /*has_origin_wildcard=*/true);
+  info->scope_extensions = {scope_extension};
+
+  // Set data such that scope_extension will not be returned in validated data.
+  std::map<ScopeExtensionInfo, ScopeExtensionInfo> data;
+  static_cast<FakeWebAppOriginAssociationManager&>(
+      provider().origin_association_manager())
+      .SetData(data);
+
+  FinalizeInstallResult result = AwaitFinalizeInstall(*info, options);
+
+  EXPECT_EQ(webapps::InstallResultCode::kSuccessNewInstall, result.code);
+  const WebApp* installed_app = registrar().GetAppById(result.installed_app_id);
+  EXPECT_TRUE(installed_app->is_locally_installed());
+  EXPECT_EQ(ScopeExtensions(), installed_app->validated_scope_extensions());
+}
+
 INSTANTIATE_TEST_SUITE_P(
     All,
     WebAppInstallFinalizerUnitTest,

chrome/browser/web_applications/web_app_install_params.h

diff --git a/chrome/browser/web_applications/web_app_install_params.h b/chrome/browser/web_applications/web_app_install_params.h
index 9205ce6..c0dce263 100644
--- a/chrome/browser/web_applications/web_app_install_params.h
+++ b/chrome/browser/web_applications/web_app_install_params.h
@@ -111,6 +111,10 @@
   // populated (especially for user installed or sync installed apps)
   // in which case the URL will not be written to the web_app DB.
   GURL install_url;
+
+  // If true, do not validate origin associations as part of the install even if
+  // app has valid scope_extensions.
+  bool skip_origin_association_validation = false;
 };
 
 // The different UI flows that exist for creating a web app.

chrome/browser/web_applications/web_app_install_utils.cc

diff --git a/chrome/browser/web_applications/web_app_install_utils.cc b/chrome/browser/web_applications/web_app_install_utils.cc
index ffd0303..90ce42df4 100644
--- a/chrome/browser/web_applications/web_app_install_utils.cc
+++ b/chrome/browser/web_applications/web_app_install_utils.cc
@@ -1311,6 +1311,8 @@
   options.add_to_applications_menu = install_params.add_to_applications_menu;
   options.add_to_desktop = install_params.add_to_desktop;
   options.add_to_quick_launch_bar = install_params.add_to_quick_launch_bar;
+  options.skip_origin_association_validation =
+      install_params.skip_origin_association_validation;
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   if (install_params.system_app_type.has_value()) {
     options.system_web_app_data.emplace();

chrome/browser/web_applications/web_app_provider.cc

diff --git a/chrome/browser/web_applications/web_app_provider.cc b/chrome/browser/web_applications/web_app_provider.cc
index 8fb870c..0bfe2883 100644
--- a/chrome/browser/web_applications/web_app_provider.cc
+++ b/chrome/browser/web_applications/web_app_provider.cc
@@ -210,6 +210,10 @@
   return *os_integration_manager_;
 }
 
+WebAppOriginAssociationManager& WebAppProvider::origin_association_manager() {
+  return *origin_association_manager_;
+}
+
 WebAppCommandManager& WebAppProvider::command_manager() {
   // Note: It is OK to access the command manager before connection or start.
   // Internally it will queue commands to only happen after it has started.
@@ -291,6 +295,9 @@
   command_manager_ = std::make_unique<WebAppCommandManager>(profile, this);
   command_scheduler_ = std::make_unique<WebAppCommandScheduler>(*profile, this);
 
+  origin_association_manager_ =
+      std::make_unique<WebAppOriginAssociationManager>();
+
   registrar_ = std::move(registrar);
   sync_bridge_ = std::move(sync_bridge);
 
@@ -310,7 +317,7 @@
       install_manager_.get(), registrar_.get(), ui_manager_.get(),
       sync_bridge_.get(), os_integration_manager_.get(), icon_manager_.get(),
       web_app_policy_manager_.get(), translation_manager_.get(),
-      command_manager_.get());
+      command_manager_.get(), origin_association_manager_.get());
   manifest_update_manager_->SetSubsystems(install_manager_.get(),
                                           registrar_.get(), ui_manager_.get(),
                                           command_scheduler_.get());

chrome/browser/web_applications/web_app_provider.h

diff --git a/chrome/browser/web_applications/web_app_provider.h b/chrome/browser/web_applications/web_app_provider.h
index 4f2941a..6a8d208 100644
--- a/chrome/browser/web_applications/web_app_provider.h
+++ b/chrome/browser/web_applications/web_app_provider.h
@@ -46,6 +46,7 @@
 class WebAppTranslationManager;
 class WebAppCommandManager;
 class WebAppCommandScheduler;
+class WebAppOriginAssociationManager;
 
 // WebAppProvider is the heart of Chrome web app code.
 //
@@ -155,6 +156,8 @@
   OsIntegrationManager& os_integration_manager();
   const OsIntegrationManager& os_integration_manager() const;
 
+  WebAppOriginAssociationManager& origin_association_manager();
+
   // KeyedService:
   void Shutdown() override;
 
@@ -218,6 +221,7 @@
   std::unique_ptr<OsIntegrationManager> os_integration_manager_;
   std::unique_ptr<WebAppCommandManager> command_manager_;
   std::unique_ptr<WebAppCommandScheduler> command_scheduler_;
+  std::unique_ptr<WebAppOriginAssociationManager> origin_association_manager_;
 
   base::OneShotEvent on_registry_ready_;
   base::OneShotEvent on_external_managers_synchronized_;

chrome/browser/web_applications/web_app_registrar.cc

diff --git a/chrome/browser/web_applications/web_app_registrar.cc b/chrome/browser/web_applications/web_app_registrar.cc
index 44dfba1..b9e67b2 100644
--- a/chrome/browser/web_applications/web_app_registrar.cc
+++ b/chrome/browser/web_applications/web_app_registrar.cc
@@ -981,6 +981,13 @@
                  : std::vector<apps::UrlHandlerInfo>();
 }
 
+std::vector<ScopeExtensionInfo> WebAppRegistrar::GetValidatedScopeExtensions(
+    const AppId& app_id) const {
+  auto* web_app = GetAppById(app_id);
+  return web_app ? web_app->validated_scope_extensions()
+                 : std::vector<ScopeExtensionInfo>();
+}
+
 GURL WebAppRegistrar::GetAppManifestUrl(const AppId& app_id) const {
   auto* web_app = GetAppById(app_id);
   return web_app ? web_app->manifest_url() : GURL::EmptyGURL();

chrome/browser/web_applications/web_app_registrar.h

diff --git a/chrome/browser/web_applications/web_app_registrar.h b/chrome/browser/web_applications/web_app_registrar.h
index 2bdff7a..dd7faa3 100644
--- a/chrome/browser/web_applications/web_app_registrar.h
+++ b/chrome/browser/web_applications/web_app_registrar.h
@@ -21,6 +21,7 @@
 #include "chrome/browser/profiles/profile_manager_observer.h"
 #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h"
 #include "chrome/browser/web_applications/proto/web_app_os_integration_state.pb.h"
+#include "chrome/browser/web_applications/scope_extension_info.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/web_applications/web_app_constants.h"
 #include "chrome/browser/web_applications/web_app_id.h"
@@ -221,6 +222,14 @@
   // Returns the "url_handlers" field from the app manifest.
   apps::UrlHandlers GetAppUrlHandlers(const AppId& app_id) const;
 
+  // Returns the `scope_extensions` field from the app manifest after
+  // validation. Entries with an origin that validated association with this web
+  // app are returned. Other entries are removed. See
+  // https://github.com/WICG/manifest-incubations/blob/gh-pages/scope_extensions-explainer.md
+  // for association requirements.
+  std::vector<ScopeExtensionInfo> GetValidatedScopeExtensions(
+      const AppId& app_id) const;
+
   GURL GetAppManifestUrl(const AppId& app_id) const;
 
   base::Time GetAppLastBadgingTime(const AppId& app_id) const;

chrome/browser/web_applications/web_app_run_on_os_login_manager.cc

diff --git a/chrome/browser/web_applications/web_app_run_on_os_login_manager.cc b/chrome/browser/web_applications/web_app_run_on_os_login_manager.cc
index 93ecdd0..dc3e76ff 100644
--- a/chrome/browser/web_applications/web_app_run_on_os_login_manager.cc
+++ b/chrome/browser/web_applications/web_app_run_on_os_login_manager.cc
@@ -87,8 +87,8 @@
 void WebAppRunOnOsLoginManager::OnAppLaunchedOnOsLogin(
     AppId app_id,
     std::string app_name,
-    Browser* browser,
-    content::WebContents* web_contents,
+    base::WeakPtr<Browser> browser,
+    base::WeakPtr<content::WebContents> web_contents,
     apps::LaunchContainer container) {
 // TODO(crbug.com/1341247): Implement notification for lacros
 #if BUILDFLAG(IS_CHROMEOS_ASH)

chrome/browser/web_applications/web_app_run_on_os_login_manager.h

diff --git a/chrome/browser/web_applications/web_app_run_on_os_login_manager.h b/chrome/browser/web_applications/web_app_run_on_os_login_manager.h
index bf4f404..e19c3e6 100644
--- a/chrome/browser/web_applications/web_app_run_on_os_login_manager.h
+++ b/chrome/browser/web_applications/web_app_run_on_os_login_manager.h
@@ -35,8 +35,8 @@
   void RunAppsOnOsLogin(AllAppsLock& lock);
   void OnAppLaunchedOnOsLogin(AppId app_id,
                               std::string app_name,
-                              Browser* browser,
-                              content::WebContents* web_contents,
+                              base::WeakPtr<Browser> browser,
+                              base::WeakPtr<content::WebContents> web_contents,
                               apps::LaunchContainer container);
 
   raw_ref<WebAppCommandScheduler, DanglingUntriaged> scheduler_;

chrome/browser/web_applications/web_app_ui_manager.h

diff --git a/chrome/browser/web_applications/web_app_ui_manager.h b/chrome/browser/web_applications/web_app_ui_manager.h
index 2a3ef92d..3fdef83 100644
--- a/chrome/browser/web_applications/web_app_ui_manager.h
+++ b/chrome/browser/web_applications/web_app_ui_manager.h
@@ -57,8 +57,8 @@
 };
 
 using LaunchWebAppCallback =
-    base::OnceCallback<void(Browser* browser,
-                            content::WebContents* web_contents,
+    base::OnceCallback<void(base::WeakPtr<Browser> browser,
+                            base::WeakPtr<content::WebContents> web_contents,
                             apps::LaunchContainer container)>;
 
 enum class LaunchWebAppWindowSetting {

chrome/browser/xsurface/BUILD.gn

diff --git a/chrome/browser/xsurface/BUILD.gn b/chrome/browser/xsurface/BUILD.gn
index af895c27..8911520 100644
--- a/chrome/browser/xsurface/BUILD.gn
+++ b/chrome/browser/xsurface/BUILD.gn
@@ -27,14 +27,6 @@
     "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceRenderer.java",
     "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java",
     "android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedActionsHandler.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedLaunchReliabilityLogger.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedNetworkRequestReliabilityLogger.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScope.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScopeDependencyProvider.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedUserInteractionReliabilityLogger.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/ReliabilityLoggingTestUtil.java",
-    "android/java/src/org/chromium/chrome/browser/xsurface/feed/StreamType.java",
   ]
   deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
 }

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedActionsHandler.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedActionsHandler.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedActionsHandler.java
index c4ba489f8..fe714b43 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedActionsHandler.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedActionsHandler.java
@@ -4,17 +4,162 @@
 
 package org.chromium.chrome.browser.xsurface;
 
+import android.view.View;
+
 import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Map;
 
-/** This is being moved to ./feed/ */
-@Deprecated
-public interface FeedActionsHandler
-        extends org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler {
-    public enum SnackbarDuration { SHORT, LONG }
+/**
+ * Interface to provide chromium calling points for a feed.
+ */
+public interface FeedActionsHandler {
+    String KEY = "FeedActions";
 
+    /**
+     * Requests additional content to be loaded. Once the load is completed, onStreamUpdated will be
+     * called.
+     */
+    default void loadMore() {}
+
+    /**
+     * Sends data back to the server when content is clicked.
+     */
+    default void processThereAndBackAgainData(byte[] data, LoggingParameters loggingParameters) {}
+
+    /**
+     * Triggers Chrome to send user feedback for this card.
+     */
+    default void sendFeedback(Map<String, String> productSpecificDataMap) {}
+
+    /**
+     * Requests to dismiss a card. A change ID will be returned and it can be used to commit or
+     * discard the change.
+     * @param data A serialized feedpacking.DismissData message.
+     */
+    default int requestDismissal(byte[] data) {
+        return 0;
+    }
+
+    /**
+     * Commits a previous requested dismissal denoted by change ID.
+     */
+    default void commitDismissal(int changeId) {}
+
+    /**
+     * Discards a previous requested dismissal denoted by change ID.
+     */
+    default void discardDismissal(int changeId) {}
+
+    /**
+     * Interface for handling snackbar exit conditions.
+     */
+
+    public interface SnackbarController {
+        @Deprecated
+        default void onAction() {}
+
+        /**
+         * Called when the snackbar's action button is tapped.
+         *
+         * @param actionFinished Should be called when work associated with this action has been
+         *     completed.
+         */
+        default void onAction(Runnable actionFinished) {}
+
+        @Deprecated
+        default void onDismissNoAction() {}
+
+        /**
+         * Called when the snackbar is dismissed without the button being tapped (usually when it
+         * times out).
+         *
+         * @param actionFinished Should be called when work associated with this action has been
+         *     completed.
+         */
+        default void onDismissNoAction(Runnable actionFinished) {}
+    }
+
+    /**
+     * Snackbar dismissal timeout.
+     */
+    public enum SnackbarDuration {
+        /**
+         * SHORT should be used with simple one-line snackbars.
+         */
+        SHORT,
+        /**
+         * LONG should be used with multi-line snackbars that take longer to read.
+         */
+        LONG
+    }
+
+    /**
+     * Show a snackbar.
+     * @param text Text to display.
+     * @param actionLabel Text for the button (e.g. "Undo").
+     * @param duration Whether to remove the snackbar after a short or long delay.
+     * @param controller Handlers for snackbar actions.
+     */
+    default void showSnackbar(String text, String actionLabel, SnackbarDuration duration,
+            SnackbarController controller) {}
+
+    /**
+     * Share a URL. This will bring up the sharing sheet.
+     * @param url The url of the page to be shared.
+     * @param title The title of the page to be shared.
+     */
+    default void share(String url, String title) {}
+
+    /**
+     * Opens the settings to manager autoplay.
+     */
+    default void openAutoplaySettings() {}
+
+    /**
+     * Watches a view to get notified when the first time it has the visible area percentage not
+     * less than the given threshold. The watch is based on the visibility of full
+     * ListContentManager item containing the view.
+     * @param view The view to watch for.
+     * @param viewedThreshold The threshold of the percentage of the visible area on screen.
+     * @param runnable The runnable to get notified.
+     */
+    default void watchForViewFirstVisible(View view, float viewedThreshold, Runnable runnable) {}
+
+    /**
+     * Reports that the notice identified by the given key is created. It may not be visible yet.
+     * @param key Key to identify the type of the notice. For each new key, please update
+     *            "NoticeKey" token in histograms.xml and NoticeUmaName() in metrics_reporter.cc.
+     */
+    default void reportNoticeCreated(String key) {}
+
+    /**
+     * Reports that the notice identified by the given key is viewed, fully visible in the viewport.
+     * @param key Key to identify the type of the notice. This interaction info can be used to
+     * determine if it is necessary to show the notice to the user again.
+     */
+    default void reportNoticeViewed(String key) {}
+
+    /**
+     * Reports that the user has clicked/tapped the notice identified by the given key to perform
+     * an open action. This interaction info can be used to determine if it is necessary to show
+     * the notice to the user again.
+     * @param key Key to identify the type of the notice.
+     */
+    default void reportNoticeOpenAction(String key) {}
+
+    /**
+     * Reports that the notice identified by the given key is dismissed by the user.
+     * @param key Key to identify the type of the notice.
+     */
+    default void reportNoticeDismissed(String key) {}
+
+    /**
+     * Types of feeds that can be invalidated. These values must match the privately defined values
+     * of InvalidateCacheData.FeedType.
+     */
     @IntDef({FeedIdentifier.UNSPECIFIED, FeedIdentifier.MAIN_FEED, FeedIdentifier.FOLLOWING_FEED,
             FeedIdentifier.CHANNEL_FEED})
     @Retention(RetentionPolicy.SOURCE)
@@ -24,25 +169,44 @@
         int FOLLOWING_FEED = 2;
         int CHANNEL_FEED = 3;
     }
-    /** This is being moved to ./feed/ */
-    public interface SnackbarController extends org.chromium.chrome.browser.xsurface.feed
-                                                        .FeedActionsHandler.SnackbarController {}
 
-    private static org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler.SnackbarDuration
-    convertDuration(SnackbarDuration duration) {
-        switch (duration) {
-            case SHORT:
-                return org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler.SnackbarDuration
-                        .SHORT;
-            case LONG:
-                return org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler.SnackbarDuration
-                        .LONG;
-        }
-        return org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler.SnackbarDuration.SHORT;
-    }
-    default void showSnackbar(String text, String actionLabel, SnackbarDuration duration,
-            SnackbarController controller) {
-        org.chromium.chrome.browser.xsurface.feed.FeedActionsHandler.super.showSnackbar(
-                text, actionLabel, convertDuration(duration), controller);
-    }
+    /**
+     * Requests that the cache a feed be invalidated so that its contents are re-fetched the next
+     * time the feed is shown/loaded.
+     * @param feedToInvalidate Identifies which feed should have its cache invalidated. The request
+     *         will be dropped if set to FeedIdentifier.UNSPECIFIED.
+     */
+    default void invalidateContentCacheFor(@FeedIdentifier int feedToInvalidate) {}
+
+    /**
+     * Reports that the info card is being tracked for its full visibility.
+     * @param type Type of the info card.
+     */
+    default void reportInfoCardTrackViewStarted(int type) {}
+
+    /**
+     * Reports that the info card is fully visible in the viewport.
+     * @param type Type of the info card.
+     * @param minimumViewIntervalSeconds The minimum interval in seconds from the last time the info
+     * card is viewed in order for it to be considered viewed again.
+     */
+    default void reportInfoCardViewed(int type, int minimumViewIntervalSeconds) {}
+
+    /**
+     * Reports that the user tapps the info card.
+     * @param type Type of the info card.
+     */
+    default void reportInfoCardClicked(int type) {}
+
+    /**
+     * Reports that the user dismisses the info card explicitly by tapping the close button.
+     * @param type Type of the info card.
+     */
+    default void reportInfoCardDismissedExplicitly(int type) {}
+
+    /**
+     * Resets all the states of the info card.
+     * @param type Type of the info card.
+     */
+    default void resetInfoCardStates(int type) {}
 }

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedLaunchReliabilityLogger.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedLaunchReliabilityLogger.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedLaunchReliabilityLogger.java
index fa0b5a7..d895a29 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedLaunchReliabilityLogger.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedLaunchReliabilityLogger.java
@@ -10,10 +10,11 @@
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * This is being moved to ./feed/
+ * Interface for logging latency and availability signals for feed launches. All timestamps are in
+ * terms of nanoseconds since system boot. One instance exists per feed surface and lasts for the
+ * surface's lifetime.
  */
-public interface FeedLaunchReliabilityLogger
-        extends org.chromium.chrome.browser.xsurface.feed.FeedLaunchReliabilityLogger {
+public interface FeedLaunchReliabilityLogger {
     /** Type of surface the feed is being launched on. */
     @IntDef({SurfaceType.UNSPECIFIED, SurfaceType.NEW_TAB_PAGE, SurfaceType.START_SURFACE})
     @Retention(RetentionPolicy.SOURCE)
@@ -23,8 +24,7 @@
         int START_SURFACE = 2;
     }
 
-    /** @deprecated: Please use org.chromium.chrome.browser.xsurface.feed.StreamType */
-    @Deprecated
+    /** Type of stream being launched (the "For you","Following", or "SingleWebFeed" feed). */
     @IntDef({StreamType.UNSPECIFIED, StreamType.FOR_YOU, StreamType.WEB_FEED,
             StreamType.SINGLE_WEB_FEED})
     @Retention(RetentionPolicy.SOURCE)
@@ -34,4 +34,137 @@
         int WEB_FEED = 2;
         int SINGLE_WEB_FEED = 3;
     }
+
+    /**
+     * Set details about the stream being launched and send any pending events.
+     * @param streamType Feed type (e.g. "for you" or "following").
+     * @param streamId Identifier for the stream used to disambiguate events from concurrent
+     *         streams.
+     */
+    default void sendPendingEvents(@StreamType int streamType, int streamId) {}
+
+    /**
+     * Clear any pending events and end the flow without logging any events.
+     */
+    default void cancelPendingEvents() {}
+
+    /**
+     * Returns true if logUiStarting(), logFeedReloading(), or logFeedLaunchOtherStart() have been
+     * called since the last call to logLaunchFinished().
+     * @return True if the launch flow has started but not finished.
+     */
+    default boolean isLaunchInProgress() {
+        return false;
+    }
+
+    /**
+     * Log when the feed is launched because its UI surface was created.
+     * @param surfaceType Feed surface type (e.g. new tab page or Start Surface).
+     * @param timestamp Time at which the surface began to be created.
+     */
+    default void logUiStarting(@SurfaceType int surfaceType, long timestamp) {}
+
+    /**
+     * Log when a feed refresh is requested manually.
+     * @param timestamp Time at which the surface was shown.
+     */
+    default void logManualRefresh(long timestamp) {}
+
+    /**
+     * Log when the feed is launched because its surface was shown and cards needed to be
+     * re-rendered.
+     * @param timestamp Time at which the surface was shown.
+     */
+    default void logFeedReloading(long timestamp) {}
+
+    /**
+     * Log when the feed is launched in any case not already handled by logUiStarting() or
+     * logFeedReloaded().
+     * @param timestamp Time at which the feed stream was bound.
+     */
+    default void logFeedLaunchOtherStart(long timestamp) {}
+
+    /**
+     * Log when the user switches to another feed tab.
+     * @param toStreamType New feed type.
+     * @param timestamp Event time.
+     */
+    default void logSwitchedFeeds(@StreamType int toStreamType, long timestamp) {}
+
+    /**
+     * Log when cached feed content is about to be read.
+     * @param timestamp Event time.
+     */
+    default void logCacheReadStart(long timestamp) {}
+
+    /**
+     * Log after finishing attempting to read cached feed content.
+     * @param timestamp Event time.
+     * @param result DiscoverCardReadCacheResult.
+     */
+    default void logCacheReadEnd(long timestamp, int result) {}
+
+    /**
+     * Log when the loading spinner is shown.
+     * @param timestamp Time at which the spinner was shown.
+     */
+    default void logLoadingIndicatorShown(long timestamp) {}
+
+    /**
+     * Log when rendering of above-the-fold feed content begins.
+     * @param timestamp Event time.
+     */
+    default void logAtfRenderStart(long timestamp) {}
+
+    /**
+     * Log when rendering of above-the-fold feed content finishes.
+     * @param timestamp Event time.
+     * @param result DiscoverAboveTheFoldRenderResult.
+     */
+    default void logAtfRenderEnd(long timestamp, int result) {}
+
+    /**
+     * Get the network request logger for a request by its ID.
+     * @param requestId A unique ID for the request.
+     * @return A logger for the request: an existing logger if one matches `requestId`, or a new one
+     *         otherwise.
+     */
+    default FeedNetworkRequestReliabilityLogger getNetworkRequestReliabilityLogger(int requestId) {
+        return new FeedNetworkRequestReliabilityLogger() {};
+    }
+
+    /**
+     * Log to mark the end of the feed launch. Logs a "launched finished" event with the timestamp
+     * and result (or instead with the pending "launch finished" timestamp and result if there was a
+     * call to pendingFinished()).
+     * @param timestamp Event time, possibly the same as one of the other events.
+     * @param result DiscoverLaunchResult.
+     */
+    default void logLaunchFinished(long timestamp, int result) {}
+
+    /**
+     * Log to mark the end of the feed launch.
+     * @param timestamp Event time, possibly the same as one of the other events.
+     * @param result DiscoverLaunchResult.
+     * @param onlyIfLaunchInProgress Pass true if this event should only be logged if there is a
+     *         feed launch in progress.
+     */
+    default void logLaunchFinished(long timestamp, int result, boolean onlyIfLaunchInProgress) {}
+
+    /**
+     * Keep a tentative timestamp and status for "launch finished" if the user left the feed but
+     * might return before it finishes loading.
+     * If the next call is to logLaunchFinished(), logLaunchFinished() will log the pending
+     * "launch finished" timestamp and status and clear them. If the next call is to
+     * cancelPendingFinished(), the pending "launch finished" is cleared. If there is already a
+     * pending "launch finished", calling pendingFinished() again has no effect.
+     * @param timestamp Event time in nanoseconds.
+     * @param result DiscoverLaunchResult.
+     */
+    default void pendingFinished(long timestamp, int result) {}
+
+    /**
+     * If a timestamp and status code were recorded with pendingFinished(), drop them.
+     */
+    default void cancelPendingFinished() {}
 }

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedNetworkRequestReliabilityLogger.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedNetworkRequestReliabilityLogger.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedNetworkRequestReliabilityLogger.java
index 8f88b6a..3a2ce8f 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedNetworkRequestReliabilityLogger.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedNetworkRequestReliabilityLogger.java
@@ -5,8 +5,58 @@
 package org.chromium.chrome.browser.xsurface;
 
 /**
- * This is being moved to ./feed/
+ * Interface for logging latency and availability signals for feed network requests. All timestamps
+ * are in terms of nanoseconds since system boot.
+ *
+ * Obtain instances from FeedLaunchReliabilityLogger.getNetworkRequestReliabilityLogger().
  */
-@Deprecated
-public interface FeedNetworkRequestReliabilityLogger
-        extends org.chromium.chrome.browser.xsurface.feed.FeedNetworkRequestReliabilityLogger {}
+public interface FeedNetworkRequestReliabilityLogger {
+    /**
+     * Log before filling out and serializing a feed query request. Starts the network request flow.
+     * @param timestamp Event time.
+     */
+    default void logFeedQueryRequestStart(long timestamp) {}
+
+    /**
+     * Log before filling out and serializing a feed actions upload request. Starts the network
+     * request flow.
+     * @param timestamp Event time.
+     */
+    default void logActionsUploadRequestStart(long timestamp) {}
+
+    /**
+     * Log before filling out and serializing a web feed request for all followed web feeds. Starts
+     * the network request flow.
+     */
+    default void logWebFeedRequestStart(long timestamp) {}
+
+    /**
+     * Log before filling out and serializing a web feed request for a single web feed, used by the
+     * cormorant surface. Starts the network request flow.
+     */
+    default void logSingleWebFeedRequestStart(long timestamp) {}
+
+    /**
+     * Log after the request has been sent.
+     * @param timestamp Event time.
+     */
+    default void logRequestSent(long timestamp) {}
+
+    /**
+     * Log after the response is received and before it is parsed.
+     * @param serverRecvTimestamp Server-reported time (nanoseconds) at which the request arrived.
+     * @param serverSendTimestamp Server-reported time (nanoseconds) at which the response was sent.
+     * @param clientRecvTimestamp Client time at which the response was received.
+     */
+    default void logResponseReceived(
+            long serverRecvTimestamp, long serverSendTimestamp, long clientRecvTimestamp) {}
+
+    /**
+     * Log after logResponseReceived() if there's a network error, or after parsing the response
+     * otherwise. Ends the network request flow.
+     * @param timestamp Event time.
+     * @param canonicalStatus Network request status code. See
+     *         //third_party/abseil-cpp/absl/status/status.h.
+     */
+    default void logRequestFinished(long timestamp, int canonicalStatus) {}
+}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedUserInteractionReliabilityLogger.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedUserInteractionReliabilityLogger.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedUserInteractionReliabilityLogger.java
index 0b6b400..76676a4 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedUserInteractionReliabilityLogger.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/FeedUserInteractionReliabilityLogger.java
@@ -4,32 +4,87 @@
 
 package org.chromium.chrome.browser.xsurface;
 
+import android.view.View;
+
 import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * This is being moved to ./feed/
+ * Interface for capturing the reliability for every change in the collection of items presented to
+ * the user during the interaction. One instance exists per feed surface and lasts for the surface's
+ * lifetime.
  */
-@Deprecated
-public interface FeedUserInteractionReliabilityLogger
-        extends org.chromium.chrome.browser.xsurface.feed.FeedUserInteractionReliabilityLogger {
+public interface FeedUserInteractionReliabilityLogger {
+    /**
+     * Called when the stream has been opened. This should be called before reporting any event.
+     */
+    default void onStreamOpened(@StreamType int streamType) {}
+
+    /**
+     * Describes how the stream is closed.
+     */
     @IntDef({ClosedReason.OPEN_CARD, ClosedReason.SUSPEND_APP, ClosedReason.LEAVE_FEED,
             ClosedReason.SWITCH_STREAM})
     @Retention(RetentionPolicy.SOURCE)
     public @interface ClosedReason {
+        /** The user taps on a card. */
         int OPEN_CARD = 0;
+        /** The user leaves the app. */
         int SUSPEND_APP = 1;
+        /** The user leaves the feed but still stays in the app, like switching to other tab. */
         int LEAVE_FEED = 2;
+        /** The user switches to other stream. */
         int SWITCH_STREAM = 3;
     }
+
+    /**
+     * Called when the stream has been closed.
+     */
+    default void onStreamClosed(@ClosedReason int reason) {}
+
+    /**
+     * Called when the view has entered the visible part of the screen for the first time. If the
+     * view is then off screen and become visible again, it will not be reported again.
+     */
+    default void onViewFirstVisible(View view) {}
+
+    /**
+     * Called when the view has been rendered for the first time. Note that this doesn't include the
+     * child images. If the view is then off screen and become visible again, it will not be
+     * reported again.
+     */
+    default void onViewFirstRendered(View view) {}
+
+    /**
+     * Called when the pagination process has started.
+     */
+    default void onPaginationStarted() {}
+
+    /**
+     * Called when the waiting indicator is shown. This will happen after the pagination process
+     * has started.
+     */
+    default void onPaginationIndicatorShown() {}
+
+    /**
+     * Describes the end state of the pagination process.
+     */
     @IntDef({PaginationResult.SUCCESS_WITH_MORE_FEED, PaginationResult.SUCCESS_WITH_NO_FEED,
             PaginationResult.FAILURE})
     @Retention(RetentionPolicy.SOURCE)
     public @interface PaginationResult {
+        /** More feed content is retrieved. */
         int SUCCESS_WITH_MORE_FEED = 0;
+        /** No feed content is retrieved. This means that the end of the feed is reached. */
         int SUCCESS_WITH_NO_FEED = 1;
+        /** The pagination request has failed. */
         int FAILURE = 2;
     }
+
+    /**
+     * Called when the pagination process has ended.
+     */
+    default void onPaginationEnded(@PaginationResult int result) {}
 }

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/HybridListRenderer.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/HybridListRenderer.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/HybridListRenderer.java
index a45155be..518cf00b 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/HybridListRenderer.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/HybridListRenderer.java
@@ -10,8 +10,6 @@
 import androidx.annotation.Nullable;
 
 /**
- * Implemented internally.
- *
  * A renderer that can handle mixing externally-provided views with native Android views
  * in a RecyclerView.
  */

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageCacheHelper.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageCacheHelper.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageCacheHelper.java
index 2aafa39eb..ed032dda 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageCacheHelper.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageCacheHelper.java
@@ -5,8 +5,6 @@
 package org.chromium.chrome.browser.xsurface;
 
 /**
- * Implemented internally.
- *
  * Interface for managing the image cache. This allows
  * native code to call to the image loader across the
  * xsurface.

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageFetchClient.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageFetchClient.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageFetchClient.java
index ac29b67..9a96db00 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageFetchClient.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ImageFetchClient.java
@@ -5,8 +5,6 @@
 package org.chromium.chrome.browser.xsurface;
 
 /**
- * Implemented in Chromium.
- *
  * An object that can send an HTTP GET request and receive bytes in response. This interface should
  * only be used for fetching images.
  */

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManager.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManager.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManager.java
index 14211849..94d3568 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManager.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManager.java
@@ -12,8 +12,6 @@
 import java.util.Map;
 
 /**
- * Implemented in Chromium.
- *
  * Interface to provide native views to incorporate in an external surface-controlled
  * RecyclerView.
  *

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManagerObserver.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManagerObserver.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManagerObserver.java
index 8534c5e..a8a17f2 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManagerObserver.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListContentManagerObserver.java
@@ -4,11 +4,7 @@
 
 package org.chromium.chrome.browser.xsurface;
 
-/**
- * Implemented in Chromium.
- *
- * Interface to observe a list.
- */
+/** Interface to observe a list. */
 public interface ListContentManagerObserver {
     /** Called when range from startIndex to startIndex+count has been inserted. */
     default void onItemRangeInserted(int startIndex, int count) {}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListLayoutHelper.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListLayoutHelper.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListLayoutHelper.java
index 6c74f89c..a5cb877 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListLayoutHelper.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ListLayoutHelper.java
@@ -4,8 +4,6 @@
 package org.chromium.chrome.browser.xsurface;
 
 /**
- * Implemented internally.
- *
  * Interface providing helper methods to layout list items in an external surface-controlled
  * RecyclerView.
  */

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/LoggingParameters.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/LoggingParameters.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/LoggingParameters.java
index 0c8d767..38fbe7b 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/LoggingParameters.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/LoggingParameters.java
@@ -5,10 +5,7 @@
 package org.chromium.chrome.browser.xsurface;
 import androidx.annotation.Nullable;
 
-// TODO(b/269234249): Decide what to do with this class. Some of these things are feed specific.
 /**
- * Implemented in Chromium.
- *
  * The set of parameters necessary for logging.
  */
 public interface LoggingParameters {

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/PersistentKeyValueCache.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/PersistentKeyValueCache.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/PersistentKeyValueCache.java
index dfaa734..57acd6a3 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/PersistentKeyValueCache.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/PersistentKeyValueCache.java
@@ -6,11 +6,7 @@
 
 import androidx.annotation.Nullable;
 
-/**
- * Implemented in Chromium.
- *
- * A simple key-value cache that is persisting all data on disk. Automatically evicts old data.
- */
+/** A simple key-value cache that is persisting all data on disk. Automatically evicts old data. */
 public interface PersistentKeyValueCache {
     /** Consumes the result of PersistentKeyValueCache.lookup(). */
     public interface ValueConsumer {

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScope.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScope.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScope.java
index a9754ca0..82e5950 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScope.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScope.java
@@ -3,14 +3,10 @@
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.xsurface;
+
 import androidx.annotation.Nullable;
 
-import org.chromium.chrome.browser.xsurface.feed.FeedSurfaceScope;
-import org.chromium.chrome.browser.xsurface.feed.FeedSurfaceScopeDependencyProvider;
-
 /**
- * Implemented internally.
- *
  * Used to initialize singleton-level dependencies for xsurface. Also provides surface-level
  * dependencies that depend on the singleton dependencies.
  **/
@@ -27,25 +23,11 @@
      *
      * @param dependencyProvider Provider for activity-scoped dependencies.
      **/
-    @Deprecated
     @Nullable
     default SurfaceScope obtainSurfaceScope(SurfaceScopeDependencyProvider dependencyProvider) {
         return null;
     }
 
-    // TODO(b/269234249): Don't call from Chrome yet, it's not implemented.
-    /**
-     * Returns a SurfaceScope which should be one per Surface. That Surface can have multiple
-     * HybridListRenderers and SurfaceRenderers within its UI.
-     *
-     * @param dependencyProvider Provider for activity-scoped dependencies.
-     **/
-    @Nullable
-    default FeedSurfaceScope obtainFeedSurfaceScope(
-            FeedSurfaceScopeDependencyProvider dependencyProvider) {
-        return null;
-    }
-
     @Nullable
     default ImageCacheHelper provideImageCacheHelper() {
         return null;

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScopeDependencyProvider.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScopeDependencyProvider.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScopeDependencyProvider.java
index 228f50e..44416e19 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScopeDependencyProvider.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ProcessScopeDependencyProvider.java
@@ -13,8 +13,6 @@
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * Implemented in Chromium.
- *
  * Provides application-level dependencies for an external surface.
  */
 public interface ProcessScopeDependencyProvider {

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ReliabilityLoggingTestUtil.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ReliabilityLoggingTestUtil.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ReliabilityLoggingTestUtil.java
index 1ccbeae..b41195a 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ReliabilityLoggingTestUtil.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/ReliabilityLoggingTestUtil.java
@@ -4,6 +4,26 @@
 
 package org.chromium.chrome.browser.xsurface;
 
-/** Moving to ./feed/ */
-public interface ReliabilityLoggingTestUtil
-        extends org.chromium.chrome.browser.xsurface.feed.ReliabilityLoggingTestUtil {}
+/**
+ * This interface provides access to the list of recently-sent "flows" of reliability logging events
+ * for verification in integration tests.
+ */
+public interface ReliabilityLoggingTestUtil {
+    /**
+     * Return the most recent "flows" (at most 30), or lists of logged events
+     * representing a user interaction, with each flow rendered as a string.
+     */
+    default String getRecentFlowsForTesting() {
+        return "";
+    }
+
+    /**
+     * Return the number of recent flows that would be rendered by getRecentFlowsForTesting().
+     */
+    default int getRecentFlowsCountForTesting() {
+        return 0;
+    }
+
+    /** Clear the list of recent flows. */
+    default void clearRecentFlowsForTesting() {}
+}
\ No newline at end of file

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/StreamType.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/StreamType.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/StreamType.java
index c105f08..77b4221 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/StreamType.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/StreamType.java
@@ -9,8 +9,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-// Moving to ./feed/
-@Deprecated
+/** Type of stream being launched (the "For you","Following", or "SingleWebFeed" feed). */
 @IntDef({StreamType.UNSPECIFIED, StreamType.FOR_YOU, StreamType.WEB_FEED,
         StreamType.SINGLE_WEB_FEED})
 @Retention(RetentionPolicy.SOURCE)

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceActionsHandler.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceActionsHandler.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceActionsHandler.java
index 61c98346..5e729c1 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceActionsHandler.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceActionsHandler.java
@@ -12,10 +12,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
-
 /**
- * Implemented in Chromium.
- *
  * Interface to provide chromium calling points for an external surface.
  */
 public interface SurfaceActionsHandler {

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceHeaderOffsetObserver.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceHeaderOffsetObserver.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceHeaderOffsetObserver.java
index 528767d..bdbd295 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceHeaderOffsetObserver.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceHeaderOffsetObserver.java
@@ -5,8 +5,6 @@
 package org.chromium.chrome.browser.xsurface;
 
 /**
- * Implemented internally.
- *
  * Interface to listen to the offset events from the scrollable container of the current Surface.
  * Certain layouts may simulate scrolls by translating views on and offscreen. This interface tracks
  * those changes by providing a vertical offset which represents the delta from the original

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceRenderer.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceRenderer.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceRenderer.java
index ff87986..9d98874 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceRenderer.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceRenderer.java
@@ -11,8 +11,6 @@
 import java.util.Map;
 
 /**
- * Implemented internally.
- *
  * Interface to call a rendering service to render a View sent by a server.
  */
 public interface SurfaceRenderer {

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java
index f24e5be..34d7108 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java
@@ -7,8 +7,6 @@
 import androidx.annotation.Nullable;
 
 /**
- * Implemented internally.
- *
  * Provides multiple types of renderers to surfaces that want to render an
  * external surface. Each renderer will reuse the same dependencies (hence
  * "Scope") but each call to provideFoo will return a new renderer, so that a
@@ -28,14 +26,15 @@
     default void replaceDataStoreEntry(String key, byte[] data) {}
     default void removeDataStoreEntry(String key) {}
 
-    // Functionality moving to FeedSurfaceScope
-    @Deprecated
+    /**
+     * Return the FeedLaunchReliabilityLogger associated with the surface, creating it if it
+     * doesn't exist.
+     * @return The surface's FeedLaunchReliabilityLogger instance.
+     */
     default FeedLaunchReliabilityLogger getFeedLaunchReliabilityLogger() {
         return new FeedLaunchReliabilityLogger() {};
     }
 
-    // Functionality moving to FeedSurfaceScope
-    @Deprecated
     default FeedUserInteractionReliabilityLogger getFeedUserInteractionReliabilityLogger() {
         return new FeedUserInteractionReliabilityLogger() {};
     }

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java
index 64ea09379..eb3ef04 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java
@@ -11,8 +11,6 @@
 import androidx.annotation.Nullable;
 
 /**
- * Implemented in Chromium.
- *
  * Provides dependencies for xsurface at the surface level.
  *
  * Should only be called on the UI thread.
@@ -35,11 +33,7 @@
         return false;
     }
 
-    // Warning:
-    // Code below this comment is Feed-specific, and is moving to FeedSurfaceScopeDependencyProvider
-
     /** User-set preference for when videos are eligible to autoplay. */
-    @Deprecated
     public enum AutoplayPreference {
         /** Autoplay is disabled. */
         AUTOPLAY_DISABLED,
@@ -50,13 +44,11 @@
     }
 
     /** Returns the user-set preferences for when videos are eligible to autoplay. */
-    @Deprecated
     default AutoplayPreference getAutoplayPreference() {
         return AutoplayPreference.AUTOPLAY_DISABLED;
     }
 
     /** Events that are triggered during the video playing. */
-    @Deprecated
     public @interface VideoPlayEvent {
         // Events applying muted autoplay only.
 
@@ -80,7 +72,6 @@
     }
 
     /** Errors occurred during the video player initialization. */
-    @Deprecated
     public @interface VideoInitializationError {
         int CLIENT_LIBRARY_UPDATE_REQUIRED = 0;
         int DEVELOPER_KEY_INVALID = 1;
@@ -97,7 +88,6 @@
     }
 
     /** Errors occurred during the video playing. */
-    @Deprecated
     public @interface VideoPlayError {
         int NOT_PLAYABLE = 0;
         int UNAUTHORIZED_OVERLAY = 1;
@@ -116,7 +106,6 @@
      * @param isMutedAutoplay Whether the video is currently autoplaying muted.
      * @param event The event to report.
      */
-    @Deprecated
     default void reportVideoPlayEvent(boolean isMutedAutoplay, @VideoPlayEvent int event) {}
 
     /**
@@ -125,7 +114,6 @@
      * @param isMutedAutoplay Whether the video is currently autoplaying muted.
      * @param error The error to report.
      */
-    @Deprecated
     default void reportVideoInitializationError(
             boolean isMutedAutoplay, @VideoInitializationError int error) {}
 
@@ -135,13 +123,11 @@
      * @param isMutedAutoplay Whether the video is currently autoplaying muted.
      * @param error The error to report.
      */
-    @Deprecated
     default void reportVideoPlayError(boolean isMutedAutoplay, @VideoPlayError int error) {}
 
     /**
      * Returns the bounds of the toolbar in global (root) coordinates.
      */
-    @Deprecated
     default Rect getToolbarGlobalVisibleRect() {
         return new Rect();
     }
@@ -152,7 +138,6 @@
      * @param observer The observer to add.
      * @Return a reference to be used when removing the observer, or null if not successful.
      */
-    @Deprecated
     default void addHeaderOffsetObserver(SurfaceHeaderOffsetObserver observer) {}
 
     /**
@@ -160,6 +145,11 @@
      *
      * @param observer An Object returned by |addHeaderOffsetObserver|.
      */
-    @Deprecated
     default void removeHeaderOffsetObserver(SurfaceHeaderOffsetObserver observer) {}
+
+    /** Returns whether or not activity logging should be enabled. */
+    @Deprecated
+    default boolean isActivityLoggingEnabled() {
+        return false;
+    }
 }

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedActionsHandler.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedActionsHandler.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedActionsHandler.java
deleted file mode 100644
index 9013e2a..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedActionsHandler.java
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-import android.view.View;
-
-import androidx.annotation.IntDef;
-
-import org.chromium.chrome.browser.xsurface.LoggingParameters;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.Map;
-
-/**
- * Implemented in Chromium.
- *
- * Interface to provide chromium calling points for a feed.
- */
-public interface FeedActionsHandler {
-    String KEY = "FeedActions";
-
-    /**
-     * Requests additional content to be loaded. Once the load is completed, onStreamUpdated will be
-     * called.
-     */
-    default void loadMore() {}
-
-    /**
-     * Sends data back to the server when content is clicked.
-     */
-    default void processThereAndBackAgainData(byte[] data, LoggingParameters loggingParameters) {}
-
-    /**
-     * Triggers Chrome to send user feedback for this card.
-     */
-    default void sendFeedback(Map<String, String> productSpecificDataMap) {}
-
-    /**
-     * Requests to dismiss a card. A change ID will be returned and it can be used to commit or
-     * discard the change.
-     * @param data A serialized feedpacking.DismissData message.
-     */
-    default int requestDismissal(byte[] data) {
-        return 0;
-    }
-
-    /**
-     * Commits a previous requested dismissal denoted by change ID.
-     */
-    default void commitDismissal(int changeId) {}
-
-    /**
-     * Discards a previous requested dismissal denoted by change ID.
-     */
-    default void discardDismissal(int changeId) {}
-
-    /**
-     * Interface for handling snackbar exit conditions.
-     */
-
-    public interface SnackbarController {
-        @Deprecated
-        default void onAction() {}
-
-        /**
-         * Called when the snackbar's action button is tapped.
-         *
-         * @param actionFinished Should be called when work associated with this action has been
-         *     completed.
-         */
-        default void onAction(Runnable actionFinished) {}
-
-        @Deprecated
-        default void onDismissNoAction() {}
-
-        /**
-         * Called when the snackbar is dismissed without the button being tapped (usually when it
-         * times out).
-         *
-         * @param actionFinished Should be called when work associated with this action has been
-         *     completed.
-         */
-        default void onDismissNoAction(Runnable actionFinished) {}
-    }
-
-    /**
-     * Snackbar dismissal timeout.
-     */
-    public enum SnackbarDuration {
-        /**
-         * SHORT should be used with simple one-line snackbars.
-         */
-        SHORT,
-        /**
-         * LONG should be used with multi-line snackbars that take longer to read.
-         */
-        LONG
-    }
-
-    /**
-     * Show a snackbar.
-     * @param text Text to display.
-     * @param actionLabel Text for the button (e.g. "Undo").
-     * @param duration Whether to remove the snackbar after a short or long delay.
-     * @param controller Handlers for snackbar actions.
-     */
-    default void showSnackbar(String text, String actionLabel, SnackbarDuration duration,
-            SnackbarController controller) {}
-
-    /**
-     * Share a URL. This will bring up the sharing sheet.
-     * @param url The url of the page to be shared.
-     * @param title The title of the page to be shared.
-     */
-    default void share(String url, String title) {}
-
-    /**
-     * Opens the settings to manager autoplay.
-     */
-    default void openAutoplaySettings() {}
-
-    /**
-     * Watches a view to get notified when the first time it has the visible area percentage not
-     * less than the given threshold. The watch is based on the visibility of full
-     * ListContentManager item containing the view.
-     * @param view The view to watch for.
-     * @param viewedThreshold The threshold of the percentage of the visible area on screen.
-     * @param runnable The runnable to get notified.
-     */
-    default void watchForViewFirstVisible(View view, float viewedThreshold, Runnable runnable) {}
-
-    /**
-     * Reports that the notice identified by the given key is created. It may not be visible yet.
-     * @param key Key to identify the type of the notice. For each new key, please update
-     *            "NoticeKey" token in histograms.xml and NoticeUmaName() in metrics_reporter.cc.
-     */
-    default void reportNoticeCreated(String key) {}
-
-    /**
-     * Reports that the notice identified by the given key is viewed, fully visible in the viewport.
-     * @param key Key to identify the type of the notice. This interaction info can be used to
-     * determine if it is necessary to show the notice to the user again.
-     */
-    default void reportNoticeViewed(String key) {}
-
-    /**
-     * Reports that the user has clicked/tapped the notice identified by the given key to perform
-     * an open action. This interaction info can be used to determine if it is necessary to show
-     * the notice to the user again.
-     * @param key Key to identify the type of the notice.
-     */
-    default void reportNoticeOpenAction(String key) {}
-
-    /**
-     * Reports that the notice identified by the given key is dismissed by the user.
-     * @param key Key to identify the type of the notice.
-     */
-    default void reportNoticeDismissed(String key) {}
-
-    /**
-     * Types of feeds that can be invalidated. These values must match the privately defined values
-     * of InvalidateCacheData.FeedType.
-     */
-    @IntDef({FeedIdentifier.UNSPECIFIED, FeedIdentifier.MAIN_FEED, FeedIdentifier.FOLLOWING_FEED,
-            FeedIdentifier.CHANNEL_FEED})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface FeedIdentifier {
-        int UNSPECIFIED = 0;
-        int MAIN_FEED = 1;
-        int FOLLOWING_FEED = 2;
-        int CHANNEL_FEED = 3;
-    }
-
-    /**
-     * Requests that the cache a feed be invalidated so that its contents are re-fetched the next
-     * time the feed is shown/loaded.
-     * @param feedToInvalidate Identifies which feed should have its cache invalidated. The request
-     *         will be dropped if set to FeedIdentifier.UNSPECIFIED.
-     */
-    default void invalidateContentCacheFor(@FeedIdentifier int feedToInvalidate) {}
-
-    /**
-     * Reports that the info card is being tracked for its full visibility.
-     * @param type Type of the info card.
-     */
-    default void reportInfoCardTrackViewStarted(int type) {}
-
-    /**
-     * Reports that the info card is fully visible in the viewport.
-     * @param type Type of the info card.
-     * @param minimumViewIntervalSeconds The minimum interval in seconds from the last time the info
-     * card is viewed in order for it to be considered viewed again.
-     */
-    default void reportInfoCardViewed(int type, int minimumViewIntervalSeconds) {}
-
-    /**
-     * Reports that the user tapps the info card.
-     * @param type Type of the info card.
-     */
-    default void reportInfoCardClicked(int type) {}
-
-    /**
-     * Reports that the user dismisses the info card explicitly by tapping the close button.
-     * @param type Type of the info card.
-     */
-    default void reportInfoCardDismissedExplicitly(int type) {}
-
-    /**
-     * Resets all the states of the info card.
-     * @param type Type of the info card.
-     */
-    default void resetInfoCardStates(int type) {}
-}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedLaunchReliabilityLogger.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedLaunchReliabilityLogger.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedLaunchReliabilityLogger.java
deleted file mode 100644
index 0460d70..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedLaunchReliabilityLogger.java
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2021 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-import androidx.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Implemented internally.
- *
- * Interface for logging latency and availability signals for feed launches. All timestamps are in
- * terms of nanoseconds since system boot. One instance exists per feed surface and lasts for the
- * surface's lifetime.
- */
-public interface FeedLaunchReliabilityLogger {
-    @IntDef({SurfaceType.UNSPECIFIED, SurfaceType.NEW_TAB_PAGE, SurfaceType.START_SURFACE})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface SurfaceType {
-        int UNSPECIFIED = 0;
-        int NEW_TAB_PAGE = 1;
-        int START_SURFACE = 2;
-    }
-    @IntDef({StreamType.UNSPECIFIED, StreamType.FOR_YOU, StreamType.WEB_FEED,
-            StreamType.SINGLE_WEB_FEED})
-    @Retention(RetentionPolicy.SOURCE)
-    @interface StreamType {
-        int UNSPECIFIED = 0;
-        int FOR_YOU = 1;
-        int WEB_FEED = 2;
-        int SINGLE_WEB_FEED = 3;
-    }
-
-    /**
-     * Set details about the stream being launched and send any pending events.
-     * @param streamType Feed type (e.g. "for you" or "following").
-     * @param streamId Identifier for the stream used to disambiguate events from concurrent
-     *         streams.
-     */
-    default void sendPendingEvents(
-            @org.chromium.chrome.browser.xsurface.feed.StreamType int streamType, int streamId) {}
-
-    /**
-     * Clear any pending events and end the flow without logging any events.
-     */
-    default void cancelPendingEvents() {}
-
-    /**
-     * Returns true if logUiStarting(), logFeedReloading(), or logFeedLaunchOtherStart() have been
-     * called since the last call to logLaunchFinished().
-     * @return True if the launch flow has started but not finished.
-     */
-    default boolean isLaunchInProgress() {
-        return false;
-    }
-
-    /**
-     * Log when the feed is launched because its UI surface was created.
-     * @param surfaceType Feed surface type (e.g. new tab page or Start Surface).
-     * @param timestamp Time at which the surface began to be created.
-     */
-    default void logUiStarting(@SurfaceType int surfaceType, long timestamp) {}
-
-    /**
-     * Log when a feed refresh is requested manually.
-     * @param timestamp Time at which the surface was shown.
-     */
-    default void logManualRefresh(long timestamp) {}
-
-    /**
-     * Log when the feed is launched because its surface was shown and cards needed to be
-     * re-rendered.
-     * @param timestamp Time at which the surface was shown.
-     */
-    default void logFeedReloading(long timestamp) {}
-
-    /**
-     * Log when the feed is launched in any case not already handled by logUiStarting() or
-     * logFeedReloaded().
-     * @param timestamp Time at which the feed stream was bound.
-     */
-    default void logFeedLaunchOtherStart(long timestamp) {}
-
-    /**
-     * Log when the user switches to another feed tab.
-     * @param toStreamType New feed type.
-     * @param timestamp Event time.
-     */
-    default void logSwitchedFeeds(
-            @org.chromium.chrome.browser.xsurface.feed.StreamType int toStreamType,
-            long timestamp) {}
-
-    /**
-     * Log when cached feed content is about to be read.
-     * @param timestamp Event time.
-     */
-    default void logCacheReadStart(long timestamp) {}
-
-    /**
-     * Log after finishing attempting to read cached feed content.
-     * @param timestamp Event time.
-     * @param result DiscoverCardReadCacheResult.
-     */
-    default void logCacheReadEnd(long timestamp, int result) {}
-
-    /**
-     * Log when the loading spinner is shown.
-     * @param timestamp Time at which the spinner was shown.
-     */
-    default void logLoadingIndicatorShown(long timestamp) {}
-
-    /**
-     * Log when rendering of above-the-fold feed content begins.
-     * @param timestamp Event time.
-     */
-    default void logAtfRenderStart(long timestamp) {}
-
-    /**
-     * Log when rendering of above-the-fold feed content finishes.
-     * @param timestamp Event time.
-     * @param result DiscoverAboveTheFoldRenderResult.
-     */
-    default void logAtfRenderEnd(long timestamp, int result) {}
-
-    /**
-     * Get the network request logger for a request by its ID.
-     * @param requestId A unique ID for the request.
-     * @return A logger for the request: an existing logger if one matches `requestId`, or a new one
-     *         otherwise.
-     */
-    default org.chromium.chrome.browser.xsurface.FeedNetworkRequestReliabilityLogger
-    getNetworkRequestReliabilityLogger(int requestId) {
-        return new org.chromium.chrome.browser.xsurface.FeedNetworkRequestReliabilityLogger() {};
-    }
-
-    /**
-     * Log to mark the end of the feed launch. Logs a "launched finished" event with the timestamp
-     * and result (or instead with the pending "launch finished" timestamp and result if there was a
-     * call to pendingFinished()).
-     * @param timestamp Event time, possibly the same as one of the other events.
-     * @param result DiscoverLaunchResult.
-     */
-    default void logLaunchFinished(long timestamp, int result) {}
-
-    /**
-     * Log to mark the end of the feed launch.
-     * @param timestamp Event time, possibly the same as one of the other events.
-     * @param result DiscoverLaunchResult.
-     * @param onlyIfLaunchInProgress Pass true if this event should only be logged if there is a
-     *         feed launch in progress.
-     */
-    default void logLaunchFinished(long timestamp, int result, boolean onlyIfLaunchInProgress) {}
-
-    /**
-     * Keep a tentative timestamp and status for "launch finished" if the user left the feed but
-     * might return before it finishes loading.
-     * If the next call is to logLaunchFinished(), logLaunchFinished() will log the pending
-     * "launch finished" timestamp and status and clear them. If the next call is to
-     * cancelPendingFinished(), the pending "launch finished" is cleared. If there is already a
-     * pending "launch finished", calling pendingFinished() again has no effect.
-     * @param timestamp Event time in nanoseconds.
-     * @param result DiscoverLaunchResult.
-     */
-    default void pendingFinished(long timestamp, int result) {}
-
-    /**
-     * If a timestamp and status code were recorded with pendingFinished(), drop them.
-     */
-    default void cancelPendingFinished() {}
-}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedNetworkRequestReliabilityLogger.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedNetworkRequestReliabilityLogger.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedNetworkRequestReliabilityLogger.java
deleted file mode 100644
index 3d8e097..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedNetworkRequestReliabilityLogger.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2021 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-/**
- * Implemented internally.
- *
- * Interface for logging latency and availability signals for feed network requests. All timestamps
- * are in terms of nanoseconds since system boot.
- *
- * Obtain instances from FeedLaunchReliabilityLogger.getNetworkRequestReliabilityLogger().
- */
-public interface FeedNetworkRequestReliabilityLogger {
-    /**
-     * Log before filling out and serializing a
-     * feed query request. Starts the network
-     * request flow.
-     * @param timestamp Event time.
-     */
-    default void logFeedQueryRequestStart(long timestamp) {}
-
-    /**
-     * Log before filling out and serializing a feed actions upload request. Starts the network
-     * request flow.
-     * @param timestamp Event time.
-     */
-    default void logActionsUploadRequestStart(long timestamp) {}
-
-    /**
-     * Log before filling out and serializing a web feed request for all followed web feeds. Starts
-     * the network request flow.
-     */
-    default void logWebFeedRequestStart(long timestamp) {}
-
-    /**
-     * Log before filling out and serializing a web feed request for a single web feed, used by the
-     * cormorant surface. Starts the network request flow.
-     */
-    default void logSingleWebFeedRequestStart(long timestamp) {}
-
-    /**
-     * Log after the request has been sent.
-     * @param timestamp Event time.
-     */
-    default void logRequestSent(long timestamp) {}
-
-    /**
-     * Log after the response is received and before it is parsed.
-     * @param serverRecvTimestamp Server-reported time (nanoseconds) at which the request arrived.
-     * @param serverSendTimestamp Server-reported time (nanoseconds) at which the response was sent.
-     * @param clientRecvTimestamp Client time at which the response was received.
-     */
-    default void logResponseReceived(
-            long serverRecvTimestamp, long serverSendTimestamp, long clientRecvTimestamp) {}
-
-    /**
-     * Log after logResponseReceived() if there's a network error, or after parsing the response
-     * otherwise. Ends the network request flow.
-     * @param timestamp Event time.
-     * @param canonicalStatus Network request status code. See
-     *         //third_party/abseil-cpp/absl/status/status.h.
-     */
-    default void logRequestFinished(long timestamp, int canonicalStatus) {}
-}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScope.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScope.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScope.java
deleted file mode 100644
index f3ce0c8..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScope.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-import org.chromium.chrome.browser.xsurface.SurfaceScope;
-
-// TODO(b/269234249): Don't use this in Chromium yet, it's not implemented.
-/**
- * Implemented internally.
- *
- * Provides multiple types of renderers to surfaces that want to render an
- * external surface. Each renderer will reuse the same dependencies (hence
- * "Scope") but each call to provideFoo will return a new renderer, so that a
- * single surface can support multiple rendered views.
- */
-public interface FeedSurfaceScope extends SurfaceScope {
-    /**
-     * Return the FeedLaunchReliabilityLogger associated with the surface, creating it if it
-     * doesn't exist.
-     * @return The surface's FeedLaunchReliabilityLogger instance.
-     */
-    default FeedLaunchReliabilityLogger getLaunchReliabilityLogger() {
-        return new FeedLaunchReliabilityLogger() {};
-    }
-
-    default FeedUserInteractionReliabilityLogger getUserInteractionReliabilityLogger() {
-        return new FeedUserInteractionReliabilityLogger() {};
-    }
-}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScopeDependencyProvider.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScopeDependencyProvider.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScopeDependencyProvider.java
deleted file mode 100644
index 8e141ef..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedSurfaceScopeDependencyProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2020 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-import android.graphics.Rect;
-
-import org.chromium.chrome.browser.xsurface.SurfaceHeaderOffsetObserver;
-import org.chromium.chrome.browser.xsurface.SurfaceScopeDependencyProvider;
-
-/**
- * Implemented in Chromium.
- *
- * Provides dependencies for xsurface at the surface level.
- *
- * Should only be called on the UI thread.
- */
-public interface FeedSurfaceScopeDependencyProvider extends SurfaceScopeDependencyProvider {
-    /** User-set preference for when videos are eligible to autoplay. */
-    public enum AutoplayPreference {
-        /** Autoplay is disabled. */
-        AUTOPLAY_DISABLED,
-        /** Autoplay only occurs on Wi-Fi. */
-        AUTOPLAY_ON_WIFI_ONLY,
-        /** Autoplay will occur on both Wi-Fi and mobile data. */
-        AUTOPLAY_ON_WIFI_AND_MOBILE_DATA
-    }
-
-    /** Returns the user-set preferences for when videos are eligible to autoplay. */
-    default AutoplayPreference getAutoplayPreference2() {
-        return AutoplayPreference.AUTOPLAY_DISABLED;
-    }
-
-    /** Events that are triggered during the video playing. */
-    public @interface VideoPlayEvent {
-        // Events applying muted autoplay only.
-
-        /**
-         * Auto-play stops before reaching the end. This occurs when the video card becomes
-         * partially visible or invisible.
-         */
-        int AUTOPLAY_STOPPED = 0;
-        /** Auto-play reaches the end. */
-        int AUTOPLAY_ENDED = 1;
-        /** User clicks on the auto-play video. */
-        int AUTOPLAY_CLICKED = 2;
-
-        // Events applying to both muted autoplay and regular play.
-
-        /** The player starts to play the video. */
-        int PLAY_REQUESTED = 3;
-        int PLAY_STARTED = 4;
-        int PLAY_ERROR = 5;
-        int NUM_ENTRIES = 6;
-    }
-
-    /** Errors occurred during the video player initialization. */
-    public @interface VideoInitializationError {
-        int CLIENT_LIBRARY_UPDATE_REQUIRED = 0;
-        int DEVELOPER_KEY_INVALID = 1;
-        int ERROR_CONNECTING_TO_SERVICE = 2;
-        int INTERNAL_ERROR = 3;
-        int INVALID_APPLICATION_SIGNATURE = 4;
-        int NETWORK_ERROR = 5;
-        int SERVICE_DISABLED = 6;
-        int SERVICE_INVALID = 7;
-        int SERVICE_MISSING = 8;
-        int SERVICE_VERSION_UPDATE_REQUIRED = 9;
-        int UNKNOWN_ERROR = 10;
-        int NUM_ENTRIES = 11;
-    }
-
-    /** Errors occurred during the video playing. */
-    public @interface VideoPlayError {
-        int NOT_PLAYABLE = 0;
-        int UNAUTHORIZED_OVERLAY = 1;
-        int INTERNAL_ERROR = 2;
-        int UNKNOWN_ERROR = 3;
-        int AUTOPLAY_DISABLED = 4;
-        int UNEXPECTED_SERVICE_DISCONNECTION = 5;
-        int NOT_PLAYABLE_MUTED = 6;
-        int NETWORK_ERROR = 7;
-        int NUM_ENTRIES = 8;
-    }
-
-    /**
-     * Reports the event related to video playing.
-     *
-     * @param isMutedAutoplay Whether the video is currently autoplaying muted.
-     * @param event The event to report.
-     */
-    default void reportVideoPlayEvent(boolean isMutedAutoplay, @VideoPlayEvent int event) {}
-
-    /**
-     * Reports the error related to video player initialization.
-     *
-     * @param isMutedAutoplay Whether the video is currently autoplaying muted.
-     * @param error The error to report.
-     */
-    default void reportVideoInitializationError(
-            boolean isMutedAutoplay, @VideoInitializationError int error) {}
-
-    /**
-     * Reports the error related to video playing.
-     *
-     * @param isMutedAutoplay Whether the video is currently autoplaying muted.
-     * @param error The error to report.
-     */
-    default void reportVideoPlayError(boolean isMutedAutoplay, @VideoPlayError int error) {}
-
-    /**
-     * Returns the bounds of the toolbar in global (root) coordinates.
-     */
-    default Rect getToolbarGlobalVisibleRect() {
-        return new Rect();
-    }
-
-    /**
-     * Adds a header offset observer to the surface this scope is associated with.
-     *
-     * @param observer The observer to add.
-     * @Return a reference to be used when removing the observer, or null if not successful.
-     */
-    default void addHeaderOffsetObserver(SurfaceHeaderOffsetObserver observer) {}
-
-    /**
-     * Removes a header offset observer.
-     *
-     * @param observer An Object returned by |addHeaderOffsetObserver|.
-     */
-    default void removeHeaderOffsetObserver(SurfaceHeaderOffsetObserver observer) {}
-}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedUserInteractionReliabilityLogger.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedUserInteractionReliabilityLogger.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedUserInteractionReliabilityLogger.java
deleted file mode 100644
index 60e08bbd..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/FeedUserInteractionReliabilityLogger.java
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2023 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-import android.view.View;
-
-import androidx.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-// TODO(b/269234249): Don't use in Chromium yet, it's not implemented.
-/**
- * Implemented internally.
- *
- * Interface for capturing the reliability for every change in the collection of items presented to
- * the user during the interaction. One instance exists per feed surface and lasts for the surface's
- * lifetime.
- */
-public interface FeedUserInteractionReliabilityLogger {
-    /**
-     * Called when the stream has been opened. This should be called before reporting any event.
-     */
-    default void onStreamOpened(@StreamType int streamType) {}
-
-    /**
-     * Describes how the stream is closed.
-     */
-    @IntDef({ClosedReason.OPEN_CARD, ClosedReason.SUSPEND_APP, ClosedReason.LEAVE_FEED,
-            ClosedReason.SWITCH_STREAM})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface ClosedReason {
-        /** The user taps on a card. */
-        int OPEN_CARD = 0;
-        /** The user leaves the app. */
-        int SUSPEND_APP = 1;
-        /** The user leaves the feed but still stays in the app, like switching to other tab. */
-        int LEAVE_FEED = 2;
-        /** The user switches to other stream. */
-        int SWITCH_STREAM = 3;
-    }
-
-    /**
-     * Called when the stream has been closed.
-     */
-    default void onStreamClosed(@ClosedReason int reason) {}
-
-    /**
-     * Called when the view has entered the visible part of the screen for the first time. If the
-     * view is then off screen and become visible again, it will not be reported again.
-     */
-    default void onViewFirstVisible(View view) {}
-
-    /**
-     * Called when the view has been rendered for the first time. Note that this doesn't include the
-     * child images. If the view is then off screen and become visible again, it will not be
-     * reported again.
-     */
-    default void onViewFirstRendered(View view) {}
-
-    /**
-     * Called when the pagination process has started.
-     */
-    default void onPaginationStarted() {}
-
-    /**
-     * Called when the waiting indicator is shown. This will happen after the pagination process
-     * has started.
-     */
-    default void onPaginationIndicatorShown() {}
-
-    /**
-     * Describes the end state of the pagination process.
-     */
-    @IntDef({PaginationResult.SUCCESS_WITH_MORE_FEED, PaginationResult.SUCCESS_WITH_NO_FEED,
-            PaginationResult.FAILURE})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface PaginationResult {
-        /** More feed content is retrieved. */
-        int SUCCESS_WITH_MORE_FEED = 0;
-        /** No feed content is retrieved. This means that the end of the feed is reached. */
-        int SUCCESS_WITH_NO_FEED = 1;
-        /** The pagination request has failed. */
-        int FAILURE = 2;
-    }
-
-    /**
-     * Called when the pagination process has ended.
-     */
-    default void onPaginationEnded(@PaginationResult int result) {}
-}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/ReliabilityLoggingTestUtil.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/ReliabilityLoggingTestUtil.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/ReliabilityLoggingTestUtil.java
deleted file mode 100644
index 1affb45..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/ReliabilityLoggingTestUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2021 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-/**
- * Implemented internally.
- *
- * This interface provides access to the list of recently-sent "flows" of reliability logging events
- * for verification in integration tests.
- */
-public interface ReliabilityLoggingTestUtil {
-    /**
-     * Return the most recent "flows" (at most 30), or lists of logged events
-     * representing a user interaction, with each flow rendered as a string.
-     */
-    default String getRecentFlowsForTesting() {
-        return "";
-    }
-
-    /**
-     * Return the number of recent flows that would be rendered by getRecentFlowsForTesting().
-     */
-    default int getRecentFlowsCountForTesting() {
-        return 0;
-    }
-
-    /** Clear the list of recent flows. */
-    default void clearRecentFlowsForTesting() {}
-}

chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/StreamType.java

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/StreamType.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/StreamType.java
deleted file mode 100644
index f0421af5..0000000
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/feed/StreamType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2023 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.xsurface.feed;
-
-import androidx.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/** Type of stream being launched (the "For you","Following", or "SingleWebFeed" feed). */
-@IntDef({StreamType.UNSPECIFIED, StreamType.FOR_YOU, StreamType.WEB_FEED,
-        StreamType.SINGLE_WEB_FEED})
-@Retention(RetentionPolicy.SOURCE)
-public @interface StreamType {
-    int UNSPECIFIED = 0;
-    int FOR_YOU = 1;
-    int WEB_FEED = 2;
-    int SINGLE_WEB_FEED = 3;
-}

chrome/build/lacros-arm.pgo.txt

diff --git a/chrome/build/lacros-arm.pgo.txt b/chrome/build/lacros-arm.pgo.txt
index 75ee9407..94237abe 100644
--- a/chrome/build/lacros-arm.pgo.txt
+++ b/chrome/build/lacros-arm.pgo.txt
@@ -1 +1 @@
-chrome-chromeos-arm-generic-main-1681818706-263bc20ec15b0ddf1153375d64b5c2c45f727ba3.profdata
+chrome-chromeos-arm-generic-main-1681833573-facbb0e521b087fe29e120ff6e07d3c78bcd2a54.profdata

chrome/build/lacros64.pgo.txt

diff --git a/chrome/build/lacros64.pgo.txt b/chrome/build/lacros64.pgo.txt
index c9afd21..89fa929 100644
--- a/chrome/build/lacros64.pgo.txt
+++ b/chrome/build/lacros64.pgo.txt
@@ -1 +1 @@
-chrome-chromeos-amd64-generic-main-1681818706-3a6c85971b2c634611926b5688e57177ab633dc5.profdata
+chrome-chromeos-amd64-generic-main-1681833573-b45faf655ae34ca08ec48ceb278433a53cb3372e.profdata

chrome/build/mac-arm.pgo.txt

diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt
index 03632a9..b5dd950 100644
--- a/chrome/build/mac-arm.pgo.txt
+++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@
-chrome-mac-arm-main-1681826340-7798b2d5d04078b404cf2c42c0b6696f87333f55.profdata
+chrome-mac-arm-main-1681833573-750ccc8a74a9df9ea3c210a175bec61e3ae27494.profdata

chrome/build/win64.pgo.txt

diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
index 2dee0ef..005c21a 100644
--- a/chrome/build/win64.pgo.txt
+++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1681818706-077ebe45c9e65e56d8748085bc7ce0dd4112182d.profdata
+chrome-win64-main-1681829988-b39335b323b77ee1ebdf994e207576a6101fc875.profdata

chrome/test/BUILD.gn

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 9a1f83f..2aed543 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2524,10 +2524,7 @@
     }
 
     if (is_win || is_linux || is_chromeos_ash) {
-      sources += [
-        "../browser/ui/views/web_apps/web_app_integration_browsertest_cros.cc",
-        "../browser/ui/views/web_apps/web_app_integration_browsertest_win_linux_cros.cc",
-      ]
+      sources += [ "../browser/ui/views/web_apps/web_app_integration_browsertest_win_linux_cros.cc" ]
     }
 
     if (is_mac) {
@@ -2541,6 +2538,7 @@
       sources += [
         "../browser/media/webrtc/get_all_screen_media_browsertest.cc",
         "../browser/sessions/tab_restore_service_browsertest.cc",
+        "../browser/ui/views/web_apps/web_app_integration_browsertest_cros.cc",
         "data/webui/chromeos/webui_resource_browsertest.cc",
       ]
       deps += [
@@ -4189,6 +4187,7 @@
         "../browser/ui/ash/system_tray_client_impl_browsertest.cc",
         "../browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc",
         "../browser/ui/ash/thumbnail_loader_browsertest.cc",
+        "../browser/ui/ash/user_education/views/help_bubble_factory_views_ash_browsertest.cc",
         "../browser/ui/ash/volume_controller_browsertest.cc",
         "../browser/ui/browser_finder_chromeos_browsertest.cc",
         "../browser/ui/browser_navigator_browsertest_chromeos.cc",
@@ -9127,7 +9126,6 @@
       "../browser/supervised_user/child_accounts/child_account_service_unittest.cc",
       "../browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc",
       "../browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc",
-      "../browser/supervised_user/kids_chrome_management/kids_external_fetcher_unittest.cc",
       "../browser/supervised_user/kids_chrome_management/kids_management_service_unittest.cc",
       "../browser/supervised_user/kids_chrome_management/kids_profile_manager_unittest.cc",
       "../browser/supervised_user/parental_control_metrics_unittest.cc",

chrome/test/data/web_apps/empty_web_app.json

diff --git a/chrome/test/data/web_apps/empty_web_app.json b/chrome/test/data/web_apps/empty_web_app.json
index 8c05449..8b490ee 100644
--- a/chrome/test/data/web_apps/empty_web_app.json
+++ b/chrome/test/data/web_apps/empty_web_app.json
@@ -50,6 +50,7 @@
    "run_on_os_login_os_integration_state": "not set",
    "scope": "",
    "scope_extensions": [  ],
+   "scope_extensions_validated": [  ],
    "share_target": null,
    "shortcuts_menu_item_infos": [  ],
    "sources": [  ],

chrome/test/data/web_apps/sample_web_app.json

diff --git a/chrome/test/data/web_apps/sample_web_app.json b/chrome/test/data/web_apps/sample_web_app.json
index f5b6502f..5aa5ed9 100644
--- a/chrome/test/data/web_apps/sample_web_app.json
+++ b/chrome/test/data/web_apps/sample_web_app.json
@@ -1,48 +1,37 @@
 {
    "!app_id": "eajjdjobhihlgobdfaehiiheinneagde",
    "!name": "Name1234",
-   "additional_search_terms": [ "Foo_1234_0", "Foo_1234_1", "Foo_1234_2", "Foo_1234_3", "Foo_1234_4", "Foo_1234_5", "Foo_1234_6" ],
-   "allowed_launch_protocols": [ "web+test_1234_0", "web+test_1234_1", "web+test_1234_2", "web+test_1234_3", "web+test_1234_4", "web+test_1234_5", "web+test_1234_6" ],
-   "always_show_toolbar_in_fullscreen": true,
+   "additional_search_terms": [ "Foo_1234_0", "Foo_1234_1", "Foo_1234_2", "Foo_1234_3", "Foo_1234_4" ],
+   "allowed_launch_protocols": [ "web+test_1234_0" ],
+   "always_show_toolbar_in_fullscreen": false,
    "app_service_icon_url": "chrome://app-icon/eajjdjobhihlgobdfaehiiheinneagde/32",
-   "app_size_in_bytes": "382722586",
+   "app_size_in_bytes": "1505422652",
    "background_color": "rgba(77,188,194,0.9686274509803922)",
-   "capture_links": "kNone",
+   "capture_links": "kNewClient",
    "current_os_integration_states": {
       "file_handling": [  ],
       "protocols_handled": {
+         "web+test0": "https://example.com/scope1234/start12340"
       },
-      "run_on_os_login": "windowed",
+      "run_on_os_login": "not_run",
       "shortcut_descriptions": {
          "description": "Description1234",
          "icon_size_to_timestamp_map": {
-            "32": "1970-02-18 21:58:05.750 UTC"
+            "32": "1970-02-04 17:47:46.335 UTC"
          },
          "title": "Name1234"
       },
-      "shortcut_menus": [ {
-         "icon_data_any": {
-            "48": "1970-02-05 06:19:19.039 UTC"
-         },
-         "icon_data_maskable": {
-            "48": "1970-02-05 06:19:19.039 UTC"
-         },
-         "icon_data_monochrome": {
-            "48": "1970-02-05 06:19:19.039 UTC"
-         },
-         "shortcut_launch_url": "https://example.com/scope1234/0",
-         "shortcut_name": "shortcut_name0"
-      } ],
+      "shortcut_menus": [  ],
       "uninstall_registration": {
          "display_name": "Name1234",
-         "registered_with_os": false
+         "registered_with_os": true
       }
    },
    "dark_mode_background_color": "none",
    "dark_mode_theme_color": "rgba(34,214,187,1)",
-   "data_size_in_bytes": "1450270097",
+   "data_size_in_bytes": "1449447663",
    "description": "Description1234",
-   "disallowed_launch_protocols": [ "web+disallowed_1234_0", "web+disallowed_1234_1", "web+disallowed_1234_2", "web+disallowed_1234_3", "web+disallowed_1234_4", "web+disallowed_1234_5", "web+disallowed_1234_6" ],
+   "disallowed_launch_protocols": [ "web+disallowed_1234_0", "web+disallowed_1234_1", "web+disallowed_1234_2", "web+disallowed_1234_3", "web+disallowed_1234_4", "web+disallowed_1234_5" ],
    "display_mode": "fullscreen",
    "display_override": [ "standalone", "fullscreen" ],
    "downloaded_icon_sizes": {
@@ -56,10 +45,15 @@
       "MONOCHROME": [  ],
       "index": 0
    }, {
-      "ANY": [ 118 ],
-      "MASKABLE": [ 38 ],
-      "MONOCHROME": [ 228 ],
+      "ANY": [ 36 ],
+      "MASKABLE": [ 184 ],
+      "MONOCHROME": [ 60 ],
       "index": 1
+   }, {
+      "ANY": [ 136, 6 ],
+      "MASKABLE": [ 98, 254 ],
+      "MONOCHROME": [ 109, 27 ],
+      "index": 2
    } ],
    "file_handler_approval_state": "kRequiresPrompt",
    "file_handler_os_integration_state": "kDisabled",
@@ -178,34 +172,34 @@
    },
    "last_badging_time": "1970-01-15 16:10:56.662 UTC",
    "last_launch_time": "1970-01-21 15:31:39.413 UTC",
-   "latest_install_source": 16,
+   "latest_install_source": 26,
    "launch_handler": {
-      "client_mode": "kNavigateNew"
+      "client_mode": "kNavigateExisting"
    },
    "launch_query_params": "944292860",
-   "lock_screen_start_url": "https://example.com/scope1234/lock_screen_start_url3022990271",
+   "lock_screen_start_url": "",
    "management_type_to_external_configuration_map": {
       "Default": {
          "additional_policy_ids": [ "policy_id_1_1234", "policy_id_2_1234" ],
-         "install_urls": [ "https://example.com/installer2_1234/" ],
-         "is_placeholder": true
+         "install_urls": [ "https://example.com/installer1_1234/" ],
+         "is_placeholder": false
       },
       "SubApp": {
-         "additional_policy_ids": [ "policy_id_2_1234" ],
-         "install_urls": [ "https://example.com/installer1_1234/", "https://example.com/installer2_1234/" ],
+         "additional_policy_ids": [  ],
+         "install_urls": [  ],
          "is_placeholder": true
       },
       "WebAppStore": {
          "additional_policy_ids": [ "policy_id_1_1234" ],
          "install_urls": [ "https://example.com/installer1_1234/", "https://example.com/installer2_1234/" ],
-         "is_placeholder": true
+         "is_placeholder": false
       }
    },
    "manifest_icons": [  ],
    "manifest_id": null,
-   "manifest_update_time": "1970-01-24 05:49:58.819 UTC",
+   "manifest_update_time": "1970-02-12 16:20:18.762 UTC",
    "manifest_url": "https://example.com/manifest1234.json",
-   "note_taking_new_note_url": "https://example.com/scope1234/new_note1289939860",
+   "note_taking_new_note_url": "",
    "parent_app_id": "",
    "protocol_handlers": [ {
       "protocol": "web+test24741963850",
@@ -236,38 +230,80 @@
       "has_origin_wildcard": true,
       "origin": "https://app-8204596852.com"
    } ],
+   "scope_extensions_validated": [ {
+      "has_origin_wildcard": false,
+      "origin": "https://app-8204596850.com"
+   }, {
+      "has_origin_wildcard": false,
+      "origin": "https://app-8204596851.com"
+   }, {
+      "has_origin_wildcard": true,
+      "origin": "https://app-8204596852.com"
+   } ],
    "share_target": null,
    "shortcuts_menu_item_infos": [ {
       "icons": {
          "ANY": [ {
-            "square_size_px": 14,
-            "url": "https://example.com/shortcuts/icon24240987411"
+            "square_size_px": 41,
+            "url": "https://example.com/shortcuts/icon241730719324"
+         }, {
+            "square_size_px": 0,
+            "url": "https://example.com/shortcuts/icon241730719320"
          } ],
          "MASKABLE": [ {
-            "square_size_px": 29,
-            "url": "https://example.com/shortcuts/icon24240987412"
-         }, {
-            "square_size_px": 7,
-            "url": "https://example.com/shortcuts/icon24240987410"
+            "square_size_px": 32,
+            "url": "https://example.com/shortcuts/icon241730719323"
          } ],
-         "MONOCHROME": [  ]
+         "MONOCHROME": [ {
+            "square_size_px": 23,
+            "url": "https://example.com/shortcuts/icon241730719322"
+         }, {
+            "square_size_px": 16,
+            "url": "https://example.com/shortcuts/icon241730719321"
+         } ]
       },
-      "name": "shortcut2424098741",
-      "url": "https://example.com/scope1234/shortcut2424098741"
+      "name": "shortcut24173071932",
+      "url": "https://example.com/scope1234/shortcut24173071932"
    }, {
       "icons": {
          "ANY": [ {
-            "square_size_px": 0,
-            "url": "https://example.com/shortcuts/icon24240987400"
+            "square_size_px": 11,
+            "url": "https://example.com/shortcuts/icon241730719311"
          } ],
-         "MASKABLE": [  ],
+         "MASKABLE": [ {
+            "square_size_px": 21,
+            "url": "https://example.com/shortcuts/icon241730719312"
+         }, {
+            "square_size_px": 7,
+            "url": "https://example.com/shortcuts/icon241730719310"
+         } ],
+         "MONOCHROME": [  ]
+      },
+      "name": "shortcut24173071931",
+      "url": "https://example.com/scope1234/shortcut24173071931"
+   }, {
+      "icons": {
+         "ANY": [ {
+            "square_size_px": 4,
+            "url": "https://example.com/shortcuts/icon241730719300"
+         } ],
+         "MASKABLE": [ {
+            "square_size_px": 34,
+            "url": "https://example.com/shortcuts/icon241730719303"
+         } ],
          "MONOCHROME": [ {
-            "square_size_px": 16,
-            "url": "https://example.com/shortcuts/icon24240987401"
+            "square_size_px": 44,
+            "url": "https://example.com/shortcuts/icon241730719304"
+         }, {
+            "square_size_px": 25,
+            "url": "https://example.com/shortcuts/icon241730719302"
+         }, {
+            "square_size_px": 10,
+            "url": "https://example.com/shortcuts/icon241730719301"
          } ]
       },
-      "name": "shortcut2424098740",
-      "url": "https://example.com/scope1234/shortcut2424098740"
+      "name": "shortcut24173071930",
+      "url": "https://example.com/scope1234/shortcut24173071930"
    } ],
    "sources": [ "SubApp", "WebAppStore", "Sync", "Default" ],
    "start_url": "https://example.com/scope1234/start1234",

chrome/test/data/webui/settings/cr_settings_browsertest.js

diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js
index ddaac8e8..6400bf5 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -623,6 +623,12 @@
       runMochaSuite('PrivacySandboxPageTests');
     });
 
+TEST_F(
+    'CrSettingsPrivacySandboxPageTest',
+    'PrivacySandboxNoticeRestrictedEnabledTests', function() {
+      runMochaSuite('PrivacySandboxNoticeRestrictedEnabledTests');
+    });
+
 TEST_F('CrSettingsPrivacySandboxPageTest', 'TopicsSubpageTests', function() {
   runMochaSuite('PrivacySandboxTopicsSubpageTests');
 });

chrome/test/data/webui/settings/privacy_sandbox_page_test.ts

diff --git a/chrome/test/data/webui/settings/privacy_sandbox_page_test.ts b/chrome/test/data/webui/settings/privacy_sandbox_page_test.ts
index d7eff86b..9e02b61 100644
--- a/chrome/test/data/webui/settings/privacy_sandbox_page_test.ts
+++ b/chrome/test/data/webui/settings/privacy_sandbox_page_test.ts
@@ -6,7 +6,7 @@
 
 import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
 import {CrDialogElement, SettingsPrivacySandboxAdMeasurementSubpageElement, SettingsPrivacySandboxFledgeSubpageElement, SettingsPrivacySandboxPageElement, SettingsPrivacySandboxTopicsSubpageElement} from 'chrome://settings/lazy_load.js';
-import {CrSettingsPrefs, MetricsBrowserProxyImpl, PrivacySandboxBrowserProxyImpl, Router, routes, SettingsPrefsElement} from 'chrome://settings/settings.js';
+import {CrLinkRowElement, CrSettingsPrefs, MetricsBrowserProxyImpl, PrivacySandboxBrowserProxyImpl, Router, routes, SettingsPrefsElement} from 'chrome://settings/settings.js';
 import {assertDeepEquals, assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js';
 import {flushTasks, waitAfterNextRender} from 'chrome://webui-test/polymer_test_util.js';
 import {isChildVisible, isVisible} from 'chrome://webui-test/test_util.js';
@@ -44,41 +44,47 @@
   });
 
   test('privacySandboxLinkRowsVisible', function() {
-    assertTrue(isVisible(page.$.privacySandboxTopicsLinkRow));
-    assertTrue(isVisible(page.$.privacySandboxFledgeLinkRow));
+    assertTrue(isChildVisible(page, '#privacySandboxTopicsLinkRow'));
+    assertTrue(isChildVisible(page, '#privacySandboxFledgeLinkRow'));
     assertTrue(isVisible(page.$.privacySandboxAdMeasurementLinkRow));
   });
 
   test('privacySandboxTopicsRowSublabel', async function() {
     page.setPrefValue('privacy_sandbox.m1.topics_enabled', true);
     await flushTasks();
-    assertTrue(isVisible(page.$.privacySandboxTopicsLinkRow));
+    const topicsRow = page.shadowRoot!.querySelector<CrLinkRowElement>(
+        '#privacySandboxTopicsLinkRow');
+    assertTrue(!!topicsRow);
+    assertTrue(isVisible(topicsRow));
     assertEquals(
         loadTimeData.getString('adPrivacyPageTopicsLinkRowSubLabelEnabled'),
-        page.$.privacySandboxTopicsLinkRow.subLabel);
+        topicsRow.subLabel);
 
     page.setPrefValue('privacy_sandbox.m1.topics_enabled', false);
     await flushTasks();
-    assertTrue(isVisible(page.$.privacySandboxTopicsLinkRow));
+    assertTrue(isVisible(topicsRow));
     assertEquals(
         loadTimeData.getString('adPrivacyPageTopicsLinkRowSubLabelDisabled'),
-        page.$.privacySandboxTopicsLinkRow.subLabel);
+        topicsRow.subLabel);
   });
 
   test('privacySandboxFledgeRowSublabel', async function() {
     page.setPrefValue('privacy_sandbox.m1.fledge_enabled', true);
     await flushTasks();
-    assertTrue(isVisible(page.$.privacySandboxFledgeLinkRow));
+    const fledgeRow = page.shadowRoot!.querySelector<CrLinkRowElement>(
+        '#privacySandboxFledgeLinkRow');
+    assertTrue(!!fledgeRow);
+    assertTrue(isVisible(fledgeRow));
     assertEquals(
         loadTimeData.getString('adPrivacyPageFledgeLinkRowSubLabelEnabled'),
-        page.$.privacySandboxFledgeLinkRow.subLabel);
+        fledgeRow.subLabel);
 
     page.setPrefValue('privacy_sandbox.m1.fledge_enabled', false);
     await flushTasks();
-    assertTrue(isVisible(page.$.privacySandboxFledgeLinkRow));
+    assertTrue(isVisible(fledgeRow));
     assertEquals(
         loadTimeData.getString('adPrivacyPageFledgeLinkRowSubLabelDisabled'),
-        page.$.privacySandboxFledgeLinkRow.subLabel);
+        fledgeRow.subLabel);
   });
 
   test('privacySandboxAdMeasurementRowSublabel', async function() {
@@ -100,7 +106,10 @@
   });
 
   test('clickPrivacySandboxTopicsLinkRow', async function() {
-    page.$.privacySandboxTopicsLinkRow.click();
+    const topicsRow = page.shadowRoot!.querySelector<HTMLElement>(
+        '#privacySandboxTopicsLinkRow');
+    assertTrue(!!topicsRow);
+    topicsRow.click();
     assertEquals(
         'Settings.PrivacySandbox.Topics.Opened',
         await metricsBrowserProxy.whenCalled('recordAction'));
@@ -109,7 +118,10 @@
   });
 
   test('clickPrivacySandboxFledgeLinkRow', async function() {
-    page.$.privacySandboxFledgeLinkRow.click();
+    const fledgeRow = page.shadowRoot!.querySelector<HTMLElement>(
+        '#privacySandboxFledgeLinkRow');
+    assertTrue(!!fledgeRow);
+    fledgeRow.click();
     assertEquals(
         'Settings.PrivacySandbox.Fledge.Opened',
         await metricsBrowserProxy.whenCalled('recordAction'));
@@ -128,6 +140,40 @@
   });
 });
 
+suite('PrivacySandboxNoticeRestrictedEnabledTests', function() {
+  let page: SettingsPrivacySandboxPageElement;
+  let settingsPrefs: SettingsPrefsElement;
+  let metricsBrowserProxy: TestMetricsBrowserProxy;
+
+  suiteSetup(function() {
+    loadTimeData.overrideValues({
+      isPrivacySandboxRestricted: true,
+      isPrivacySandboxRestrictedNoticeEnabled: true,
+    });
+    settingsPrefs = document.createElement('settings-prefs');
+    return CrSettingsPrefs.initialized;
+  });
+
+  setup(function() {
+    metricsBrowserProxy = new TestMetricsBrowserProxy();
+    MetricsBrowserProxyImpl.setInstance(metricsBrowserProxy);
+
+    document.body.innerHTML = window.trustedTypes!.emptyHTML;
+    document.body.appendChild(settingsPrefs);
+    page = document.createElement('settings-privacy-sandbox-page');
+    page.prefs = settingsPrefs.prefs!;
+    document.body.appendChild(page);
+    return flushTasks();
+  });
+
+  // When the restricted notice is configured, ensure only measurement is shown.
+  test('privacySandboxLinkRowsNotVisible', function() {
+    assertFalse(isChildVisible(page, '#privacySandboxTopicsLinkRow'));
+    assertFalse(isChildVisible(page, '#privacySandboxFledgeLinkRow'));
+    assertTrue(isVisible(page.$.privacySandboxAdMeasurementLinkRow));
+  });
+});
+
 suite('PrivacySandboxTopicsSubpageTests', function() {
   let page: SettingsPrivacySandboxTopicsSubpageElement;
   let testPrivacySandboxBrowserProxy: TestPrivacySandboxBrowserProxy;

chrome/test/interaction/README.md

diff --git a/chrome/test/interaction/README.md b/chrome/test/interaction/README.md
index 9c3e779..2422c1c 100644
--- a/chrome/test/interaction/README.md
+++ b/chrome/test/interaction/README.md
@@ -81,8 +81,7 @@
 Verbs fall into a number of different categories:
 - **Do** performs an action you specify.
 - **Log** prints its arguments to the output at log level `INFO`.
-    - By default, arguments are captured by value when the sequence is built.
-    - If you want a variable's value read at runtime, use `std::ref(var)`.
+  See [Logging](#logging) below.
 - **Check** verbs ensure that some condition is true; if it is not, the test
   fails. Some *Check* verbs use `Matcher`s, some use callbacks, etc. Examples
   include:
@@ -225,14 +224,13 @@
 The following are, therefore, all valid:
 ```cpp
 void Func() {
-  LOG(INFO) << "Normal function.";
+  // ...
 }
 
 IN_PROC_BROWSER_TEST_F(MyTest, TestDo) {
-  auto lambda = [](){ LOG(INFO) << "Stored lambda."; };
-  auto once_callback = base::BindOnce([](){ LOG(INFO) << "Once callback."; });
-  auto repeating_callback =
-      base::BindRepeating([](){ LOG(INFO) << "Repeating callback."; });
+  auto lambda = [](){ Func(); };
+  auto once_callback = base::BindOnce(&Func);
+  auto repeating_callback = base::BindRepeating(&Func);
   int x = 1;
   int y = 2;
   RunTestSequence(
@@ -240,7 +238,7 @@
       Do(lambda),
       Do(std::move(once_callback)),
       Do(repeating_callback),
-      Do([x, &y](){ LOG(INFO) << "Bound args " << x << ", " << y; }));
+      Do([x, &y](){ Func(), LOG(INFO) << "Bound args " << x << ", " << y; }));
 }
 ```
 
@@ -249,6 +247,34 @@
 verb does require an explicit argument it will be provided in the verb's method
 signature.
 
+### Logging
+
+Using the `Log` verb allows for printing of any number of arguments. They are
+sent to log level `INFO` when the `Log` step is executed. `Log` "knows" how to
+print anything that our logging macros can. So if you can do
+`LOG(INFO) << value` you can print it with the `Log` verb.
+
+There are a few different ways to pass values to `Log`:
+ - If you just pass a variable or literal, the value that is printed is the
+   value _at the time the sequence is created_.
+ - If you wrap a variable with `std::ref`, the value that is printed is the
+   value of the variable _at the time the `Log` step is executed_.
+ - You can also pass any callable object (callback, lambda, or function
+   pointer) that returns a loggable value. The callable object is executed when
+   the `Log` step runs and the result is printed.
+
+Example:
+```cpp
+int x = 1;
+RunTestSequence(
+  // Change the value of x.
+  Do([&](){ ++x; }),
+  // Print out old, current, and computed values.
+  Log("Original value: ", x,
+      " current value: ", std::ref(x),
+      " square of current value: ", [&x](){ return x*x; }));
+```
+
 ### Modifiers
 
 A modifier wraps around a step or steps and change their behavior.

chrome/test/webapps/coverage/coverage_cros.tsv

diff --git a/chrome/test/webapps/coverage/coverage_cros.tsv b/chrome/test/webapps/coverage/coverage_cros.tsv
index 1c1a77f8..467049c 100644
--- a/chrome/test/webapps/coverage/coverage_cros.tsv
+++ b/chrome/test/webapps/coverage/coverage_cros.tsv
@@ -1,5 +1,5 @@
 # This is a generated file.
-# Full coverage: 56%, with partial coverage: 75%
+# Full coverage: 55%, with partial coverage: 74%
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
@@ -261,32 +261,32 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌑	launch_from_launch_icon_Standalone🌑	check_window_created🌑
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_window_created🌑
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_chrome_apps_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑	check_app_loaded_in_tab_NotPromotable🌑
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑	check_app_loaded_in_tab_NotPromotable🌑
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌑	check_tab_created_One🌑	check_app_loaded_in_tab_NotPromotable🌑
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌓
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌓
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌓
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
@@ -371,20 +371,20 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌑	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
 create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌓
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌓
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌓
@@ -505,10 +505,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑	check_app_loaded_in_tab_Standalone🌑
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌓
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌓
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌓
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌓

chrome/test/webapps/coverage/coverage_linux.tsv

diff --git a/chrome/test/webapps/coverage/coverage_linux.tsv b/chrome/test/webapps/coverage/coverage_linux.tsv
index 0a6a52f..9c69b35 100644
--- a/chrome/test/webapps/coverage/coverage_linux.tsv
+++ b/chrome/test/webapps/coverage/coverage_linux.tsv
@@ -1,16 +1,16 @@
 # This is a generated file.
-# Full coverage: 75%, with partial coverage: 93%
+# Full coverage: 77%, with partial coverage: 93%
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_title_Standalone_StandaloneUpdated_AcceptUpdate🌑	await_manifest_update_Standalone🌑	launch_from_menu_option_Standalone🌑	check_app_title_Standalone_StandaloneUpdated🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_title_Standalone_StandaloneUpdated_AcceptUpdate🌑	await_manifest_update_Standalone🌑	launch_from_launch_icon_Standalone🌑	check_app_title_Standalone_StandaloneUpdated🌑
@@ -457,19 +457,19 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_platform_shortcut_not_exists_Standalone🌑	check_app_not_in_list_Standalone🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
@@ -477,123 +477,123 @@
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_omnibox_icon_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_omnibox_icon_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_menu_option_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_menu_option_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-create_shortcut_NotPromotable_Windowed🌕	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+create_shortcut_NotPromotable_Windowed🌕	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
@@ -629,16 +629,16 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
@@ -682,22 +682,22 @@
 create_shortcut_NotPromotable_Browser🌕	switch_profile_clients_Client2🌕	install_locally_NotPromotable🌓	check_platform_shortcut_and_icon_NotPromotable🌓
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
@@ -780,22 +780,22 @@
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	navigate_browser_Standalone🌕	check_install_icon_shown🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
@@ -820,10 +820,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
@@ -902,15 +902,15 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	uninstall_policy_app_Standalone🌕	check_platform_shortcut_and_icon_Standalone🌓
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_menu_option_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_launch_icon_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌓	check_app_navigation_StandaloneNotStartUrl🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_platform_shortcut_StandaloneNotStartUrl🌓	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_app_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_app_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_app_navigation_Standalone🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_app_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_app_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_browser_navigation_Standalone🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_browser_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_browser_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌓	check_browser_navigation_StandaloneNotStartUrl🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌕	check_browser_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_platform_shortcut_StandaloneNotStartUrl🌓	check_browser_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	check_app_not_in_list_StandaloneNotStartUrl🌕	check_app_in_list_icon_correct_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	check_app_not_in_list_StandaloneNotStartUrl🌕	check_app_in_list_icon_correct_Standalone🌕
@@ -934,35 +934,35 @@
 install_menu_option_Standalone🌕	manifest_update_colors_Standalone🌑	await_manifest_update_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_color_correct_Standalone🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_Standalone🌕	check_install_icon_not_shown🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_Standalone🌕	check_install_icon_not_shown🌕
@@ -974,19 +974,19 @@
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_Standalone🌕	check_launch_icon_shown🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedB🌕	check_install_icon_not_shown🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedB🌕	check_install_icon_not_shown🌕
@@ -1006,19 +1006,19 @@
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedA🌕	check_launch_icon_shown🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 switch_incognito_profile🌕	navigate_browser_Standalone🌕	check_create_shortcut_not_shown🌑
 switch_incognito_profile🌕	navigate_browser_NotPromotable🌕	check_create_shortcut_not_shown🌑
@@ -1085,250 +1085,250 @@
 install_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Standalone_Windowed🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_omnibox_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_FileHandler_Windowed🌕	check_site_handles_file_FileHandler_Foo🌕	check_site_handles_file_FileHandler_Bar🌕
 create_shortcut_FileHandler_Browser🌕	check_site_handles_file_FileHandler_Foo🌕	check_site_handles_file_FileHandler_Bar🌕

chrome/test/webapps/coverage/coverage_mac.tsv

diff --git a/chrome/test/webapps/coverage/coverage_mac.tsv b/chrome/test/webapps/coverage/coverage_mac.tsv
index 4aaa475..9700e22 100644
--- a/chrome/test/webapps/coverage/coverage_mac.tsv
+++ b/chrome/test/webapps/coverage/coverage_mac.tsv
@@ -1,16 +1,16 @@
 # This is a generated file.
-# Full coverage: 76%, with partial coverage: 94%
+# Full coverage: 79%, with partial coverage: 94%
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_title_Standalone_StandaloneUpdated_AcceptUpdate🌑	await_manifest_update_Standalone🌑	launch_from_menu_option_Standalone🌑	check_app_title_Standalone_StandaloneUpdated🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_title_Standalone_StandaloneUpdated_AcceptUpdate🌑	await_manifest_update_Standalone🌑	launch_from_launch_icon_Standalone🌑	check_app_title_Standalone_StandaloneUpdated🌑
@@ -457,19 +457,19 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_platform_shortcut_not_exists_Standalone🌑	check_app_not_in_list_Standalone🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
@@ -477,129 +477,129 @@
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
 create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
 install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
 install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
 install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
 install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_not_created🌕
-create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	close_pwa🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_omnibox_icon_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_omnibox_icon_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_menu_option_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_menu_option_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-create_shortcut_NotPromotable_Windowed🌕	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+create_shortcut_NotPromotable_Windowed🌕	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_platform_shortcut_NotPromotable🌓	check_window_not_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
@@ -635,16 +635,16 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
@@ -688,22 +688,22 @@
 create_shortcut_NotPromotable_Browser🌕	switch_profile_clients_Client2🌕	install_locally_NotPromotable🌓	check_platform_shortcut_and_icon_NotPromotable🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌑	check_window_created🌑
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌑	check_tab_created_One🌑
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
@@ -786,22 +786,22 @@
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	navigate_browser_Standalone🌕	check_install_icon_shown🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_not_created🌕
@@ -826,10 +826,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
@@ -908,15 +908,15 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	uninstall_policy_app_Standalone🌕	check_platform_shortcut_and_icon_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_menu_option_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_launch_icon_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌓	check_app_navigation_StandaloneNotStartUrl🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_platform_shortcut_StandaloneNotStartUrl🌓	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_app_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_app_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_app_navigation_Standalone🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_app_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_app_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_browser_navigation_Standalone🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_browser_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_browser_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌓	check_browser_navigation_StandaloneNotStartUrl🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌕	check_browser_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_platform_shortcut_StandaloneNotStartUrl🌓	check_browser_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	check_app_not_in_list_StandaloneNotStartUrl🌕	check_app_in_list_icon_correct_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	check_app_not_in_list_StandaloneNotStartUrl🌕	check_app_in_list_icon_correct_Standalone🌕
@@ -932,19 +932,19 @@
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_Standalone🌕	check_launch_icon_shown🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedB🌕	check_install_icon_not_shown🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedB🌕	check_install_icon_not_shown🌕
@@ -964,51 +964,51 @@
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedA🌕	check_launch_icon_shown🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 switch_incognito_profile🌕	navigate_browser_Standalone🌕	check_create_shortcut_not_shown🌑
 switch_incognito_profile🌕	navigate_browser_NotPromotable🌕	check_create_shortcut_not_shown🌑
@@ -1075,250 +1075,250 @@
 install_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Standalone_Windowed🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_omnibox_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_FileHandler_Windowed🌕	check_site_handles_file_FileHandler_Foo🌕	check_site_handles_file_FileHandler_Bar🌕
 create_shortcut_FileHandler_Browser🌕	check_site_handles_file_FileHandler_Foo🌕	check_site_handles_file_FileHandler_Bar🌕

chrome/test/webapps/coverage/coverage_win.tsv

diff --git a/chrome/test/webapps/coverage/coverage_win.tsv b/chrome/test/webapps/coverage/coverage_win.tsv
index e635aac..3ef5265 100644
--- a/chrome/test/webapps/coverage/coverage_win.tsv
+++ b/chrome/test/webapps/coverage/coverage_win.tsv
@@ -1,16 +1,16 @@
 # This is a generated file.
-# Full coverage: 76%, with partial coverage: 94%
+# Full coverage: 78%, with partial coverage: 94%
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_app_title_Standalone_StandaloneOriginal🌑
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_app_title_Standalone_StandaloneOriginal🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_title_Standalone_StandaloneUpdated_AcceptUpdate🌑	await_manifest_update_Standalone🌑	launch_from_menu_option_Standalone🌑	check_app_title_Standalone_StandaloneUpdated🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_title_Standalone_StandaloneUpdated_AcceptUpdate🌑	await_manifest_update_Standalone🌑	launch_from_launch_icon_Standalone🌑	check_app_title_Standalone_StandaloneUpdated🌑
@@ -457,19 +457,19 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_platform_shortcut_not_exists_Standalone🌑	check_app_not_in_list_Standalone🌑
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
@@ -477,123 +477,123 @@
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+create_shortcut_Standalone_Windowed🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 create_shortcut_Standalone_Windowed🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_omnibox_icon_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_omnibox_icon_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_display_standalone🌕
-install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_display_standalone🌕
+install_menu_option_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_display_standalone🌕
 install_menu_option_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_display_standalone🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Browser🌕	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	set_open_in_window_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_tab_created_One🌕
-install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_settings_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	set_open_in_tab_from_app_home_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_tab_created_One🌕	check_app_loaded_in_tab_NotPromotable🌕
+create_shortcut_NotPromotable_Browser🌕	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
+install_policy_app_NotPromotable_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_tab_not_created🌕	check_app_loaded_in_tab_NotPromotable🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+create_shortcut_MinimalUi_Windowed🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 create_shortcut_MinimalUi_Windowed🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_omnibox_icon_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_omnibox_icon_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_omnibox_icon_MinimalUi🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_menu_option_MinimalUi🌕	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_launch_icon_MinimalUi🌕	check_window_display_minimal🌕
-install_menu_option_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_display_minimal🌕
+install_menu_option_MinimalUi🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_display_minimal🌕
 install_menu_option_MinimalUi🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_display_minimal🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 create_shortcut_Tabbed_Windowed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Tabbed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_WithShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_policy_app_Tabbed_NoShortcut_Windowed_WebApp🌓	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_menu_option_Tabbed🌕	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_launch_icon_Tabbed🌕	check_window_display_tabbed🌕
-install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌓	check_window_display_tabbed🌕
+install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Tabbed🌕	check_window_display_tabbed🌕
 install_menu_option_Tabbed🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Tabbed🌓	check_window_display_tabbed🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-create_shortcut_NotPromotable_Windowed🌕	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+create_shortcut_NotPromotable_Windowed🌕	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_NotPromotable🌕	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_NotPromotable🌕	check_window_created🌕
-install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌓	check_window_created🌕
+install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_NotPromotable🌕	check_window_created🌕
 create_shortcut_NotPromotable_Windowed🌕	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
 install_policy_app_NotPromotable_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
 install_policy_app_NotPromotable_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_NotPromotable🌓	check_window_created🌕
@@ -629,16 +629,16 @@
 create_shortcut_Standalone_Browser🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_omnibox_icon_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
 install_menu_option_Standalone🌕	delete_profile🌑	check_platform_shortcut_not_exists_Standalone🌑
-create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	delete_platform_shortcut_Standalone🌕	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	create_shortcuts_from_list_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
-install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕
+create_shortcut_Standalone_Windowed🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	open_in_chrome🌕	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_omnibox_icon_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
 install_menu_option_Standalone🌕	navigate_pwa_Standalone_MinimalUi🌕	open_in_chrome🌕	check_tab_created_One🌕
@@ -682,22 +682,22 @@
 create_shortcut_NotPromotable_Browser🌕	switch_profile_clients_Client2🌕	install_locally_NotPromotable🌓	check_platform_shortcut_and_icon_NotPromotable🌓
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	install_locally_Standalone🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+install_menu_option_Standalone🌕	switch_profile_clients_Client2🌕	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Windowed🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 create_shortcut_Standalone_Browser🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
 install_omnibox_icon_Standalone🌕	switch_profile_clients_Client2🌕	uninstall_from_list_Standalone🌕	check_app_not_in_list_Standalone🌕
@@ -780,22 +780,22 @@
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	navigate_browser_Standalone🌕	check_install_icon_shown🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_created🌕
-install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_created🌕
+install_menu_option_Standalone🌕	install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_created🌕
 create_shortcut_Standalone_Windowed🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_omnibox_icon_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
 install_menu_option_Standalone🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕
@@ -820,10 +820,10 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	create_shortcut_Standalone_Windowed🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_omnibox_icon_Standalone🌕	check_window_created🌕
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	check_window_created🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_tab_created_One🌕
-create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_tab_created_One🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
+create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_tab_not_created🌕	check_app_loaded_in_tab_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_WithShortcut_Browser_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
 create_shortcut_Standalone_Browser🌕	install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	uninstall_policy_app_Standalone🌕	check_app_in_list_tabbed_Standalone🌕
@@ -902,15 +902,15 @@
 install_policy_app_Standalone_NoShortcut_Browser_WebApp🌓	install_menu_option_Standalone🌕	uninstall_policy_app_Standalone🌕	check_platform_shortcut_and_icon_Standalone🌓
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_menu_option_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_launch_icon_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌓	check_app_navigation_StandaloneNotStartUrl🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌕	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebShortcut🌓	launch_from_platform_shortcut_StandaloneNotStartUrl🌓	check_app_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_app_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_app_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_app_navigation_Standalone🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_app_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_app_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_browser_navigation_Standalone🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_browser_navigation_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_browser_navigation_Standalone🌕
-install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌓	check_browser_navigation_StandaloneNotStartUrl🌕
+install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_chrome_apps_StandaloneNotStartUrl🌕	check_browser_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebShortcut🌓	launch_from_platform_shortcut_StandaloneNotStartUrl🌓	check_browser_navigation_StandaloneNotStartUrl🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Windowed_WebApp🌓	check_app_not_in_list_StandaloneNotStartUrl🌕	check_app_in_list_icon_correct_Standalone🌕
 install_policy_app_StandaloneNotStartUrl_WithShortcut_Browser_WebApp🌓	check_app_not_in_list_StandaloneNotStartUrl🌕	check_app_in_list_icon_correct_Standalone🌕
@@ -934,35 +934,35 @@
 install_menu_option_Standalone🌕	manifest_update_colors_Standalone🌑	await_manifest_update_Standalone🌑	launch_from_platform_shortcut_Standalone🌑	check_window_color_correct_Standalone🌑
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Browser🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_MinimalUi🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_minimal🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_Standalone🌕	check_install_icon_not_shown🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_Standalone🌕	check_install_icon_not_shown🌕
@@ -974,19 +974,19 @@
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_Standalone🌕	check_launch_icon_shown🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_policy_app_StandaloneNestedA_WithShortcut_Windowed_WebApp🌓	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_menu_option_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_launch_icon_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
-install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
+install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_chrome_apps_StandaloneNestedA🌕	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	launch_from_platform_shortcut_StandaloneNestedA🌓	navigate_pwa_StandaloneNestedA_StandaloneNestedB🌕	check_no_toolbar🌕
 create_shortcut_StandaloneNestedA_Windowed🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedB🌕	check_install_icon_not_shown🌕
 install_omnibox_icon_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedB🌕	check_install_icon_not_shown🌕
@@ -1006,19 +1006,19 @@
 install_menu_option_StandaloneNestedA🌕	manifest_update_scope_to_StandaloneNestedA_Standalone🌕	await_manifest_update_StandaloneNestedA🌕	navigate_browser_StandaloneNestedA🌕	check_launch_icon_shown🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 create_shortcut_Standalone_Windowed🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_omnibox_icon_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_menu_option_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_launch_icon_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
-install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
+install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_chrome_apps_Standalone🌕	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 install_menu_option_Standalone🌕	manifest_update_display_Standalone_Tabbed🌕	maybe_close_pwa🌕	await_manifest_update_Standalone🌕	launch_from_platform_shortcut_Standalone🌓	check_window_created🌕	check_tab_not_created🌕	check_window_display_tabbed🌕
 switch_incognito_profile🌕	navigate_browser_Standalone🌕	check_create_shortcut_not_shown🌑
 switch_incognito_profile🌕	navigate_browser_NotPromotable🌕	check_create_shortcut_not_shown🌑
@@ -1085,250 +1085,250 @@
 install_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Standalone_Windowed🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_omnibox_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
-install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
+install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
-install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
+install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Standalone🌕	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 install_policy_app_Standalone_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Standalone🌓	check_window_controls_overlay_toggle_Standalone_NotShown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	disable_window_controls_overlay_Wco🌕	check_window_controls_overlay_toggle_Wco_Shown🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 create_shortcut_Wco_Windowed🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_omnibox_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_menu_option_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_launch_icon_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_chrome_apps_Wco🌕	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_On🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_On🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_On🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	launch_from_platform_shortcut_Wco🌓	enable_window_controls_overlay_Wco🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_MinimalUi_On🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_MinimalUi_Windowed🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_omnibox_icon_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_WithShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_policy_app_MinimalUi_NoShortcut_Windowed_WebApp🌓	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_menu_option_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_launch_icon_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
-install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
+install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_chrome_apps_MinimalUi🌕	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 install_menu_option_MinimalUi🌕	manifest_update_display_MinimalUi_Wco🌕	await_manifest_update_MinimalUi🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_MinimalUi🌓	enable_window_controls_overlay_MinimalUi🌕	check_window_controls_overlay_toggle_MinimalUi_Shown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
-install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
+install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_toggle_Wco_NotShown🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_toggle_Wco_NotShown🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_Wco_Windowed🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_omnibox_icon_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_WithShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_policy_app_Wco_NoShortcut_Windowed_WebApp🌓	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_menu_option_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_launch_icon_Wco🌕	check_window_controls_overlay_Wco_Off🌕
-install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌓	check_window_controls_overlay_Wco_Off🌕
+install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_chrome_apps_Wco🌕	check_window_controls_overlay_Wco_Off🌕
 install_menu_option_Wco🌕	manifest_update_display_Wco_Standalone🌕	await_manifest_update_Wco🌕	maybe_close_pwa🌕	launch_from_platform_shortcut_Wco🌓	check_window_controls_overlay_Wco_Off🌕
 create_shortcut_FileHandler_Windowed🌕	check_site_handles_file_FileHandler_Foo🌕	check_site_handles_file_FileHandler_Bar🌕
 create_shortcut_FileHandler_Browser🌕	check_site_handles_file_FileHandler_Foo🌕	check_site_handles_file_FileHandler_Bar🌕

chrome/test/webapps/data/actions.md

diff --git a/chrome/test/webapps/data/actions.md b/chrome/test/webapps/data/actions.md
index 13ff710..bd0d6f3 100644
--- a/chrome/test/webapps/data/actions.md
+++ b/chrome/test/webapps/data/actions.md
@@ -125,14 +125,13 @@
 | delete_platform_shortcut | Site |  | 74 | Implemented | Delete the shortcut that lives on the operating system. Win/Mac/Linux only. | P2 |
 | delete_profile |  |  | 83 | Not Implemented | Delete the user profile. | P4 |
 | # Launching |
-| launch_from_chrome_apps | Site |  | 34 | Implemented | Launch the web app by navigating to chrome://apps, and then clicking on the app icon. |  |
 | launch_from_launch_icon | Site |  | 35 | Implemented | Launch the web app by navigating the browser to the web app, and selecting the launch icon in the omnibox (intent picker), |  |
 | launch_from_menu_option | Site |  | 69 | Implemented | Launch the web app by navigating the browser to the web app, and selecting the "Launch _" menu option in the 3-dot menu. | cliffordcheng@, P1 |
 | launch_from_platform_shortcut | Site |  | 1 | Implemented | Launch an app from a platform shortcut on the user's desktop or start menu. | cliffordcheng@, P0 |
 | launch | Site | launch_from_menu_option($1) & launch_from_launch_icon($1) & launch_from_chrome_apps($1) & launch_from_platform_shortcut($1) | 64 | Parameterized |  |  |
 | launch_not_from_platform_shortcut | Site | launch_from_menu_option($1) & launch_from_launch_icon($1) & launch_from_chrome_apps($1) | 135 | Parameterized |  |   |
 | launch_from_browser | Site | launch_from_menu_option($1) & launch_from_launch_icon($1) & launch_from_chrome_apps($1) | 65 | Parameterized |  |  |
-| launch_from_shortcut_or_list | Site | launch_from_chrome_apps($1) & launch_from_platform_shortcut($1) | 66 | Parameterized | All ways to launch an app that are still available for 'browser' apps. |  |
+| check_app_loaded_in_tab | Site |  | 163 | Implemented | Verify that the web app was launched in a tab after being clicked from chrome://apps. |  |
 | # Navigation |
 | navigate_browser | Site |  | 37 | Implemented | Navigate the browser to one of the static sites provided by the testing framework. |  |
 | navigate_notfound_url |  |  | 38 | Implemented | Navigate to a url that returns a 404 server error. |  |
@@ -169,9 +168,6 @@
 | check_no_sub_apps |  |  | 142 | Implemented | Assuming we navigated to the (potential) parent site, call subApps.list() and check if the list is empty. |  |
 
 ### App Home
-
-TODO(dibyapal): Move more app home based actions here once they are integrated to above actions or newly implemented.
-
 Actions that the user can take by going to chrome://apps and either left clicking an app or right clicking an app and then taking actions from the context menu that opens.
 
 | # Action base name | Argument Types | Output Actions | Unique Identifier | Status (WIP, Implemented, Not Implemented, Parameterized) | Description | Metadata, implementation bug, etc |
@@ -192,3 +188,4 @@
 | uninstall_from_list | Site |  | 10 | Implemented | Uninstall the webapp from wherever apps are listed by chrome. On WML, this is from chrome://apps, and on ChromeOS, this is from the 'launcher' |  |
 | create_shortcuts_from_list | Site |  | 72 | Implemented | "create shortcuts" in chrome://apps. Win/Mac/Linux only. | P2 |
 | open_app_settings_from_chrome_apps | Site |  | 96 | Implemented |  | phillis@ |
+| launch_from_chrome_apps | Site |  | 34 | Implemented | Launch the web app by navigating to chrome://apps, and then clicking on the app icon. |  |
\ No newline at end of file

chrome/test/webapps/data/critical_user_journeys.md

diff --git a/chrome/test/webapps/data/critical_user_journeys.md b/chrome/test/webapps/data/critical_user_journeys.md
index 93f924c..86f2e545 100644
--- a/chrome/test/webapps/data/critical_user_journeys.md
+++ b/chrome/test/webapps/data/critical_user_journeys.md
@@ -121,12 +121,15 @@
 | M | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_platform_shortcut | check_window_created |
 | WMLC | install_or_shortcut_windowed | launch | check_window_display_standalone |
 | WMLC | install_or_shortcut_tabbed | set_open_in_window | launch | check_window_created |
-| WLC | install_or_shortcut_windowed | set_open_in_tab | launch_from_shortcut_or_list | check_tab_created(One) |
+| WML | install_or_shortcut_windowed | set_open_in_tab | launch_from_chrome_apps | check_tab_not_created | check_app_loaded_in_tab |
+| C | install_or_shortcut_windowed | set_open_in_tab | launch_from_chrome_apps | check_tab_created(One) | check_app_loaded_in_tab |
+| WLC | install_or_shortcut_windowed | set_open_in_tab | launch_from_platform_shortcut | check_tab_created(One) | check_app_loaded_in_tab |
 | M | install_or_shortcut_by_user_windowed | set_open_in_tab | launch_from_platform_shortcut | check_tab_not_created |
-| M | install_or_shortcut_by_user_windowed | close_pwa | set_open_in_tab | launch_from_platform_shortcut | check_tab_created(One) |
-| M | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | set_open_in_tab | launch_from_platform_shortcut | check_tab_created(One) |
-| M | install_or_shortcut_windowed | set_open_in_tab | launch_from_chrome_apps | check_tab_created(One) |
-| WMLC | install_or_shortcut_tabbed(NotPromotable) | launch_from_shortcut_or_list(NotPromotable) | check_tab_created(One) |
+| M | install_or_shortcut_by_user_windowed | close_pwa | set_open_in_tab | launch_from_platform_shortcut | check_tab_created(One) | check_app_loaded_in_tab |
+| M | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | set_open_in_tab | launch_from_platform_shortcut | check_tab_created(One) | check_app_loaded_in_tab |
+| WMLC | install_or_shortcut_tabbed(NotPromotable) | launch_from_platform_shortcut(NotPromotable) | check_tab_created(One) | check_app_loaded_in_tab(NotPromotable) |
+| WML | install_or_shortcut_tabbed(NotPromotable) | launch_from_chrome_apps(NotPromotable) | check_tab_not_created | check_app_loaded_in_tab(NotPromotable) |
+| C | install_or_shortcut_tabbed(NotPromotable) | launch_from_chrome_apps(NotPromotable) | check_tab_created(One) | check_app_loaded_in_tab(NotPromotable) |
 | WMLC | install_or_shortcut_windowed(MinimalUi) | launch(MinimalUi) | check_window_display_minimal |
 | WMLC | install_or_shortcut_windowed(Tabbed) | maybe_close_pwa | launch(Tabbed) | check_window_display_tabbed |
 | WMLC | install_or_shortcut_windowed(NotPromotable) | launch_not_from_platform_shortcut(NotPromotable) | check_window_created |
@@ -141,13 +144,13 @@
 | WMLC | install_or_shortcut | delete_profile | check_app_list_empty |
 | WMLC | install_or_shortcut | delete_profile | check_app_not_in_list |
 | WMLC | install_or_shortcut_with_shortcut | delete_profile | check_platform_shortcut_not_exists |
-| WMLC | install_or_shortcut_tabbed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created(One) |
+| WMLC | install_or_shortcut_tabbed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created(One) | check_app_loaded_in_tab |
 | WLC | install_or_shortcut_windowed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_created |
 | M | install_or_shortcut_by_user_windowed_with_shortcut | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_not_created |
 | M |  install_policy_app(Standalone, WithShortcut, Windowed, WebApp) | delete_platform_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_created |
-| WMLC | install_tabbed_no_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created(One) |
+| WMLC | install_tabbed_no_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_tab_created(One) | check_app_loaded_in_tab |
 | WMLC | install_windowed_no_shortcut | create_shortcuts_from_list | launch_from_platform_shortcut | check_window_created |
-| WMLC | install_or_shortcut_by_user_windowed | open_in_chrome | check_tab_created(One) |
+| WMLC | install_or_shortcut_by_user_windowed | open_in_chrome | check_tab_created(One) | check_app_loaded_in_tab |
 | WMLC | install_or_shortcut_by_user_windowed | navigate_pwa(Standalone, MinimalUi) | open_in_chrome | check_tab_created(One) |
 | WML | install_or_shortcut_windowed | open_app_settings | check_browser_navigation_is_app_settings |
 
@@ -168,9 +171,11 @@
 | WML | install_or_shortcut_by_user_windowed(NotPromotable) | switch_profile_clients | install_locally(NotPromotable) | navigate_browser(NotPromotable) | check_launch_icon_shown |
 | WML | install_or_shortcut_by_user(NotPromotable) | switch_profile_clients | install_locally(NotPromotable) | check_platform_shortcut_and_icon(NotPromotable) |
 | WML | install_or_shortcut_by_user_windowed | switch_profile_clients | install_locally | launch | check_window_created |
-| WMLC | install_or_shortcut_by_user_tabbed | switch_profile_clients | launch_from_chrome_apps | check_tab_created(One) |
-| WML | install_or_shortcut_by_user_tabbed | switch_profile_clients | install_locally | launch_from_shortcut_or_list | check_tab_created(One) |
-| WML | install_or_shortcut_by_user_windowed | switch_profile_clients | launch_from_chrome_apps | check_tab_created(One) |
+| WML | install_or_shortcut_by_user_tabbed | switch_profile_clients | launch_from_chrome_apps | check_tab_not_created | check_app_loaded_in_tab |
+| C | install_or_shortcut_by_user_tabbed | switch_profile_clients | launch_from_chrome_apps | check_tab_created(One) | check_app_loaded_in_tab |
+| WML | install_or_shortcut_by_user_tabbed | switch_profile_clients | install_locally | launch_from_chrome_apps | check_tab_not_created | check_app_loaded_in_tab |
+| WML | install_or_shortcut_by_user_tabbed | switch_profile_clients | install_locally | launch_from_platform_shortcut | check_tab_created(One) | check_app_loaded_in_tab |
+| WML | install_or_shortcut_by_user_windowed | switch_profile_clients | launch_from_chrome_apps | check_tab_not_created | check_app_loaded_in_tab |
 | WMLC | install_or_shortcut_by_user | switch_profile_clients | uninstall_from_list | check_app_not_in_list |
 | WMLC | install_or_shortcut_by_user | switch_profile_clients | uninstall_from_list | switch_profile_clients(Client1) | check_app_not_in_list |
 | WML | install_or_shortcut_by_user | switch_profile_clients | check_app_in_list_not_locally_installed |
@@ -208,7 +213,9 @@
 | WMLC | install_policy_app(Standalone, ShortcutOptions::All, Browser, WebApp) | install_or_shortcut_by_user_windowed | check_app_in_list_windowed |
 | WMLC | install_policy_app(Standalone, ShortcutOptions::All, Browser, WebApp) | install_or_shortcut_by_user_windowed | check_platform_shortcut_and_icon |
 | WMLC | install_policy_app(Standalone, ShortcutOptions::All, Browser, WebApp) | install_or_shortcut_by_user_windowed | check_window_created |
-| WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_shortcut_or_list | check_tab_created(One) |
+| WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_platform_shortcut | check_tab_created(One) | check_app_loaded_in_tab |
+| WML | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_chrome_apps | check_tab_not_created | check_app_loaded_in_tab |
+| C | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, Windowed, WebApp) | launch_from_chrome_apps | check_tab_created(One) | check_app_loaded_in_tab |
 | WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, WindowOptions::All, WebApp) | uninstall_policy_app | check_app_in_list_tabbed |
 | WMLC | install_or_shortcut_by_user_tabbed | install_policy_app(Standalone, ShortcutOptions::All, WindowOptions::All, WebApp) | uninstall_policy_app | check_platform_shortcut_and_icon |
 | WMLC | install_or_shortcut_by_user_windowed | install_policy_app(Standalone, ShortcutOptions::All, WindowOptions::All, WebApp) | uninstall_policy_app | check_app_in_list_windowed |

chrome/test/webapps/data/framework_supported_actions.csv

diff --git a/chrome/test/webapps/data/framework_supported_actions.csv b/chrome/test/webapps/data/framework_supported_actions.csv
index 0f5fa921..f63bff8 100644
--- a/chrome/test/webapps/data/framework_supported_actions.csv
+++ b/chrome/test/webapps/data/framework_supported_actions.csv
@@ -12,6 +12,7 @@
 check_install_icon_shown,                              🌕, 🌕,  🌕,   🌕,
 check_launch_icon_not_shown,                           🌕, 🌕,  🌕,   🌕,
 check_launch_icon_shown,                               🌕, 🌕,  🌕,   🌕,
+check_app_loaded_in_tab,                               🌕, 🌕,  🌕,   🌓,
 check_app_navigation,                                  🌕, 🌕,  🌕,   🌕,
 check_app_navigation_is_start_url,                     🌕, 🌕,  🌕,   🌕,
 check_no_toolbar,                                      🌕, 🌕,  🌕,   🌕,
@@ -43,7 +44,7 @@
 install_policy_app,                                    🌓, 🌓,  🌓,   🌓,
 launch_file_expect_dialog,                             🌕, 🌕,  🌕,   🌑,
 launch_file_expect_no_dialog,                          🌕, 🌕,  🌕,   🌑,
-launch_from_chrome_apps,                               🌓, 🌓,  🌓,   🌓,
+launch_from_chrome_apps,                               🌕, 🌕,  🌕,   🌓,
 launch_from_launch_icon,                               🌕, 🌕,  🌕,   🌕,
 launch_from_menu_option,                               🌕, 🌕,  🌕,   🌕,
 launch_from_platform_shortcut,                         🌓, 🌓,  🌓,   🌑,

chromeos/ash/components/device_activity/device_active_use_case.cc

diff --git a/chromeos/ash/components/device_activity/device_active_use_case.cc b/chromeos/ash/components/device_activity/device_active_use_case.cc
index a809abc0..dc23642 100644
--- a/chromeos/ash/components/device_activity/device_active_use_case.cc
+++ b/chromeos/ash/components/device_activity/device_active_use_case.cc
@@ -162,6 +162,15 @@
   for (auto kv : psm_id_to_date_) {
     psm_rlwe::RlwePlaintextId psm_rlwe_id;
     psm_rlwe_id.set_sensitive_id(kv.first);
+
+    if (GetPsmUseCase() != psm_rlwe::RlweUseCase::CROS_FRESNEL_DAILY) {
+      VLOG(1) << "Daily use case should not attach the non sensitive id "
+              << "apart of the hashed query plaintext id. "
+              << "Import and Query must be consistent when sending "
+              << "sensitive_id and non_sensitive_id.";
+      psm_rlwe_id.set_non_sensitive_id(GenerateWindowIdentifier(kv.second));
+    }
+
     psm_ids_to_query_.push_back(psm_rlwe_id);
   }
 }

chromeos/ash/components/nearby/presence/credentials/BUILD.gn

diff --git a/chromeos/ash/components/nearby/presence/credentials/BUILD.gn b/chromeos/ash/components/nearby/presence/credentials/BUILD.gn
index 7859f4f0..5031e11a 100644
--- a/chromeos/ash/components/nearby/presence/credentials/BUILD.gn
+++ b/chromeos/ash/components/nearby/presence/credentials/BUILD.gn
@@ -46,6 +46,23 @@
   ]
 }
 
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "fake_local_device_data_provider.cc",
+    "fake_local_device_data_provider.h",
+  ]
+
+  deps = [
+    ":credentials",
+    "//base",
+    "//chromeos/ash/components/nearby/presence/proto",
+    "//components/prefs",
+    "//components/signin/public/identity_manager",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
 

chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.cc

diff --git a/chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.cc b/chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.cc
new file mode 100644
index 0000000..088d60f
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.cc
@@ -0,0 +1,71 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.h"
+
+#include "chromeos/ash/components/nearby/presence/credentials/prefs.h"
+#include "components/prefs/pref_service.h"
+
+namespace ash::nearby::presence {
+
+FakeLocalDeviceDataProvider::FakeLocalDeviceDataProvider() = default;
+FakeLocalDeviceDataProvider::~FakeLocalDeviceDataProvider() = default;
+
+bool FakeLocalDeviceDataProvider::HaveSharedCredentialsChanged(
+    const std::vector<::nearby::internal::SharedCredential>&
+        shared_credentials) {
+  return have_credentials_changed_;
+}
+
+std::string FakeLocalDeviceDataProvider::GetDeviceId() {
+  return device_id_;
+}
+
+::nearby::internal::Metadata FakeLocalDeviceDataProvider::GetDeviceMetadata() {
+  return metadata_;
+}
+
+std::string FakeLocalDeviceDataProvider::GetAccountName() {
+  return account_name_;
+}
+
+bool FakeLocalDeviceDataProvider::IsUserRegistrationInfoSaved() {
+  return is_user_registration_info_saved_;
+}
+
+void FakeLocalDeviceDataProvider::SaveUserRegistrationInfo(
+    const std::string& display_name,
+    const std::string& image_url) {
+  is_user_registration_info_saved_ = true;
+}
+
+void FakeLocalDeviceDataProvider::SetHaveSharedCredentialsChanged(
+    bool have_credentials_changed) {
+  have_credentials_changed_ = have_credentials_changed;
+}
+
+void FakeLocalDeviceDataProvider::SetDeviceId(std::string device_id) {
+  device_id_ = device_id;
+}
+
+void FakeLocalDeviceDataProvider::SetDeviceMetadata(
+    ::nearby::internal::Metadata metadata) {
+  metadata_ = metadata;
+}
+
+void FakeLocalDeviceDataProvider::SetAccountName(std::string account_name) {
+  account_name_ = account_name;
+}
+
+void FakeLocalDeviceDataProvider::SetIsUserRegistrationInfoSaved(
+    bool is_user_registration_info_saved) {
+  is_user_registration_info_saved_ = is_user_registration_info_saved;
+}
+
+// Not implemented
+void FakeLocalDeviceDataProvider::UpdatePersistedSharedCredentials(
+    const std::vector<::nearby::internal::SharedCredential>&
+        shared_credentials) {}
+
+}  // namespace ash::nearby::presence

chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.h

diff --git a/chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.h b/chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.h
new file mode 100644
index 0000000..ef05600
--- /dev/null
+++ b/chromeos/ash/components/nearby/presence/credentials/fake_local_device_data_provider.h
@@ -0,0 +1,61 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_CREDENTIALS_FAKE_LOCAL_DEVICE_DATA_PROVIDER_H_
+#define CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_CREDENTIALS_FAKE_LOCAL_DEVICE_DATA_PROVIDER_H_
+
+#include "chromeos/ash/components/nearby/presence/credentials/local_device_data_provider.h"
+#include "third_party/nearby/internal/proto/credential.pb.h"
+#include "third_party/nearby/internal/proto/metadata.pb.h"
+
+namespace nearby::internal {
+class SharedCredential;
+class Metadata;
+}  // namespace nearby::internal
+
+namespace ash::nearby::presence {
+
+// A fake implementation of the Nearby Presence Local Device Data Provider.
+// Only use in unit tests.
+class FakeLocalDeviceDataProvider : public LocalDeviceDataProvider {
+ public:
+  FakeLocalDeviceDataProvider();
+  ~FakeLocalDeviceDataProvider() override;
+
+  FakeLocalDeviceDataProvider(FakeLocalDeviceDataProvider&) = delete;
+  FakeLocalDeviceDataProvider& operator=(FakeLocalDeviceDataProvider&) = delete;
+
+  // LocalDeviceDataProvider:
+  bool HaveSharedCredentialsChanged(
+      const std::vector<::nearby::internal::SharedCredential>&
+          shared_credentials) override;
+  std::string GetDeviceId() override;
+  ::nearby::internal::Metadata GetDeviceMetadata() override;
+  std::string GetAccountName() override;
+  void SaveUserRegistrationInfo(const std::string& display_name,
+                                const std::string& image_url) override;
+  bool IsUserRegistrationInfoSaved() override;
+
+  void SetHaveSharedCredentialsChanged(bool have_credentials_changed);
+  void SetDeviceId(std::string device_id);
+  void SetDeviceMetadata(::nearby::internal::Metadata metadata);
+  void SetAccountName(std::string account_name);
+  void SetIsUserRegistrationInfoSaved(bool is_user_registration_info_saved);
+
+ private:
+  // LocalDeviceDataProvider:
+  void UpdatePersistedSharedCredentials(
+      const std::vector<::nearby::internal::SharedCredential>&
+          shared_credentials) override;
+
+  bool have_credentials_changed_ = false;
+  bool is_user_registration_info_saved_ = false;
+  std::string device_id_;
+  ::nearby::internal::Metadata metadata_;
+  std::string account_name_;
+};
+
+}  // namespace ash::nearby::presence
+
+#endif  // CHROMEOS_ASH_COMPONENTS_NEARBY_PRESENCE_CREDENTIALS_FAKE_LOCAL_DEVICE_DATA_PROVIDER_H_

chromeos/ash/components/nearby/presence/credentials/local_device_data_provider.h

diff --git a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider.h b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider.h
index 1bbd7a65..7d4ede0 100644
--- a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider.h
+++ b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider.h
@@ -47,6 +47,10 @@
   // to Prefs to be accessed during Metadata construction
   virtual void SaveUserRegistrationInfo(const std::string& display_name,
                                         const std::string& image_url) = 0;
+
+  // Checks if the first time registration information returned from the
+  // server is persisted to prefs.
+  virtual bool IsUserRegistrationInfoSaved() = 0;
 };
 
 }  // namespace ash::nearby::presence

chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.cc

diff --git a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.cc b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.cc
index 0623700..307eb6d 100644
--- a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.cc
+++ b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.cc
@@ -147,6 +147,23 @@
 
 void LocalDeviceDataProviderImpl::SaveUserRegistrationInfo(
     const std::string& display_name,
-    const std::string& image_url) {}
+    const std::string& image_url) {
+  pref_service_->SetString(prefs::kNearbyPresenceUserNamePrefName,
+                           display_name);
+  pref_service_->SetString(prefs::kNearbyPresenceProfileUrlPrefName, image_url);
+}
+
+bool LocalDeviceDataProviderImpl::IsUserRegistrationInfoSaved() {
+  // The user name pref and image url are set during first time registration
+  // flow with the server. If they are not set, that means that the first time
+  // registration flow (and therefore Nearby Presence initialization) has not
+  // occurred. These fields are both set in the same step via
+  // |SaveUserRegistrationInfo|.
+  std::string user_name =
+      pref_service_->GetString(prefs::kNearbyPresenceUserNamePrefName);
+  std::string image_url =
+      pref_service_->GetString(prefs::kNearbyPresenceProfileUrlPrefName);
+  return (!user_name.empty() && !image_url.empty());
+}
 
 }  // namespace ash::nearby::presence

chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.h

diff --git a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.h b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.h
index 7f57387..a868799 100644
--- a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.h
+++ b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl.h
@@ -39,6 +39,7 @@
   std::string GetAccountName() override;
   void SaveUserRegistrationInfo(const std::string& display_name,
                                 const std::string& image_url) override;
+  bool IsUserRegistrationInfoSaved() override;
 
  private:
   // Creates a device name of the form "<given name>'s <device type>."
@@ -46,7 +47,7 @@
   // just the device type.
   std::string GetDeviceName() const;
 
-  PrefService* pref_service_ = nullptr;
+  const raw_ptr<PrefService> pref_service_;
   const raw_ptr<signin::IdentityManager> identity_manager_;
 };
 

chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl_unittest.cc

diff --git a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl_unittest.cc b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl_unittest.cc
index 43b46bd..bdcf754 100644
--- a/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl_unittest.cc
+++ b/chromeos/ash/components/nearby/presence/credentials/local_device_data_provider_impl_unittest.cc
@@ -86,13 +86,20 @@
             local_device_data_provider_->GetAccountName());
 }
 
+TEST_F(LocalDeviceDataProviderImplTest, SaveUserRegistrationInfo) {
+  CreateDataProvider();
+
+  // Simulate first time registration has occurred.
+  local_device_data_provider_->SaveUserRegistrationInfo(kUserName, kProfileUrl);
+
+  EXPECT_TRUE(local_device_data_provider_->IsUserRegistrationInfoSaved());
+}
+
 TEST_F(LocalDeviceDataProviderImplTest, Metadata) {
   CreateDataProvider();
 
-  // Assume that first time registration has already occurred.
-  pref_service_.SetString(prefs::kNearbyPresenceUserNamePrefName, kUserName);
-  pref_service_.SetString(prefs::kNearbyPresenceProfileUrlPrefName,
-                          kProfileUrl);
+  // Simulate first time registration has occurred.
+  local_device_data_provider_->SaveUserRegistrationInfo(kUserName, kProfileUrl);
 
   // Assume that without the given name, the device name is just the
   // device type.

chromeos/components/cdm_factory_daemon/chromeos_cdm_factory.cc

diff --git a/chromeos/components/cdm_factory_daemon/chromeos_cdm_factory.cc b/chromeos/components/cdm_factory_daemon/chromeos_cdm_factory.cc
index c0a9556..9f49bc0 100644
--- a/chromeos/components/cdm_factory_daemon/chromeos_cdm_factory.cc
+++ b/chromeos/components/cdm_factory_daemon/chromeos_cdm_factory.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/no_destructor.h"
 #include "base/notreached.h"
+#include "base/task/bind_post_task.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/unguessable_token.h"
@@ -75,14 +76,6 @@
   GetBrowserCdmFactoryRemote()->CreateFactory(key_system, std::move(callback));
 }
 
-void CreateFactoryCallback(
-    scoped_refptr<base::SingleThreadTaskRunner> runner,
-    cdm::mojom::BrowserCdmFactory::CreateFactoryCallback callback,
-    mojo::PendingRemote<cdm::mojom::CdmFactory> remote_factory) {
-  runner->PostTask(FROM_HERE, base::BindOnce(std::move(callback),
-                                             std::move(remote_factory)));
-}
-
 void GetOutputProtectionOnTaskRunner(
     mojo::PendingReceiver<cdm::mojom::OutputProtection> output_protection) {
   GetBrowserCdmFactoryRemote()->GetOutputProtection(
@@ -265,14 +258,11 @@
         FROM_HERE,
         base::BindOnce(
             &CreateFactoryOnTaskRunner, cdm_config.key_system,
-            base::BindOnce(
-                &CreateFactoryCallback,
-                base::SingleThreadTaskRunner::GetCurrentDefault(),
-                base::BindOnce(
-                    &ChromeOsCdmFactory::OnCreateFactory,
-                    weak_factory_.GetWeakPtr(), cdm_config, session_message_cb,
-                    session_closed_cb, session_keys_change_cb,
-                    session_expiration_update_cb, std::move(cdm_created_cb)))));
+            base::BindPostTaskToCurrentDefault(base::BindOnce(
+                &ChromeOsCdmFactory::OnCreateFactory,
+                weak_factory_.GetWeakPtr(), cdm_config, session_message_cb,
+                session_closed_cb, session_keys_change_cb,
+                session_expiration_update_cb, std::move(cdm_created_cb)))));
     return;
   }
 

chromeos/crosapi/mojom/crosapi.mojom

diff --git a/chromeos/crosapi/mojom/crosapi.mojom b/chromeos/crosapi/mojom/crosapi.mojom
index 80f87a2..017bd60 100644
--- a/chromeos/crosapi/mojom/crosapi.mojom
+++ b/chromeos/crosapi/mojom/crosapi.mojom
@@ -951,8 +951,8 @@
 // parameters here. If a new parameter is added and its value is only known
 // after the user has logged in, please update BrowserPostLoginParams as well.
 //
-// Next version: 59
-// Next id: 59
+// Next version: 60
+// Next id: 60
 [Stable, RenamedFrom="crosapi.mojom.LacrosInitParams"]
 struct BrowserInitParams {
   // This is ash-chrome's version of the Crosapi interface. This is used by
@@ -1324,6 +1324,10 @@
   // regardless of this flag.
   [MinVersion=58]
   bool enable_cpu_mappable_native_gpu_memory_buffers@58;
+
+  // When this flag is set to true, OOP video decoding is available.
+  [MinVersion=59]
+  bool oop_video_decoding_enabled@59;
 };
 
 // BrowserPostLoginParams is the subset of parameters in BrowserInitParams

chromeos/startup/browser_params_proxy.cc

diff --git a/chromeos/startup/browser_params_proxy.cc b/chromeos/startup/browser_params_proxy.cc
index 6d3e9237..40ed0b4 100644
--- a/chromeos/startup/browser_params_proxy.cc
+++ b/chromeos/startup/browser_params_proxy.cc
@@ -290,4 +290,8 @@
       ->enable_cpu_mappable_native_gpu_memory_buffers;
 }
 
+bool BrowserParamsProxy::OopVideoDecodingEnabled() const {
+  return BrowserInitParams::Get()->oop_video_decoding_enabled;
+}
+
 }  // namespace chromeos

chromeos/startup/browser_params_proxy.h

diff --git a/chromeos/startup/browser_params_proxy.h b/chromeos/startup/browser_params_proxy.h
index a703ccf5..f819535 100644
--- a/chromeos/startup/browser_params_proxy.h
+++ b/chromeos/startup/browser_params_proxy.h
@@ -130,6 +130,8 @@
 
   bool EnableCpuMappableNativeGpuMemoryBuffers() const;
 
+  bool OopVideoDecodingEnabled() const;
+
  private:
   friend base::NoDestructor<BrowserParamsProxy>;
 

components/attribution_reporting/BUILD.gn

diff --git a/components/attribution_reporting/BUILD.gn b/components/attribution_reporting/BUILD.gn
index 19ed776..2c1ce9c 100644
--- a/components/attribution_reporting/BUILD.gn
+++ b/components/attribution_reporting/BUILD.gn
@@ -8,7 +8,6 @@
 mojom("mojom") {
   sources = [
     "eligibility_error.mojom",
-    "os_support.mojom",
     "registration_type.mojom",
     "source_registration_error.mojom",
     "trigger_registration_error.mojom",

components/attribution_reporting/os_registration.cc

diff --git a/components/attribution_reporting/os_registration.cc b/components/attribution_reporting/os_registration.cc
index b3c7172..c83916c 100644
--- a/components/attribution_reporting/os_registration.cc
+++ b/components/attribution_reporting/os_registration.cc
@@ -5,7 +5,6 @@
 #include "components/attribution_reporting/os_registration.h"
 
 #include "base/strings/string_piece.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "net/http/structured_headers.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"
@@ -30,13 +29,4 @@
   return GURL(item.item.GetString());
 }
 
-base::StringPiece GetSupportHeader(mojom::OsSupport os_support) {
-  switch (os_support) {
-    case mojom::OsSupport::kDisabled:
-      return "web";
-    case mojom::OsSupport::kEnabled:
-      return "web, os";
-  }
-}
-
 }  // namespace attribution_reporting

components/attribution_reporting/os_registration.h

diff --git a/components/attribution_reporting/os_registration.h b/components/attribution_reporting/os_registration.h
index 90b384f..c71c9d7d 100644
--- a/components/attribution_reporting/os_registration.h
+++ b/components/attribution_reporting/os_registration.h
@@ -7,7 +7,6 @@
 
 #include "base/component_export.h"
 #include "base/strings/string_piece_forward.h"
-#include "components/attribution_reporting/os_support.mojom-forward.h"
 #include "net/http/structured_headers.h"
 
 class GURL;
@@ -33,9 +32,6 @@
 GURL ParseOsSourceOrTriggerHeader(
     const net::structured_headers::ParameterizedItem&);
 
-COMPONENT_EXPORT(ATTRIBUTION_REPORTING)
-base::StringPiece GetSupportHeader(mojom::OsSupport);
-
 }  // namespace attribution_reporting
 
 #endif  // COMPONENTS_ATTRIBUTION_REPORTING_OS_REGISTRATION_H_

components/attribution_reporting/os_registration_unittest.cc

diff --git a/components/attribution_reporting/os_registration_unittest.cc b/components/attribution_reporting/os_registration_unittest.cc
index d0878a6..763dddb 100644
--- a/components/attribution_reporting/os_registration_unittest.cc
+++ b/components/attribution_reporting/os_registration_unittest.cc
@@ -5,7 +5,6 @@
 #include "components/attribution_reporting/os_registration.h"
 
 #include "base/strings/string_piece.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
@@ -52,19 +51,5 @@
   }
 }
 
-TEST(OsSupport, GetSupportHeader) {
-  const struct {
-    mojom::OsSupport os_support;
-    const char* expected;
-  } kTestCases[] = {
-      {mojom::OsSupport::kDisabled, "web"},
-      {mojom::OsSupport::kEnabled, "web, os"},
-  };
-
-  for (const auto& test_case : kTestCases) {
-    EXPECT_EQ(GetSupportHeader(test_case.os_support), test_case.expected);
-  }
-}
-
 }  // namespace
 }  // namespace attribution_reporting

components/attribution_reporting/os_support.mojom

diff --git a/components/attribution_reporting/os_support.mojom b/components/attribution_reporting/os_support.mojom
deleted file mode 100644
index 5b1b1ab8..0000000
--- a/components/attribution_reporting/os_support.mojom
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2022 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module attribution_reporting.mojom;
-
-// Indicates whether OS-level attribution is enabled.
-// See https://github.com/WICG/attribution-reporting-api/blob/main/app_to_web.md.
-enum OsSupport {
-  kDisabled,
-  kEnabled,
-};

components/autofill/core/browser/manual_testing_profile_import.cc

diff --git a/components/autofill/core/browser/manual_testing_profile_import.cc b/components/autofill/core/browser/manual_testing_profile_import.cc
index b5de234..3737fd1 100644
--- a/components/autofill/core/browser/manual_testing_profile_import.cc
+++ b/components/autofill/core/browser/manual_testing_profile_import.cc
@@ -87,7 +87,9 @@
 // Given a `dict` of "field-type" : "value" mappings, constructs an
 // AutofillProfile where each "field-type"  is set to the provided "value".
 // "field-type"s are converted to ServerFieldTypes using the `lookup_table`.
-// All verification statuses are set to `kUserVerified`.
+// All verification statuses are set to `kObserved`. Setting them to
+// `kUserVerified` is problematic, since the data model expects that only root
+// level (= setting-visible) nodes are user verified.
 // If a field type cannot be mapped, or if the resulting profile is not
 // `IsFullyStructuredProfile()`, absl::nullopt is returned.
 absl::optional<AutofillProfile> MakeProfile(
@@ -119,7 +121,7 @@
     }
     profile.SetRawInfoWithVerificationStatus(
         lookup_table.at(key), base::UTF8ToUTF16(value.GetString()),
-        VerificationStatus::kUserVerified);
+        VerificationStatus::kObserved);
   }
   if (!IsFullyStructuredProfile(profile)) {
     LOG(ERROR) << "Some profile is not fully structured.";

components/autofill/core/browser/manual_testing_profile_import_unittest.cc

diff --git a/components/autofill/core/browser/manual_testing_profile_import_unittest.cc b/components/autofill/core/browser/manual_testing_profile_import_unittest.cc
index e0908ab..94e7a9f 100644
--- a/components/autofill/core/browser/manual_testing_profile_import_unittest.cc
+++ b/components/autofill/core/browser/manual_testing_profile_import_unittest.cc
@@ -63,21 +63,21 @@
 
   AutofillProfile expected_profile1(AutofillProfile::Source::kLocalOrSyncable);
   expected_profile1.SetRawInfoWithVerificationStatus(
-      NAME_FULL, u"first last", VerificationStatus::kUserVerified);
+      NAME_FULL, u"first last", VerificationStatus::kObserved);
   expected_profile1.SetRawInfoWithVerificationStatus(
-      NAME_FIRST, u"first", VerificationStatus::kUserVerified);
+      NAME_FIRST, u"first", VerificationStatus::kObserved);
   expected_profile1.SetRawInfoWithVerificationStatus(
-      NAME_LAST, u"last", VerificationStatus::kUserVerified);
+      NAME_LAST, u"last", VerificationStatus::kObserved);
 
   AutofillProfile expected_profile2(AutofillProfile::Source::kAccount);
   expected_profile2.set_initial_creator_id(999);
   expected_profile2.SetRawInfoWithVerificationStatus(
       ADDRESS_HOME_STREET_ADDRESS, u"street 123",
-      VerificationStatus::kUserVerified);
+      VerificationStatus::kObserved);
   expected_profile2.SetRawInfoWithVerificationStatus(
-      ADDRESS_HOME_STREET_NAME, u"street", VerificationStatus::kUserVerified);
+      ADDRESS_HOME_STREET_NAME, u"street", VerificationStatus::kObserved);
   expected_profile2.SetRawInfoWithVerificationStatus(
-      ADDRESS_HOME_HOUSE_NUMBER, u"123", VerificationStatus::kUserVerified);
+      ADDRESS_HOME_HOUSE_NUMBER, u"123", VerificationStatus::kObserved);
 
   EXPECT_THAT(
       LoadProfilesFromFile(file_path),

components/global_media_controls/BUILD.gn

diff --git a/components/global_media_controls/BUILD.gn b/components/global_media_controls/BUILD.gn
index 85ac559..b05d0081 100644
--- a/components/global_media_controls/BUILD.gn
+++ b/components/global_media_controls/BUILD.gn
@@ -34,6 +34,10 @@
     "//ui/message_center/public/cpp",
   ]
 
+  if (is_chromeos) {
+    deps += [ "//chromeos/constants:constants" ]
+  }
+
   public_deps = [
     "//components/media_message_center",
     "//services/media_session/public/cpp",

components/global_media_controls/DEPS

diff --git a/components/global_media_controls/DEPS b/components/global_media_controls/DEPS
index c185628b..2cec8b0 100644
--- a/components/global_media_controls/DEPS
+++ b/components/global_media_controls/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+chromeos/constants",
   "+components/media_message_center",
   "+components/strings",
   "+components/vector_icons",

components/global_media_controls/public/views/media_item_ui_view.cc

diff --git a/components/global_media_controls/public/views/media_item_ui_view.cc b/components/global_media_controls/public/views/media_item_ui_view.cc
index ddfeb6ed..be8d843 100644
--- a/components/global_media_controls/public/views/media_item_ui_view.cc
+++ b/components/global_media_controls/public/views/media_item_ui_view.cc
@@ -35,6 +35,10 @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
+#if BUILDFLAG(IS_CHROMEOS)
+#include "chromeos/constants/chromeos_features.h"
+#endif
+
 namespace global_media_controls {
 
 namespace {
@@ -84,12 +88,13 @@
     base::WeakPtr<media_message_center::MediaNotificationItem> item,
     std::unique_ptr<MediaItemUIFooter> footer_view,
     std::unique_ptr<MediaItemUIDeviceSelector> device_selector_view,
-    absl::optional<media_message_center::NotificationTheme> theme,
+    absl::optional<media_message_center::NotificationTheme> notification_theme,
+    absl::optional<media_message_center::MediaColorTheme> media_color_theme,
     absl::optional<media_message_center::MediaDisplayPage> media_display_page)
     : views::Button(base::BindRepeating(&MediaItemUIView::ContainerClicked,
                                         base::Unretained(this))),
       id_(id),
-      is_cros_(theme.has_value()) {
+      has_notification_theme_(notification_theme.has_value()) {
   DCHECK(item);
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical));
@@ -100,11 +105,12 @@
       l10n_util::GetStringUTF16(IDS_GLOBAL_MEDIA_CONTROLS_BACK_TO_TAB));
 
 #if BUILDFLAG(IS_CHROMEOS)
-  // The updated UI requires notification theme to be set while the toolbar
+  // The updated UI requires media color theme to be set while the toolbar
   // media button does not provide it, so we need to verify the source display
   // page is from the quick settings.
   bool use_cros_updated_ui =
       base::FeatureList::IsEnabled(media::kGlobalMediaControlsCrOSUpdatedUI) &&
+      chromeos::features::IsJellyrollEnabled() &&
       media_display_page.has_value();
 #else
   bool use_cros_updated_ui = false;
@@ -122,12 +128,13 @@
 
   std::unique_ptr<media_message_center::MediaNotificationView> view;
   if (use_cros_updated_ui) {
-    DCHECK(theme.has_value());
+    DCHECK(media_color_theme.has_value());
     view = std::make_unique<media_message_center::MediaNotificationViewAshImpl>(
-        this, std::move(item), theme.value(), media_display_page.value());
+        this, std::move(item), media_color_theme.value(),
+        media_display_page.value());
   } else {
     gfx::Size dismiss_button_size =
-        is_cros_ ? kCrOSDismissButtonSize : kDismissButtonSize;
+        has_notification_theme_ ? kCrOSDismissButtonSize : kDismissButtonSize;
     if (base::FeatureList::IsEnabled(media::kGlobalMediaControlsModernUI)) {
       dismiss_button_size = kModernDismissButtonSize;
     }
@@ -163,12 +170,13 @@
       view = std::make_unique<
           media_message_center::MediaNotificationViewModernImpl>(
           this, std::move(item), std::move(dismiss_button_placeholder),
-          std::move(footer_view), kModernUIWidth, theme);
+          std::move(footer_view), kModernUIWidth, notification_theme);
       SetPreferredSize(kModernUISize);
     } else {
       view = std::make_unique<media_message_center::MediaNotificationViewImpl>(
           this, std::move(item), std::move(dismiss_button_placeholder),
-          std::u16string(), kWidth, /*should_show_icon=*/false, theme);
+          std::u16string(), kWidth, /*should_show_icon=*/false,
+          notification_theme);
 
       UpdateFooterView(std::move(footer_view));
       SetPreferredSize(kNormalSize);
@@ -380,8 +388,8 @@
     return;
   }
 
-  int icon_size =
-      is_cros_ ? kCrOSDismissButtonIconSize : kDismissButtonIconSize;
+  int icon_size = has_notification_theme_ ? kCrOSDismissButtonIconSize
+                                          : kDismissButtonIconSize;
   if (base::FeatureList::IsEnabled(media::kGlobalMediaControlsModernUI))
     icon_size = kModernDismissButtonIconSize;
 

components/global_media_controls/public/views/media_item_ui_view.h

diff --git a/components/global_media_controls/public/views/media_item_ui_view.h b/components/global_media_controls/public/views/media_item_ui_view.h
index c701508..0456a2f 100644
--- a/components/global_media_controls/public/views/media_item_ui_view.h
+++ b/components/global_media_controls/public/views/media_item_ui_view.h
@@ -48,12 +48,20 @@
  public:
   METADATA_HEADER(MediaItemUIView);
 
+  // MediaItemUIView is used in multiple places so some optional parameters may
+  // not be set:
+  // - Chrome OS media UI will set notification_theme for color theme.
+  // - Chrome OS Zenith 2.0 media UI will set media_color_theme for color theme
+  // and media_display_page for display page source.
+  // - Chrome browser media UI will set none of them.
   MediaItemUIView(
       const std::string& id,
       base::WeakPtr<media_message_center::MediaNotificationItem> item,
       std::unique_ptr<MediaItemUIFooter> footer_view,
       std::unique_ptr<MediaItemUIDeviceSelector> device_selector_view,
-      absl::optional<media_message_center::NotificationTheme> theme =
+      absl::optional<media_message_center::NotificationTheme>
+          notification_theme = absl::nullopt,
+      absl::optional<media_message_center::MediaColorTheme> media_color_theme =
           absl::nullopt,
       absl::optional<media_message_center::MediaDisplayPage>
           media_display_page = absl::nullopt);
@@ -186,7 +194,8 @@
   // Handles gesture events for swiping to dismiss notifications.
   std::unique_ptr<views::SlideOutController> slide_out_controller_;
 
-  const bool is_cros_;
+  // Sets to true when the notification theme is provided on Chrome OS.
+  const bool has_notification_theme_;
 };
 
 }  // namespace global_media_controls

components/media_message_center/media_notification_view_ash_impl.cc

diff --git a/components/media_message_center/media_notification_view_ash_impl.cc b/components/media_message_center/media_notification_view_ash_impl.cc
index 6ee4a1d..9f774a5 100644
--- a/components/media_message_center/media_notification_view_ash_impl.cc
+++ b/components/media_message_center/media_notification_view_ash_impl.cc
@@ -11,7 +11,6 @@
 #include "components/media_message_center/vector_icons/vector_icons.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/gfx/geometry/skia_conversions.h"
-#include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/animation/ink_drop.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
@@ -39,6 +38,7 @@
 constexpr int kMainSeparator = 12;
 constexpr int kMainRowSeparator = 8;
 constexpr int kMediaInfoSeparator = 4;
+constexpr int kChevronIconSize = 15;
 constexpr int kPlayPauseIconSize = 26;
 constexpr int kControlsIconSize = 20;
 constexpr int kBackgroundCornerRadius = 12;
@@ -47,36 +47,30 @@
 constexpr int kTitleArtistLineHeight = 20;
 
 constexpr auto kArtworkSize = gfx::Size(80, 80);
-constexpr auto kChevronIconSize = gfx::Size(15, 15);
 constexpr auto kPlayPauseButtonSize = gfx::Size(48, 48);
 constexpr auto kControlsButtonSize = gfx::Size(32, 32);
 
 class MediaButton : public views::ImageButton {
  public:
-  MediaButton(PressedCallback callback, int icon_size, gfx::Size button_size)
-      : ImageButton(callback), icon_size_(icon_size) {
-    SetHasInkDropActionOnClick(true);
+  MediaButton(PressedCallback callback,
+              int icon_size,
+              gfx::Size button_size,
+              ui::ColorId foreground_color_id,
+              ui::ColorId foreground_disabled_color_id)
+      : ImageButton(callback),
+        icon_size_(icon_size),
+        foreground_color_id_(foreground_color_id),
+        foreground_disabled_color_id_(foreground_disabled_color_id) {
+    views::ConfigureVectorImageButton(this);
     views::InstallRoundRectHighlightPathGenerator(this, gfx::Insets(),
                                                   button_size.height() / 2);
-    views::InkDrop::Get(this)->SetMode(views::InkDropHost::InkDropMode::ON);
-    views::InkDrop::Get(this)->SetBaseColor(foreground_color_);
-    SetImageHorizontalAlignment(ImageButton::ALIGN_CENTER);
-    SetImageVerticalAlignment(ImageButton::ALIGN_MIDDLE);
+    SetInstallFocusRingOnFocus(true);
     SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
     SetFlipCanvasOnPaintForRTLUI(false);
     SetPreferredSize(button_size);
-  }
-
-  void SetButtonColor(SkColor foreground_color,
-                      SkColor foreground_disabled_color) {
-    foreground_color_ = foreground_color;
-    foreground_disabled_color_ = foreground_disabled_color;
-
-    views::SetImageFromVectorIconWithColor(
+    views::SetImageFromVectorIconWithColorId(
         this, *GetVectorIconForMediaAction(GetActionFromButtonTag(*this)),
-        icon_size_, foreground_color_, foreground_disabled_color_);
-
-    SchedulePaint();
+        foreground_color_id_, foreground_disabled_color_id_, icon_size_);
   }
 
   void set_tag(int tag) {
@@ -86,15 +80,15 @@
         GetAccessibleNameForMediaAction(GetActionFromButtonTag(*this)));
     SetAccessibleName(
         GetAccessibleNameForMediaAction(GetActionFromButtonTag(*this)));
-    views::SetImageFromVectorIconWithColor(
+    views::SetImageFromVectorIconWithColorId(
         this, *GetVectorIconForMediaAction(GetActionFromButtonTag(*this)),
-        icon_size_, foreground_color_, foreground_disabled_color_);
+        foreground_color_id_, foreground_disabled_color_id_, icon_size_);
   }
 
  private:
-  SkColor foreground_color_ = gfx::kPlaceholderColor;
-  SkColor foreground_disabled_color_ = gfx::kPlaceholderColor;
-  int icon_size_;
+  const int icon_size_;
+  const ui::ColorId foreground_color_id_;
+  const ui::ColorId foreground_disabled_color_id_;
 };
 
 // If the image does not fit the square view, scale the image to fill the view
@@ -112,15 +106,15 @@
 MediaNotificationViewAshImpl::MediaNotificationViewAshImpl(
     MediaNotificationContainer* container,
     base::WeakPtr<MediaNotificationItem> item,
-    NotificationTheme theme,
+    MediaColorTheme theme,
     MediaDisplayPage media_display_page)
     : container_(container), item_(std::move(item)), theme_(theme) {
   DCHECK(container_);
   DCHECK(item_);
 
   SetBorder(views::CreateEmptyBorder(kBorderInsets));
-  SetBackground(views::CreateRoundedRectBackground(theme_.background_color,
-                                                   kBackgroundCornerRadius));
+  SetBackground(views::CreateThemedRoundedRectBackground(
+      theme_.background_color_id, kBackgroundCornerRadius));
 
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical, gfx::Insets(), kMainSeparator));
@@ -150,7 +144,7 @@
           views::style::STYLE_SECONDARY));
   source_label_->SetLineHeight(kSourceLineHeight);
   source_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  source_label_->SetEnabledColor(theme_.secondary_text_color);
+  source_label_->SetEnabledColorId(theme_.secondary_foreground_color_id);
   source_label_->SetProperty(views::kMarginsKey, kSourceLabelInsets);
 
   title_row_ =
@@ -163,18 +157,17 @@
       views::style::STYLE_PRIMARY));
   title_label_->SetLineHeight(kTitleArtistLineHeight);
   title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  title_label_->SetEnabledColor(theme_.primary_text_color);
+  title_label_->SetEnabledColorId(theme_.primary_foreground_color_id);
   title_row_->SetFlexForView(title_label_, 1);
 
   // Add a chevron right icon to the title if the media is displaying on the
   // quick settings media view to indicate user can click on the view to go to
   // the detailed view page.
   if (media_display_page == MediaDisplayPage::kQuickSettingsMediaView) {
-    chevron_icon_ =
-        title_row_->AddChildView(std::make_unique<views::ImageView>());
-    chevron_icon_->SetPreferredSize(kChevronIconSize);
-    chevron_icon_->SetImage(
-        CreateVectorIcon(kChevronRightIcon, theme_.enabled_icon_color));
+    chevron_icon_ = title_row_->AddChildView(
+        std::make_unique<views::ImageView>(ui::ImageModel::FromVectorIcon(
+            kChevronRightIcon, theme_.secondary_foreground_color_id,
+            kChevronIconSize)));
   }
 
   artist_label_ =
@@ -183,7 +176,7 @@
           views::style::STYLE_SECONDARY));
   artist_label_->SetLineHeight(kTitleArtistLineHeight);
   artist_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  artist_label_->SetEnabledColor(theme_.secondary_text_color);
+  artist_label_->SetEnabledColorId(theme_.secondary_foreground_color_id);
 
   // |play_pause_container| holds the play/pause button and dismiss button.
   auto* play_pause_container =
@@ -194,8 +187,8 @@
 
   play_pause_button_ =
       CreateMediaButton(play_pause_container, MediaSessionAction::kPlay);
-  play_pause_button_->SetBackground(views::CreateRoundedRectBackground(
-      theme_.background_color, kPlayPauseButtonSize.height() / 2));
+  play_pause_button_->SetBackground(views::CreateThemedRoundedRectBackground(
+      theme_.secondary_container_color_id, kPlayPauseButtonSize.height() / 2));
 
   // |controls_row| holds all available media action buttons and the progress
   // bar.
@@ -212,8 +205,8 @@
           base::BindRepeating(&MediaNotificationViewAshImpl::SeekTo,
                               base::Unretained(this)),
           /*is_modern_notification=*/true));
-  progress_view_->SetForegroundColor(theme_.enabled_icon_color);
-  progress_view_->SetBackgroundColor(theme_.disabled_icon_color);
+  progress_view_->SetForegroundColorId(theme_.primary_container_color_id);
+  progress_view_->SetBackgroundColorId(theme_.secondary_container_color_id);
   progress_view_->SetProperty(views::kMarginsKey, kProgressViewInsets);
   controls_row_layout->SetFlexForView(progress_view_, 1);
 
@@ -221,9 +214,6 @@
   picture_in_picture_button_ = CreateMediaButton(
       controls_row, MediaSessionAction::kEnterPictureInPicture);
 
-  container_->OnColorsChanged(theme_.enabled_icon_color,
-                              theme_.disabled_icon_color,
-                              theme_.background_color);
   item_->SetView(this);
 }
 
@@ -239,12 +229,12 @@
       action == MediaSessionAction::kPlay ? kPlayPauseIconSize
                                           : kControlsIconSize,
       action == MediaSessionAction::kPlay ? kPlayPauseButtonSize
-                                          : kControlsButtonSize);
+                                          : kControlsButtonSize,
+      theme_.primary_foreground_color_id, theme_.secondary_foreground_color_id);
   button->SetCallback(
       base::BindRepeating(&MediaNotificationViewAshImpl::ButtonPressed,
                           base::Unretained(this), button.get()));
   button->set_tag(static_cast<int>(action));
-  button->SetButtonColor(theme_.enabled_icon_color, theme_.disabled_icon_color);
 
   auto* button_ptr = parent->AddChildView(std::move(button));
   action_buttons_.push_back(button_ptr);

components/media_message_center/media_notification_view_ash_impl.h

diff --git a/components/media_message_center/media_notification_view_ash_impl.h b/components/media_message_center/media_notification_view_ash_impl.h
index 18f8f65..e2b98a9 100644
--- a/components/media_message_center/media_notification_view_ash_impl.h
+++ b/components/media_message_center/media_notification_view_ash_impl.h
@@ -45,7 +45,7 @@
 
   MediaNotificationViewAshImpl(MediaNotificationContainer* container,
                                base::WeakPtr<MediaNotificationItem> item,
-                               NotificationTheme theme,
+                               MediaColorTheme theme,
                                MediaDisplayPage media_display_page);
   MediaNotificationViewAshImpl(const MediaNotificationViewAshImpl&) = delete;
   MediaNotificationViewAshImpl& operator=(const MediaNotificationViewAshImpl&) =
@@ -103,7 +103,7 @@
   base::WeakPtr<MediaNotificationItem> item_;
 
   // The color theme for all the colors in this view.
-  NotificationTheme theme_;
+  MediaColorTheme theme_;
 
   media_session::MediaPosition position_;
 

components/media_message_center/media_notification_view_ash_impl_unittest.cc

diff --git a/components/media_message_center/media_notification_view_ash_impl_unittest.cc b/components/media_message_center/media_notification_view_ash_impl_unittest.cc
index 9eccc7a..cd9c56f 100644
--- a/components/media_message_center/media_notification_view_ash_impl_unittest.cc
+++ b/components/media_message_center/media_notification_view_ash_impl_unittest.cc
@@ -84,7 +84,7 @@
   std::unique_ptr<MediaNotificationViewAshImpl> CreateView(
       MediaDisplayPage media_display_page) {
     return std::make_unique<MediaNotificationViewAshImpl>(
-        container_.get(), item_->GetWeakPtr(), NotificationTheme(),
+        container_.get(), item_->GetWeakPtr(), MediaColorTheme(),
         media_display_page);
   }
 

components/media_message_center/notification_theme.h

diff --git a/components/media_message_center/notification_theme.h b/components/media_message_center/notification_theme.h
index 739791c..ea30062 100644
--- a/components/media_message_center/notification_theme.h
+++ b/components/media_message_center/notification_theme.h
@@ -7,6 +7,7 @@
 
 #include "base/component_export.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/color/color_id.h"
 
 namespace media_message_center {
 
@@ -19,6 +20,24 @@
   SkColor background_color = 0;
 };
 
+// Defines the color IDs for the media view.
+struct COMPONENT_EXPORT(MEDIA_MESSAGE_CENTER) MediaColorTheme {
+  // Color ID for texts and icons.
+  ui::ColorId primary_foreground_color_id = 0;
+
+  // Color ID for secondary texts.
+  ui::ColorId secondary_foreground_color_id = 0;
+
+  // Color ID for time scrubber foreground.
+  ui::ColorId primary_container_color_id = 0;
+
+  // Color ID for time scrubber background and play/pause button background.
+  ui::ColorId secondary_container_color_id = 0;
+
+  // Color ID for media view background.
+  ui::ColorId background_color_id = 0;
+};
+
 }  // namespace media_message_center
 
 #endif  // COMPONENTS_MEDIA_MESSAGE_CENTER_NOTIFICATION_THEME_H_

components/metrics/metrics_log.cc

diff --git a/components/metrics/metrics_log.cc b/components/metrics/metrics_log.cc
index da04ee1..0d95c9f 100644
--- a/components/metrics/metrics_log.cc
+++ b/components/metrics/metrics_log.cc
@@ -168,6 +168,7 @@
     case base::nix::DesktopEnvironment::DESKTOP_ENVIRONMENT_KDE3:
     case base::nix::DesktopEnvironment::DESKTOP_ENVIRONMENT_KDE4:
     case base::nix::DesktopEnvironment::DESKTOP_ENVIRONMENT_KDE5:
+    case base::nix::DesktopEnvironment::DESKTOP_ENVIRONMENT_KDE6:
       return metrics::SystemProfileProto::OS::KDE;
     case base::nix::DesktopEnvironment::DESKTOP_ENVIRONMENT_PANTHEON:
       return metrics::SystemProfileProto::OS::PANTHEON;

components/omnibox/browser/actions/history_clusters_action.cc

diff --git a/components/omnibox/browser/actions/history_clusters_action.cc b/components/omnibox/browser/actions/history_clusters_action.cc
index 171f98d..46251c7 100644
--- a/components/omnibox/browser/actions/history_clusters_action.cc
+++ b/components/omnibox/browser/actions/history_clusters_action.cc
@@ -101,9 +101,6 @@
     const history::ClusterKeywordData& matched_keyword_data,
     bool takes_over_match)
     : OmniboxAction(
-          // TODO(manukh:) this is the only use case of
-          //   IDS_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH_HINT. Remove it when
-          //   removing journey actions.
           OmniboxAction::LabelStrings(
               IDS_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH_HINT,
               IDS_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH_SUGGESTION_CONTENTS,

components/omnibox/browser/history_cluster_provider.cc

diff --git a/components/omnibox/browser/history_cluster_provider.cc b/components/omnibox/browser/history_cluster_provider.cc
index 9351a5f..bec7caf2 100644
--- a/components/omnibox/browser/history_cluster_provider.cc
+++ b/components/omnibox/browser/history_cluster_provider.cc
@@ -168,11 +168,10 @@
 
   const auto& text = search_match.contents;
 
-  const auto url_string = base::StringPrintf(
+  match.destination_url = GURL(base::UTF8ToUTF16(base::StringPrintf(
       "chrome://history/journeys?q=%s",
       base::EscapeQueryParamValue(base::UTF16ToUTF8(text), /*use_plus=*/false)
-          .c_str());
-  match.destination_url = GURL(url_string);
+          .c_str())));
 
   match.fill_into_edit = text;
 
@@ -181,8 +180,9 @@
       FindTermMatches(input_.text(), text), text.length(),
       ACMatchClassification::MATCH, ACMatchClassification::NONE);
 
-  match.contents = base::UTF8ToUTF16(url_string);
-  match.contents_class = {{0, ACMatchClassification::URL}};
+  match.contents = l10n_util::GetStringUTF16(
+      IDS_OMNIBOX_ACTION_HISTORY_CLUSTERS_SEARCH_HINT);
+  match.contents_class = {{0, ACMatchClassification::DIM}};
 
   CompleteHistoryClustersMatch(base::UTF16ToUTF8(text),
                                std::move(matched_keyword_data), &match);

components/omnibox/browser/history_cluster_provider_unittest.cc

diff --git a/components/omnibox/browser/history_cluster_provider_unittest.cc b/components/omnibox/browser/history_cluster_provider_unittest.cc
index d1eeecb2..dd451c3c 100644
--- a/components/omnibox/browser/history_cluster_provider_unittest.cc
+++ b/components/omnibox/browser/history_cluster_provider_unittest.cc
@@ -156,8 +156,7 @@
   ASSERT_EQ(provider_->matches().size(), 1u);
   EXPECT_EQ(provider_->matches()[0].relevance, 900);
   EXPECT_EQ(provider_->matches()[0].description, u"keyword");
-  EXPECT_EQ(provider_->matches()[0].contents,
-            u"chrome://history/journeys?q=keyword");
+  EXPECT_EQ(provider_->matches()[0].contents, u"Resume your journey");
   EXPECT_EQ(provider_->matches()[0].fill_into_edit, u"keyword");
   EXPECT_EQ(provider_->matches()[0].destination_url,
             GURL("chrome://history/journeys?q=keyword"));

components/os_crypt/sync/key_storage_linux.cc

diff --git a/components/os_crypt/sync/key_storage_linux.cc b/components/os_crypt/sync/key_storage_linux.cc
index ebe788b..42a59c4 100644
--- a/components/os_crypt/sync/key_storage_linux.cc
+++ b/components/os_crypt/sync/key_storage_linux.cc
@@ -56,7 +56,9 @@
   kKwalletFailed = 11,
   kKwallet5 = 12,
   kKwallet5Failed = 13,
-  kMaxValue = kKwallet5Failed,
+  kKwallet6 = 14,
+  kKwallet6Failed = 15,
+  kMaxValue = kKwallet6Failed,
 };
 
 constexpr BackendUsage SelectedBackendToMetric(
@@ -79,6 +81,8 @@
       return used ? BackendUsage::kKwallet : BackendUsage::kKwalletFailed;
     case os_crypt::SelectedLinuxBackend::KWALLET5:
       return used ? BackendUsage::kKwallet5 : BackendUsage::kKwallet5Failed;
+    case os_crypt::SelectedLinuxBackend::KWALLET6:
+      return used ? BackendUsage::kKwallet6 : BackendUsage::kKwallet6Failed;
   }
   NOTREACHED();
   return BackendUsage::kDeferFailed;
@@ -101,6 +105,8 @@
       return "KWALLET";
     case os_crypt::SelectedLinuxBackend::KWALLET5:
       return "KWALLET5";
+    case os_crypt::SelectedLinuxBackend::KWALLET6:
+      return "KWALLET6";
   }
   NOTREACHED();
   return nullptr;
@@ -193,12 +199,17 @@
 
 #if defined(USE_KWALLET)
   if (selected_backend == os_crypt::SelectedLinuxBackend::KWALLET ||
-      selected_backend == os_crypt::SelectedLinuxBackend::KWALLET5) {
+      selected_backend == os_crypt::SelectedLinuxBackend::KWALLET5 ||
+      selected_backend == os_crypt::SelectedLinuxBackend::KWALLET6) {
     DCHECK(!config.product_name.empty());
     base::nix::DesktopEnvironment used_desktop_env =
-        selected_backend == os_crypt::SelectedLinuxBackend::KWALLET
-            ? base::nix::DESKTOP_ENVIRONMENT_KDE4
-            : base::nix::DESKTOP_ENVIRONMENT_KDE5;
+        base::nix::DESKTOP_ENVIRONMENT_KDE4;
+    if (selected_backend == os_crypt::SelectedLinuxBackend::KWALLET5) {
+      used_desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE5;
+    }
+    if (selected_backend == os_crypt::SelectedLinuxBackend::KWALLET6) {
+      used_desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE6;
+    }
     key_storage = std::make_unique<KeyStorageKWallet>(used_desktop_env,
                                                       config.product_name);
     if (key_storage->WaitForInitOnTaskRunner()) {

components/os_crypt/sync/key_storage_util_linux.cc

diff --git a/components/os_crypt/sync/key_storage_util_linux.cc b/components/os_crypt/sync/key_storage_util_linux.cc
index 3773db1..c41387a 100644
--- a/components/os_crypt/sync/key_storage_util_linux.cc
+++ b/components/os_crypt/sync/key_storage_util_linux.cc
@@ -58,6 +58,8 @@
       return SelectedLinuxBackend::KWALLET;
     case base::nix::DESKTOP_ENVIRONMENT_KDE5:
       return SelectedLinuxBackend::KWALLET5;
+    case base::nix::DESKTOP_ENVIRONMENT_KDE6:
+      return SelectedLinuxBackend::KWALLET6;
     case base::nix::DESKTOP_ENVIRONMENT_CINNAMON:
     case base::nix::DESKTOP_ENVIRONMENT_DEEPIN:
     case base::nix::DESKTOP_ENVIRONMENT_GNOME:

components/os_crypt/sync/key_storage_util_linux.h

diff --git a/components/os_crypt/sync/key_storage_util_linux.h b/components/os_crypt/sync/key_storage_util_linux.h
index 3fc963f..c0ad72c 100644
--- a/components/os_crypt/sync/key_storage_util_linux.h
+++ b/components/os_crypt/sync/key_storage_util_linux.h
@@ -25,6 +25,7 @@
   GNOME_LIBSECRET,
   KWALLET,
   KWALLET5,
+  KWALLET6,
 };
 
 // Decide which backend to target. |type| is checked first. If it does not

components/os_crypt/sync/kwallet_dbus.cc

diff --git a/components/os_crypt/sync/kwallet_dbus.cc b/components/os_crypt/sync/kwallet_dbus.cc
index 7f90edd9..4ab1eed 100644
--- a/components/os_crypt/sync/kwallet_dbus.cc
+++ b/components/os_crypt/sync/kwallet_dbus.cc
@@ -17,10 +17,13 @@
 // DBus service, path, and interface names for klauncher and kwalletd.
 const char kKWalletDName[] = "kwalletd";
 const char kKWalletD5Name[] = "kwalletd5";
+const char kKWalletD6Name[] = "kwalletd6";
 const char kKWalletServiceName[] = "org.kde.kwalletd";
 const char kKWallet5ServiceName[] = "org.kde.kwalletd5";
+const char kKWallet6ServiceName[] = "org.kde.kwalletd6";
 const char kKWalletPath[] = "/modules/kwalletd";
 const char kKWallet5Path[] = "/modules/kwalletd5";
+const char kKWallet6Path[] = "/modules/kwalletd6";
 const char kKWalletInterface[] = "org.kde.KWallet";
 const char kKLauncherServiceName[] = "org.kde.klauncher";
 const char kKLauncherPath[] = "/KLauncher";
@@ -30,7 +33,11 @@
 
 KWalletDBus::KWalletDBus(base::nix::DesktopEnvironment desktop_env)
     : session_bus_(nullptr), kwallet_proxy_(nullptr) {
-  if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE5) {
+  if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE6) {
+    dbus_service_name_ = kKWallet6ServiceName;
+    dbus_path_ = kKWallet6Path;
+    kwalletd_name_ = kKWalletD6Name;
+  } else if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE5) {
     dbus_service_name_ = kKWallet5ServiceName;
     dbus_path_ = kKWallet5Path;
     kwalletd_name_ = kKWalletD5Name;

components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc

diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc
index 0be0b2d2..0aa2b5f 100644
--- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc
+++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.cc
@@ -249,32 +249,10 @@
 const char kHistogramFirstEligibleToPaintToFirstPaint[] =
     "PageLoad.Experimental.PaintTiming.FirstEligibleToPaintToFirstPaint";
 
-const char kHistogramPageLoadTotalBytes[] =
-    "PageLoad.Experimental.Bytes.Total2";
-const char kHistogramPageLoadNetworkBytes[] =
-    "PageLoad.Experimental.Bytes.Network";
-const char kHistogramPageLoadNetworkBytesIncludingHeaders[] =
-    "PageLoad.Experimental.Bytes.NetworkIncludingHeaders";
-
 const char kHistogramPageLoadCpuTotalUsage[] = "PageLoad.Cpu.TotalUsage";
 const char kHistogramPageLoadCpuTotalUsageForegrounded[] =
     "PageLoad.Cpu.TotalUsageForegrounded";
 
-const char kHistogramLoadTypeTotalBytesForwardBack[] =
-    "PageLoad.Experimental.Bytes.Total2.LoadType.ForwardBackNavigation";
-const char kHistogramLoadTypeNetworkBytesForwardBack[] =
-    "PageLoad.Experimental.Bytes.Network.LoadType.ForwardBackNavigation";
-
-const char kHistogramLoadTypeTotalBytesReload[] =
-    "PageLoad.Experimental.Bytes.Total2.LoadType.Reload";
-const char kHistogramLoadTypeNetworkBytesReload[] =
-    "PageLoad.Experimental.Bytes.Network.LoadType.Reload";
-
-const char kHistogramLoadTypeTotalBytesNewNavigation[] =
-    "PageLoad.Experimental.Bytes.Total2.LoadType.NewNavigation";
-const char kHistogramLoadTypeNetworkBytesNewNavigation[] =
-    "PageLoad.Experimental.Bytes.Network.LoadType.NewNavigation";
-
 const char kHistogramInputToNavigation[] =
     "PageLoad.Experimental.InputTiming.InputToNavigationStart";
 const char kBackgroundHistogramInputToNavigation[] =
@@ -1100,38 +1078,6 @@
     const page_load_metrics::mojom::PageLoadTiming& timing) {
   DCHECK_GE(network_bytes_, 0);
   DCHECK_GE(cache_bytes_, 0);
-  int64_t total_bytes = network_bytes_ + cache_bytes_;
-
-  PAGE_BYTES_HISTOGRAM(internal::kHistogramPageLoadNetworkBytes,
-                       network_bytes_);
-  PAGE_BYTES_HISTOGRAM(internal::kHistogramPageLoadTotalBytes, total_bytes);
-  PAGE_BYTES_HISTOGRAM(internal::kHistogramPageLoadNetworkBytesIncludingHeaders,
-                       network_bytes_including_headers_);
-
-  switch (GetPageLoadType(transition_)) {
-    case LOAD_TYPE_RELOAD:
-      PAGE_BYTES_HISTOGRAM(internal::kHistogramLoadTypeNetworkBytesReload,
-                           network_bytes_);
-      PAGE_BYTES_HISTOGRAM(internal::kHistogramLoadTypeTotalBytesReload,
-                           total_bytes);
-      break;
-    case LOAD_TYPE_FORWARD_BACK:
-      PAGE_BYTES_HISTOGRAM(internal::kHistogramLoadTypeNetworkBytesForwardBack,
-                           network_bytes_);
-      PAGE_BYTES_HISTOGRAM(internal::kHistogramLoadTypeTotalBytesForwardBack,
-                           total_bytes);
-      break;
-    case LOAD_TYPE_NEW_NAVIGATION:
-      PAGE_BYTES_HISTOGRAM(
-          internal::kHistogramLoadTypeNetworkBytesNewNavigation,
-          network_bytes_);
-      PAGE_BYTES_HISTOGRAM(internal::kHistogramLoadTypeTotalBytesNewNavigation,
-                           total_bytes);
-      break;
-    case LOAD_TYPE_NONE:
-      NOTREACHED();
-      break;
-  }
   click_tracker_.RecordClickBurst(GetDelegate().GetPageUkmSourceId());
 }
 

components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h

diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h
index 32dc049..3543e0b3 100644
--- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h
+++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h
@@ -71,22 +71,9 @@
 extern const char kHistogramFirstEligibleToPaint[];
 extern const char kHistogramFirstEligibleToPaintToFirstPaint[];
 
-extern const char kHistogramPageLoadTotalBytes[];
-extern const char kHistogramPageLoadNetworkBytes[];
-extern const char kHistogramPageLoadNetworkBytesIncludingHeaders[];
-
 extern const char kHistogramPageLoadCpuTotalUsage[];
 extern const char kHistogramPageLoadCpuTotalUsageForegrounded[];
 
-extern const char kHistogramLoadTypeTotalBytesForwardBack[];
-extern const char kHistogramLoadTypeNetworkBytesForwardBack[];
-
-extern const char kHistogramLoadTypeTotalBytesReload[];
-extern const char kHistogramLoadTypeNetworkBytesReload[];
-
-extern const char kHistogramLoadTypeTotalBytesNewNavigation[];
-extern const char kHistogramLoadTypeNetworkBytesNewNavigation[];
-
 extern const char kHistogramInputToNavigation[];
 extern const char kBackgroundHistogramInputToNavigation[];
 extern const char kHistogramInputToNavigationLinkClick[];

components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc

diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc
index 7958c65..9e934a0 100644
--- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc
+++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc
@@ -444,17 +444,6 @@
   auto resources =
       GetSampleResourceDataUpdateForTesting(10 * 1024 /* resource_size */);
   tester()->SimulateResourceDataUseUpdate(resources);
-  int64_t network_bytes = 0;
-  int64_t cache_bytes = 0;
-  for (const auto& resource : resources) {
-    if (resource->is_complete) {
-      if (resource->cache_type ==
-          page_load_metrics::mojom::CacheType::kNotCached)
-        network_bytes += resource->encoded_body_length;
-      else
-        cache_bytes += resource->encoded_body_length;
-    }
-  }
 
   tester()->NavigateToUntrackedUrl();
 
@@ -476,18 +465,6 @@
       internal::kHistogramLoadTypeParseStartForwardBack, 0);
   tester()->histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartNewNavigation, 0);
-
-  tester()->histogram_tester().ExpectUniqueSample(
-      internal::kHistogramLoadTypeNetworkBytesReload,
-      static_cast<int>((network_bytes) / 1024), 1);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeNetworkBytesNewNavigation, 0);
-
-  tester()->histogram_tester().ExpectUniqueSample(
-      internal::kHistogramLoadTypeTotalBytesReload,
-      static_cast<int>((network_bytes + cache_bytes) / 1024), 1);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeTotalBytesNewNavigation, 0);
 }
 
 TEST_P(UmaPageLoadMetricsObserverTest, ForwardBack) {
@@ -532,16 +509,6 @@
       timing.parse_timing->parse_start.value().InMilliseconds(), 1);
   tester()->histogram_tester().ExpectTotalCount(
       internal::kHistogramLoadTypeParseStartNewNavigation, 0);
-
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeNetworkBytesNewNavigation, 0);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeNetworkBytesReload, 0);
-
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeTotalBytesNewNavigation, 0);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeTotalBytesReload, 0);
 }
 
 TEST_P(UmaPageLoadMetricsObserverTest, NavigationTiming) {
@@ -591,17 +558,6 @@
   auto resources =
       GetSampleResourceDataUpdateForTesting(10 * 1024 /* resource_size */);
   tester()->SimulateResourceDataUseUpdate(resources);
-  int64_t network_bytes = 0;
-  int64_t cache_bytes = 0;
-  for (const auto& resource : resources) {
-    if (resource->is_complete) {
-      if (resource->cache_type ==
-          page_load_metrics::mojom::CacheType::kNotCached)
-        network_bytes += resource->encoded_body_length;
-      else
-        cache_bytes += resource->encoded_body_length;
-    }
-  }
 
   tester()->NavigateToUntrackedUrl();
 
@@ -623,29 +579,11 @@
   tester()->histogram_tester().ExpectBucketCount(
       internal::kHistogramLoadTypeParseStartNewNavigation,
       timing.parse_timing->parse_start.value().InMilliseconds(), 1);
-
-  tester()->histogram_tester().ExpectUniqueSample(
-      internal::kHistogramLoadTypeNetworkBytesNewNavigation,
-      static_cast<int>((network_bytes) / 1024), 1);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeNetworkBytesReload, 0);
-
-  tester()->histogram_tester().ExpectUniqueSample(
-      internal::kHistogramLoadTypeTotalBytesNewNavigation,
-      static_cast<int>((network_bytes + cache_bytes) / 1024), 1);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramLoadTypeTotalBytesReload, 0);
 }
 
 TEST_P(UmaPageLoadMetricsObserverTest, BytesAndResourcesCounted) {
   NavigateAndCommit(GURL(kDefaultTestUrl));
   NavigateAndCommit(GURL(kDefaultTestUrl2));
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramPageLoadTotalBytes, 1);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramPageLoadNetworkBytes, 1);
-  tester()->histogram_tester().ExpectTotalCount(
-      internal::kHistogramPageLoadNetworkBytesIncludingHeaders, 1);
 }
 
 TEST_P(UmaPageLoadMetricsObserverTest, CpuUsageCounted) {

components/policy/resources/templates/policy_definitions/Miscellaneous/CECPQ2Enabled.yaml

diff --git a/components/policy/resources/templates/policy_definitions/Miscellaneous/CECPQ2Enabled.yaml b/components/policy/resources/templates/policy_definitions/Miscellaneous/CECPQ2Enabled.yaml
index 2f12cfe..590523f 100644
--- a/components/policy/resources/templates/policy_definitions/Miscellaneous/CECPQ2Enabled.yaml
+++ b/components/policy/resources/templates/policy_definitions/Miscellaneous/CECPQ2Enabled.yaml
@@ -2,7 +2,7 @@
 deprecated: true
 default: true
 desc: |-
-  This policy was removed in M114. It served to disabled CECPQ2, but CECPQ2 was disabled by default and will be replaced by NIST's chosen post-quantum KEM, Kyber, again coupled with our standard classical key-agreement, X25519.
+  This policy was removed in M114. It served to disable CECPQ2, but CECPQ2 has been disabled by default. A separate policy will be introduced to control the rollout of the replacement of CECPQ2. That replacement will be a combination of the standard key-agreement X25519 with NIST's chosen post-quantum KEM, called "Kyber".
 
   If this policy is not configured, or is set to enabled, then <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will follow the default rollout process for CECPQ2, a post-quantum key-agreement algorithm in TLS.
 

components/policy/resources/templates/policy_definitions/Miscellaneous/DeveloperToolsAvailability.yaml

diff --git a/components/policy/resources/templates/policy_definitions/Miscellaneous/DeveloperToolsAvailability.yaml b/components/policy/resources/templates/policy_definitions/Miscellaneous/DeveloperToolsAvailability.yaml
index 87f5900..70c65a7 100644
--- a/components/policy/resources/templates/policy_definitions/Miscellaneous/DeveloperToolsAvailability.yaml
+++ b/components/policy/resources/templates/policy_definitions/Miscellaneous/DeveloperToolsAvailability.yaml
@@ -5,7 +5,7 @@
   app.
 caption: Control where Developer Tools can be used
 desc: |-
-  Setting the policy to 0 (the default) means you can access the developer tools and the JavaScript console, but not in the context of extensions installed by enterprise policy or component extensions with the <ph name="MANAGEMENT_PERMISSION_NAME">management</ph> permission. Setting the policy to 1 means you can access the developer tools and the JavaScript console in all contexts, including that of extensions installed by enterprise policy. Setting the policy to 2 means you can't access developer tools, and you can't inspect website elements.
+  Setting the policy to 0 (the default) means you can access the developer tools and the JavaScript console, but not in the context of extensions installed by enterprise policy or (since M114) component extensions with the <ph name="MANAGEMENT_PERMISSION_NAME">management</ph> permission. Setting the policy to 1 means you can access the developer tools and the JavaScript console in all contexts, including that of extensions installed by enterprise policy. Setting the policy to 2 means you can't access developer tools, and you can't inspect website elements.
 
         This setting also turns off keyboard shortcuts and menu or context menu entries to open developer tools or the JavaScript console.
 
@@ -18,10 +18,10 @@
 - fuchsia
 items:
 - caption: Disallow usage of the Developer Tools on apps and extensions
-    installed by enterprise policy or component extensions with the
+    installed by enterprise policy or (since M114) component extensions with the
     <ph name="MANAGEMENT_PERMISSION_NAME">management</ph> permission, allow
     usage of the Developer Tools in other contexts
-  name: DeveloperToolsDisallowedForForceInstalledExtensions
+  name: DeveloperToolsDisallowedForSensitiveExtensions
   value: 0
 - caption: Allow usage of the Developer Tools
   name: DeveloperToolsAllowed

components/privacy_sandbox/mock_privacy_sandbox_settings.h

diff --git a/components/privacy_sandbox/mock_privacy_sandbox_settings.h b/components/privacy_sandbox/mock_privacy_sandbox_settings.h
index 579ba5b2..549d73b4 100644
--- a/components/privacy_sandbox/mock_privacy_sandbox_settings.h
+++ b/components/privacy_sandbox/mock_privacy_sandbox_settings.h
@@ -75,6 +75,7 @@
   MOCK_METHOD(void, SetTopicsBlockedForTesting, (), (override));
   MOCK_METHOD(void, SetPrivacySandboxEnabled, (bool), (override));
   MOCK_METHOD(bool, IsPrivacySandboxRestricted, (), (override, const));
+  MOCK_METHOD(bool, IsRestrictedNoticeEnabled, (), (override, const));
   MOCK_METHOD(void, OnCookiesCleared, (), (override));
   MOCK_METHOD(void, AddObserver, (Observer*), (override));
   MOCK_METHOD(void, RemoveObserver, (Observer*), (override));

components/privacy_sandbox/privacy_sandbox_settings.h

diff --git a/components/privacy_sandbox/privacy_sandbox_settings.h b/components/privacy_sandbox/privacy_sandbox_settings.h
index 1c0c316..e217f26 100644
--- a/components/privacy_sandbox/privacy_sandbox_settings.h
+++ b/components/privacy_sandbox/privacy_sandbox_settings.h
@@ -188,6 +188,10 @@
   // Virtual to allow mocking in tests.
   virtual bool IsPrivacySandboxRestricted() const = 0;
 
+  // Returns whether the Privacy Sandbox is partially enabled based on
+  // restrictions.
+  virtual bool IsRestrictedNoticeEnabled() const = 0;
+
   // Called when there's a broad cookies clearing action. For example, this
   // should be called on "Clear browsing data", but shouldn't be called on the
   // Clear-Site-Data header, as it's restricted to a specific site.

components/privacy_sandbox/privacy_sandbox_settings_impl.cc

diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
index 80e9d6c..dd53303 100644
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -8,6 +8,7 @@
 #include "base/containers/contains.h"
 #include "base/feature_list.h"
 #include "base/json/values_util.h"
+#include "base/metrics/field_trial_params.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/observer_list.h"
 #include "base/ranges/algorithm.h"
@@ -518,6 +519,10 @@
   return delegate_->IsPrivacySandboxRestricted();
 }
 
+bool PrivacySandboxSettingsImpl::IsRestrictedNoticeEnabled() const {
+  return privacy_sandbox::kPrivacySandboxSettings4RestrictedNotice.Get();
+}
+
 void PrivacySandboxSettingsImpl::OnCookiesCleared() {
   SetTopicsDataAccessibleFromNow();
 }

components/privacy_sandbox/privacy_sandbox_settings_impl.h

diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.h b/components/privacy_sandbox/privacy_sandbox_settings_impl.h
index 5a036f2..3d13077a 100644
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.h
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.h
@@ -73,6 +73,7 @@
   void SetTopicsBlockedForTesting() override;
   void SetPrivacySandboxEnabled(bool enabled) override;
   bool IsPrivacySandboxRestricted() const override;
+  bool IsRestrictedNoticeEnabled() const override;
   void OnCookiesCleared() override;
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;

components/safe_browsing/core/browser/db/v4_local_database_manager.cc

diff --git a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
index b8d84bd..f840561 100644
--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
@@ -53,6 +53,11 @@
 // smaller than this number, the allowlist is considered as unavailable.
 const int kHighConfidenceAllowlistMinimumEntryCount = 100;
 
+// If the switch is present, any high-confidence allowlist check will return
+// that it does not match the allowlist.
+const char kSkipHighConfidenceAllowlist[] =
+    "safe-browsing-skip-high-confidence-allowlist";
+
 const ThreatSeverity kLeastSeverity =
     std::numeric_limits<ThreatSeverity>::max();
 
@@ -461,6 +466,10 @@
     const GURL& url,
     const std::string& metric_variation) {
   DCHECK(sb_task_runner()->RunsTasksInCurrentSequence());
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          kSkipHighConfidenceAllowlist)) {
+    return false;
+  }
 
   StoresToCheck stores_to_check({GetUrlHighConfidenceAllowlistId()});
   bool all_stores_available = AreAllStoresAvailableNow(stores_to_check);

components/safe_browsing/core/browser/db/v4_local_database_manager_unittest.cc

diff --git a/components/safe_browsing/core/browser/db/v4_local_database_manager_unittest.cc b/components/safe_browsing/core/browser/db/v4_local_database_manager_unittest.cc
index faec6871e..5928179 100644
--- a/components/safe_browsing/core/browser/db/v4_local_database_manager_unittest.cc
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager_unittest.cc
@@ -18,6 +18,7 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/test/metrics/histogram_tester.h"
+#include "base/test/scoped_command_line.h"
 #include "base/test/task_environment.h"
 #include "base/test/test_simple_task_runner.h"
 #include "build/branding_buildflags.h"
@@ -850,6 +851,33 @@
       v4_local_database_manager_));
 }
 
+// Tests the command line flag that skips the high-confidence allowlist check.
+TEST_F(V4LocalDatabaseManagerTest,
+       TestCheckUrlForHCAllowlistSkippedViaCommandLineSwitch) {
+  SetupFakeManager();
+  std::string url_safe_no_scheme("example.com/safe/");
+  FullHashStr safe_full_hash(crypto::SHA256HashString(url_safe_no_scheme));
+
+  // Setup to match full hash in the local database.
+  StoreAndHashPrefixes store_and_hash_prefixes;
+  store_and_hash_prefixes.emplace_back(GetUrlHighConfidenceAllowlistId(),
+                                       safe_full_hash);
+  ReplaceV4Database(store_and_hash_prefixes, /*stores_available=*/true);
+  const GURL url_check("https://" + url_safe_no_scheme);
+
+  // First, confirm the high-confidence allowlist is checked by default.
+  EXPECT_TRUE(v4_local_database_manager_->CheckUrlForHighConfidenceAllowlist(
+      url_check, "HPRT"));
+
+  // Now, check that the high-confidence allowlist is skipped if the command
+  // line switch is present.
+  base::test::ScopedCommandLine scoped_command_line;
+  scoped_command_line.GetProcessCommandLine()->AppendSwitch(
+      "safe-browsing-skip-high-confidence-allowlist");
+  EXPECT_FALSE(v4_local_database_manager_->CheckUrlForHighConfidenceAllowlist(
+      url_check, "HPRT"));
+}
+
 TEST_F(V4LocalDatabaseManagerTest, TestGetSeverestThreatTypeAndMetadata) {
   WaitForTasksOnTaskRunner();
 

components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service.cc

diff --git a/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service.cc b/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service.cc
index 42dd1f78..6feb6e14 100644
--- a/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service.cc
+++ b/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service.cc
@@ -4,6 +4,7 @@
 
 #include "components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service.h"
 
+#include "base/base64.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/rand_util.h"
 #include "components/prefs/pref_service.h"
@@ -21,9 +22,9 @@
 namespace {
 
 constexpr base::TimeDelta kKeyFetchTimeout = base::Seconds(3);
-// TODO(crbug.com/1407283): Update the endpoint when it is finalized.
+
 constexpr char kKeyFetchServerUrl[] =
-    "https://safebrowsingohttpgateway.googleapis.com/key";
+    "https://safebrowsingohttpgateway.googleapis.com/v1/ohttp/hpkekeyconfig";
 // Key older than 7 days is considered expired and should be refetched.
 constexpr base::TimeDelta kKeyExpirationDuration = base::Days(7);
 
@@ -336,14 +337,18 @@
   base::Time expiration_time = pref_service_->GetTime(
       prefs::kSafeBrowsingHashRealTimeOhttpExpirationTime);
   if (!key.empty() && expiration_time > base::Time::Now()) {
-    ohttp_key_ = {key, expiration_time};
+    std::string decoded_key;
+    base::Base64Decode(key, &decoded_key);
+    ohttp_key_ = {decoded_key, expiration_time};
   }
 }
 
 void OhttpKeyService::StoreKeyToPref() {
   if (ohttp_key_ && ohttp_key_->expiration > base::Time::Now()) {
+    std::string base64_encoded_key;
+    base::Base64Encode(ohttp_key_->key, &base64_encoded_key);
     pref_service_->SetString(prefs::kSafeBrowsingHashRealTimeOhttpKey,
-                             ohttp_key_->key);
+                             base64_encoded_key);
     pref_service_->SetTime(prefs::kSafeBrowsingHashRealTimeOhttpExpirationTime,
                            ohttp_key_->expiration);
   }

components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service_unittest.cc

diff --git a/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service_unittest.cc b/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service_unittest.cc
index 48d562521..e546b36e 100644
--- a/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service_unittest.cc
+++ b/components/safe_browsing/core/browser/hashprefix_realtime/ohttp_key_service_unittest.cc
@@ -25,10 +25,11 @@
 
 namespace {
 constexpr char kTestOhttpKey[] = "TestOhttpKey";
+constexpr char kEncodedTestOhttpKey[] = "VGVzdE9odHRwS2V5";
 constexpr char kTestOldOhttpKey[] = "OldOhttpKey";
 constexpr char kTestNewOhttpKey[] = "NewOhttpKey";
 constexpr char kExpectedKeyFetchServerUrl[] =
-    "https://safebrowsingohttpgateway.googleapis.com/key";
+    "https://safebrowsingohttpgateway.googleapis.com/v1/ohttp/hpkekeyconfig";
 
 scoped_refptr<net::HttpResponseHeaders> CreateSuccessHeaders() {
   return net::HttpResponseHeaders::TryToCreate("HTTP/1.1 200 OK\r\n");
@@ -112,7 +113,7 @@
   EXPECT_EQ(ohttp_key.value().expiration, base::Time::Now() + base::Days(7));
   EXPECT_EQ(ohttp_key.value().key, kTestOhttpKey);
   EXPECT_EQ(pref_service_.GetString(prefs::kSafeBrowsingHashRealTimeOhttpKey),
-            kTestOhttpKey);
+            kEncodedTestOhttpKey);
   EXPECT_EQ(pref_service_.GetTime(
                 prefs::kSafeBrowsingHashRealTimeOhttpExpirationTime),
             base::Time::Now() + base::Days(7));
@@ -220,7 +221,7 @@
 
 TEST_F(OhttpKeyServiceTest, PopulateKeyFromPref_ValidKey) {
   pref_service_.SetString(prefs::kSafeBrowsingHashRealTimeOhttpKey,
-                          kTestOhttpKey);
+                          kEncodedTestOhttpKey);
   pref_service_.SetTime(prefs::kSafeBrowsingHashRealTimeOhttpExpirationTime,
                         base::Time::Now() + base::Days(10));
 

components/supervised_user/core/browser/BUILD.gn

diff --git a/components/supervised_user/core/browser/BUILD.gn b/components/supervised_user/core/browser/BUILD.gn
index 7169938..0d15668 100644
--- a/components/supervised_user/core/browser/BUILD.gn
+++ b/components/supervised_user/core/browser/BUILD.gn
@@ -12,6 +12,8 @@
     "kids_access_token_fetcher.h",
     "kids_chrome_management_client.cc",
     "kids_chrome_management_client.h",
+    "kids_external_fetcher.cc",
+    "kids_external_fetcher.h",
     "kids_management_url_checker_client.cc",
     "kids_management_url_checker_client.h",
     "permission_request_creator.h",
@@ -68,6 +70,7 @@
   testonly = true
   sources = [
     "kids_access_token_fetcher_unittest.cc",
+    "kids_external_fetcher_unittest.cc",
     "kids_management_url_checker_client_unittest.cc",
     "remote_web_approvals_manager_unittest.cc",
     "supervised_user_error_page_unittest.cc",

components/supervised_user/core/browser/kids_external_fetcher.cc

diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.cc b/components/supervised_user/core/browser/kids_external_fetcher.cc
similarity index 97%
rename from chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.cc
rename to components/supervised_user/core/browser/kids_external_fetcher.cc
index 6c2578b1..828afa6 100644
--- a/chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.cc
+++ b/components/supervised_user/core/browser/kids_external_fetcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 
 #include <memory>
 #include <string>
@@ -170,6 +170,15 @@
             "The request is authenticated with an OAuth2 access token "
             "identifying the Google account. No other information is sent."
           destination: GOOGLE_OWNED_SERVICE
+          user_data {
+            type: NONE
+          }
+          internal {
+            contacts {
+              email: "chrome-kids-eng@google.com"
+            }
+          }
+          last_reviewed: "2023-04-18"
         }
         policy {
           cookies_allowed: NO

components/supervised_user/core/browser/kids_external_fetcher.h

diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h b/components/supervised_user/core/browser/kids_external_fetcher.h
similarity index 95%
rename from chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h
rename to components/supervised_user/core/browser/kids_external_fetcher.h
index 9533e5f..c7121c9 100644
--- a/chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h
+++ b/components/supervised_user/core/browser/kids_external_fetcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SUPERVISED_USER_KIDS_CHROME_MANAGEMENT_KIDS_EXTERNAL_FETCHER_H_
-#define CHROME_BROWSER_SUPERVISED_USER_KIDS_CHROME_MANAGEMENT_KIDS_EXTERNAL_FETCHER_H_
+#ifndef COMPONENTS_SUPERVISED_USER_CORE_BROWSER_KIDS_EXTERNAL_FETCHER_H_
+#define COMPONENTS_SUPERVISED_USER_CORE_BROWSER_KIDS_EXTERNAL_FETCHER_H_
 
 #include "base/functional/callback_forward.h"
 #include "base/memory/scoped_refptr.h"
@@ -138,4 +138,4 @@
         kids_chrome_management::ListFamilyMembersRequest,
         kids_chrome_management::ListFamilyMembersResponse>::Callback callback);
 
-#endif  // CHROME_BROWSER_SUPERVISED_USER_KIDS_CHROME_MANAGEMENT_KIDS_EXTERNAL_FETCHER_H_
+#endif  // COMPONENTS_SUPERVISED_USER_CORE_BROWSER_KIDS_EXTERNAL_FETCHER_H_

components/supervised_user/core/browser/kids_external_fetcher_unittest.cc

diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher_unittest.cc b/components/supervised_user/core/browser/kids_external_fetcher_unittest.cc
similarity index 98%
rename from chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher_unittest.cc
rename to components/supervised_user/core/browser/kids_external_fetcher_unittest.cc
index a2e3f72..d8dd0db 100644
--- a/chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher_unittest.cc
+++ b/components/supervised_user/core/browser/kids_external_fetcher_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.h"
+#include "components/supervised_user/core/browser/kids_external_fetcher.h"
 
 #include <memory>
 #include <string>

components/translate/ios/browser/js_translate_web_frame_manager_unittest.mm

diff --git a/components/translate/ios/browser/js_translate_web_frame_manager_unittest.mm b/components/translate/ios/browser/js_translate_web_frame_manager_unittest.mm
index 9760a5b..3eb0d804 100644
--- a/components/translate/ios/browser/js_translate_web_frame_manager_unittest.mm
+++ b/components/translate/ios/browser/js_translate_web_frame_manager_unittest.mm
@@ -6,8 +6,9 @@
 
 #include "components/grit/components_resources.h"
 #import "components/translate/ios/browser/js_translate_web_frame_manager_factory.h"
+#import "components/translate/ios/browser/translate_java_script_feature.h"
 #import "ios/web/public/js_messaging/web_frame.h"
-#import "ios/web/public/js_messaging/web_frame_util.h"
+#import "ios/web/public/js_messaging/web_frames_manager.h"
 #import "ios/web/public/test/web_test_with_web_state.h"
 #import "testing/gtest_mac.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -29,7 +30,10 @@
   id result = ExecuteJavaScript(@"typeof cr == 'undefined'");
   ASSERT_NSEQ(@YES, result);
 
-  web::WebFrame* frame = web::GetMainFrame(web_state());
+  TranslateJavaScriptFeature* feature =
+      TranslateJavaScriptFeature::GetInstance();
+  web::WebFrame* frame =
+      feature->GetWebFramesManager(web_state())->GetMainWebFrame();
   JSTranslateWebFrameManager* manager =
       JSTranslateWebFrameManagerFactory::GetInstance()->FromWebFrame(frame);
   ASSERT_FALSE(manager);
@@ -55,7 +59,10 @@
 // lib ready.
 TEST_F(JsTranslateWebFrameManagerTest, Reinject) {
   LoadHtml(@"<html></html>");
-  web::WebFrame* frame = web::GetMainFrame(web_state());
+  TranslateJavaScriptFeature* feature =
+      TranslateJavaScriptFeature::GetInstance();
+  web::WebFrame* frame =
+      feature->GetWebFramesManager(web_state())->GetMainWebFrame();
   JSTranslateWebFrameManagerFactory::GetInstance()->CreateForWebFrame(frame);
   JSTranslateWebFrameManager* manager =
       JSTranslateWebFrameManagerFactory::GetInstance()->FromWebFrame(frame);
@@ -75,7 +82,10 @@
 // Tests that starting translation calls the appropriate API.
 TEST_F(JsTranslateWebFrameManagerTest, Translate) {
   LoadHtml(@"<html></html>");
-  web::WebFrame* frame = web::GetMainFrame(web_state());
+  TranslateJavaScriptFeature* feature =
+      TranslateJavaScriptFeature::GetInstance();
+  web::WebFrame* frame =
+      feature->GetWebFramesManager(web_state())->GetMainWebFrame();
   JSTranslateWebFrameManagerFactory::GetInstance()->CreateForWebFrame(frame);
   JSTranslateWebFrameManager* manager =
       JSTranslateWebFrameManagerFactory::GetInstance()->FromWebFrame(frame);
@@ -106,7 +116,10 @@
 // Tests that reverting translation calls the appropriate API.
 TEST_F(JsTranslateWebFrameManagerTest, Revert) {
   LoadHtml(@"<html></html>");
-  web::WebFrame* frame = web::GetMainFrame(web_state());
+  TranslateJavaScriptFeature* feature =
+      TranslateJavaScriptFeature::GetInstance();
+  web::WebFrame* frame =
+      feature->GetWebFramesManager(web_state())->GetMainWebFrame();
   JSTranslateWebFrameManagerFactory::GetInstance()->CreateForWebFrame(frame);
   JSTranslateWebFrameManager* manager =
       JSTranslateWebFrameManagerFactory::GetInstance()->FromWebFrame(frame);

components/user_manager/user_manager_base.cc

diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index ae3927c4..cbd8a40 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc
@@ -366,39 +366,50 @@
 
 void UserManagerBase::RemoveNonOwnerUserInternal(AccountId account_id,
                                                  UserRemovalReason reason) {
-  NotifyUserToBeRemoved(account_id);
-  AsyncRemoveCryptohome(account_id);
-  RemoveUserFromList(account_id);
-  // |account_id| cannot be used after the |RemoveUserFromList| call, use
-  // |account_id_copy| instead if needed.
-
-  NotifyUserRemoved(account_id, reason);
+  RemoveUserFromListImpl(account_id, reason,
+                         /*trigger_cryptohome_removal=*/true);
 }
 
 void UserManagerBase::RemoveUserFromList(const AccountId& account_id) {
-  RemoveUserFromListImpl(account_id, /* notify=*/true);
+  RemoveUserFromListImpl(account_id, UserRemovalReason::UNKNOWN,
+                         /*trigger_cryptohome_removal=*/false);
 }
 
 void UserManagerBase::RemoveUserFromListForRecreation(
     const AccountId& account_id) {
-  RemoveUserFromListImpl(account_id, /* notify=*/false);
+  RemoveUserFromListImpl(account_id, /*reason=*/absl::nullopt,
+                         /*trigger_cryptohome_removal=*/false);
 }
 
-void UserManagerBase::RemoveUserFromListImpl(const AccountId& account_id,
-                                             bool notify) {
+void UserManagerBase::RemoveUserFromListImpl(
+    const AccountId& account_id,
+    absl::optional<UserRemovalReason> reason,
+    bool trigger_cryptohome_removal) {
   DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence());
+  if (reason.has_value()) {
+    NotifyUserToBeRemoved(account_id);
+  }
+  if (trigger_cryptohome_removal) {
+    AsyncRemoveCryptohome(account_id);
+  }
+
   RemoveNonCryptohomeData(account_id);
   KnownUser(GetLocalState()).RemovePrefs(account_id);
   if (user_loading_stage_ == STAGE_LOADED) {
     // After the User object is deleted from memory in DeleteUser() here,
     // the account_id reference will be invalid if the reference points
     // to the account_id in the User object.
-    DeleteUser(RemoveRegularOrSupervisedUserFromList(account_id, notify));
+    DeleteUser(
+        RemoveRegularOrSupervisedUserFromList(account_id, reason.has_value()));
   } else {
     NOTREACHED() << "Users are not loaded yet.";
     return;
   }
 
+  if (reason.has_value()) {
+    NotifyUserRemoved(account_id, reason.value());
+  }
+
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
 }

components/user_manager/user_manager_base.h

diff --git a/components/user_manager/user_manager_base.h b/components/user_manager/user_manager_base.h
index 6076c35..b81735bc 100644
--- a/components/user_manager/user_manager_base.h
+++ b/components/user_manager/user_manager_base.h
@@ -24,6 +24,7 @@
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_manager_export.h"
 #include "components/user_manager/user_type.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 class PrefRegistrySimple;
 
@@ -235,8 +236,13 @@
   User* RemoveRegularOrSupervisedUserFromList(const AccountId& account_id,
                                               bool notify);
 
-  // Implementation for `RemoveUserFromList`[`ForRecreation`] methods.
-  void RemoveUserFromListImpl(const AccountId& account_id, bool notify);
+  // Implementation for RemoveUser. If |reason| is set, it notifies observers
+  // via OnUserToBeRemoved, OnUserRemoved and LocalStateChanged.
+  // If |trigger_cryptohome_removal| is set to true, this triggeres an
+  // asynchronous operation to remove the user data in Cryptohome.
+  void RemoveUserFromListImpl(const AccountId& account_id,
+                              absl::optional<UserRemovalReason> reason,
+                              bool trigger_cryptohome_removal);
 
   // Implementation for RemoveUser method. This is an asynchronous part of the
   // method, that verifies that owner will not get deleted, and calls
@@ -270,6 +276,7 @@
                                               const UserType user_type);
 
   // Should be called when regular user was removed.
+  // DEPRECATED: TODO(b/267685577): replace this by Observer::OnUserRemoved.
   virtual void OnUserRemoved(const AccountId& account_id) = 0;
 
   // Update the global LoginState.

components/viz/common/features.cc

diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc
index 829b6fd..0f0aebefe 100644
--- a/components/viz/common/features.cc
+++ b/components/viz/common/features.cc
@@ -158,8 +158,8 @@
 // * If this feature is disabled, then the default limit is 128 quads,
 //   unless there are 5 or more video elements present, in which case
 //   the limit is 300.
-// * If this feature is enabled, then these limits are 512 and 300 quads
-//   respectively, and can be overridden by the "default" and "many-videos"
+// * If this feature is enabled, then these limits are 512, and can be
+// overridden by the "default" and "many-videos"
 //   feature parameters.
 BASE_FEATURE(kCALayerNewLimit,
              "CALayerNewLimit",

components/viz/service/BUILD.gn

diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index 96fe556..f2fe76f 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -135,6 +135,8 @@
     "display_embedder/skia_output_surface_impl.h",
     "display_embedder/skia_output_surface_impl_on_gpu.cc",
     "display_embedder/skia_output_surface_impl_on_gpu.h",
+    "display_embedder/skia_output_surface_impl_on_gpu_debug_capture.cc",
+    "display_embedder/skia_output_surface_impl_on_gpu_debug_capture.h",
     "display_embedder/skia_render_copy_results.cc",
     "display_embedder/skia_render_copy_results.h",
     "display_embedder/software_output_surface.cc",

components/viz/service/debugger/viz_debugger.h

diff --git a/components/viz/service/debugger/viz_debugger.h b/components/viz/service/debugger/viz_debugger.h
index 0f2f8826..a99a6c8 100644
--- a/components/viz/service/debugger/viz_debugger.h
+++ b/components/viz/service/debugger/viz_debugger.h
@@ -398,6 +398,13 @@
     SkBitmap bitmap;
   };
 
+  struct DrawOption {
+    uint8_t color_r;
+    uint8_t color_g;
+    uint8_t color_b;
+    uint8_t color_a;
+  };
+
   inline void CompleteFrame(uint64_t counter,
                             const gfx::Size& window_pix,
                             base::TimeTicks time_ticks) {}

components/viz/service/display/ca_layer_overlay.cc

diff --git a/components/viz/service/display/ca_layer_overlay.cc b/components/viz/service/display/ca_layer_overlay.cc
index 3cac8b41..3266a0a9 100644
--- a/components/viz/service/display/ca_layer_overlay.cc
+++ b/components/viz/service/display/ca_layer_overlay.cc
@@ -34,15 +34,18 @@
 // disabled.
 constexpr size_t kLayerLimitDefault = 128;
 
-// The default CALayer number allowed with many videos (video conferencing). It
-// can be overriden by the "many-videos" feature parameters if kCALayerNewLimit
-// is enabled.
-constexpr size_t kLayerLimitWithManyVideos = 300;
-
 // The new limit if kCALayerNewLimit is enabled. It can be overriden by the
 // "default" feature parameters.
 constexpr size_t kLayerNewLimitDefault = 512;
 
+// The default CALayer number allowed for CoreAnimation with many videos (video
+// count >= kMaxNumVideos) when kCALayerNewLimit is disabled.
+constexpr size_t kLayerLimitWithManyVideos = 300;
+
+// The new limit with many videos if kCALayerNewLimit is enabled. It can be
+// overriden by the "many-video" feature parameters.
+constexpr size_t kLayerNewLimitWithManyVideos = 512;
+
 // If there are too many RenderPassDrawQuads, we shouldn't use Core
 // Animation to present them as individual layers, since that potentially
 // doubles the amount of work needed to present them. cc has to blit them into
@@ -388,6 +391,7 @@
 
     const int layer_limit_with_many_videos_field_trial =
         features::kCALayerNewLimitManyVideos.Get();
+    layer_limit_with_many_videos_ = kLayerNewLimitWithManyVideos;
     if (layer_limit_with_many_videos_field_trial > 0) {
       layer_limit_with_many_videos_ = layer_limit_with_many_videos_field_trial;
     }

components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc

diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
index 2802fe1..271c895 100644
--- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
+++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
@@ -28,6 +28,7 @@
 #include "components/viz/common/resources/resource_format_utils.h"
 #include "components/viz/common/skia_helper.h"
 #include "components/viz/common/viz_utils.h"
+#include "components/viz/service/debugger/viz_debugger.h"
 #include "components/viz/service/display/output_surface_frame.h"
 #include "components/viz/service/display_embedder/image_context_impl.h"
 #include "components/viz/service/display_embedder/output_presenter_gl.h"
@@ -37,6 +38,7 @@
 #include "components/viz/service/display_embedder/skia_output_device_offscreen.h"
 #include "components/viz/service/display_embedder/skia_output_device_webview.h"
 #include "components/viz/service/display_embedder/skia_output_surface_dependency.h"
+#include "components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.h"
 #include "components/viz/service/display_embedder/skia_render_copy_results.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
@@ -1566,6 +1568,8 @@
   ScheduleCheckReadbackCompletion();
 }
 
+DBG_FLAG_FBOOL("skia_gpu.buffer_capture.enable", buffer_capture)
+
 void SkiaOutputSurfaceImplOnGpu::BeginAccessImages(
     const std::vector<ImageContextImpl*>& image_contexts,
     std::vector<GrBackendSemaphore>* begin_semaphores,
@@ -1574,8 +1578,13 @@
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   bool is_gl = gpu_preferences_.gr_context_type == gpu::GrContextType::kGL;
-
   for (auto* context : image_contexts) {
+    if (buffer_capture()) {
+      AttemptDebuggerBufferCapture(context, context_state_.get(),
+                                   shared_image_representation_factory_.get(),
+                                   gr_context());
+    }
+
     // Prepare for accessing render pass.
     context->BeginAccessIfNecessary(
         context_state_.get(), shared_image_representation_factory_.get(),

components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.cc

diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.cc
new file mode 100644
index 0000000..01ef010
--- /dev/null
+++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.cc
@@ -0,0 +1,158 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.h"
+
+#include <memory>
+#include <vector>
+
+#include "build/build_config.h"
+#include "components/viz/common/buildflags.h"
+#include "components/viz/common/features.h"
+#include "components/viz/common/viz_utils.h"
+#include "components/viz/service/debugger/viz_debugger.h"
+#include "components/viz/service/display_embedder/image_context_impl.h"
+#include "components/viz/service/display_embedder/output_presenter_gl.h"
+#include "components/viz/service/display_embedder/skia_output_device.h"
+#include "components/viz/service/display_embedder/skia_output_device_buffer_queue.h"
+#include "components/viz/service/display_embedder/skia_output_device_gl.h"
+#include "components/viz/service/display_embedder/skia_output_device_offscreen.h"
+#include "components/viz/service/display_embedder/skia_output_device_webview.h"
+#include "components/viz/service/display_embedder/skia_output_surface_dependency.h"
+#include "components/viz/service/display_embedder/skia_render_copy_results.h"
+#include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/command_buffer/common/mailbox_holder.h"
+#include "gpu/vulkan/buildflags.h"
+#include "skia/buildflags.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "third_party/libyuv/include/libyuv/planar_functions.h"
+
+#include "ui/gfx/color_space.h"
+
+// We only include the functionality for gpu buffer capture iif the visual
+// debugger is enabled at a build level
+#if VIZ_DEBUGGER_IS_ON()
+
+namespace {
+
+DBG_FLAG_FBOOL("skia_gpu.buffer_capture.low_res", buffer_capture_low_res)
+
+struct DebuggerCaptureBufferSharedImageInfo {
+  viz::SharedImageFormat si_format;
+  gfx::Size size;
+  gfx::ColorSpace color_space;
+  GrSurfaceOrigin surface_origin;
+  SkAlphaType alpha_type;
+  uint32_t usage;
+  gpu::Mailbox mailbox;
+};
+
+void DebuggerCaptureBufferCallback(
+    void* si_info_raw,
+    std::unique_ptr<const SkSurface::AsyncReadResult> async_result) {
+  DBG_LOG("skia_gpu.buffer_capture.debugging", "Readback request is %d",
+          async_result != nullptr);
+  if (!async_result) {
+    return;
+  }
+
+  std::unique_ptr<DebuggerCaptureBufferSharedImageInfo> si_info(
+      static_cast<DebuggerCaptureBufferSharedImageInfo*>(si_info_raw));
+  int submit_id = 0;
+  DBG_DRAW_RECTANGLE_OPT("skia_gpu.captured_buffer.black",
+                         viz::VizDebugger::DrawOption({0, 0, 0, 255}),
+                         gfx::Vector2dF(), gfx::SizeF(si_info->size));
+  DBG_DRAW_RECTANGLE_OPT_BUFF_UV(
+      "skia_gpu.captured_buffer.image", DBG_OPT_BLACK, gfx::Vector2dF(),
+      gfx::SizeF(si_info->size), &submit_id, DEFAULT_UV);
+
+  viz::VizDebugger::BufferInfo buffer_info;
+  buffer_info.bitmap.setInfo(SkImageInfo::MakeN32(
+      si_info->size.width(), si_info->size.height(), kPremul_SkAlphaType));
+  buffer_info.bitmap.allocPixels();
+  SkPixmap pixmap(buffer_info.bitmap.info(), async_result->data(0),
+                  buffer_info.bitmap.info().minRowBytes());
+  buffer_info.bitmap.writePixels(pixmap);
+
+  DBG_COMPLETE_BUFFERS(submit_id, buffer_info);
+}
+}  // namespace
+
+namespace viz {
+void AttemptDebuggerBufferCapture(
+    ImageContextImpl* context,
+    gpu::SharedContextState* context_state,
+    gpu::SharedImageRepresentationFactory* shared_image_representation_factory,
+    GrDirectContext* gr_direct_context) {
+  if (!context_state->MakeCurrent(nullptr)) {
+    DLOG(ERROR) << "Failed to make context state current.";
+    return;
+  }
+
+  auto representation = shared_image_representation_factory->ProduceSkia(
+      context->mailbox_holder().mailbox, context_state);
+
+  if (!representation) {
+    DLOG(ERROR) << "Failed to make produce skia representation.";
+    return;
+  }
+  std::vector<GrBackendSemaphore> begin_semaphores_readback;
+  std::vector<GrBackendSemaphore> end_semaphores_readback;
+  const gfx::Size texture_size = representation->size();
+
+  auto scoped_read = representation->BeginScopedReadAccess(
+      &begin_semaphores_readback, &end_semaphores_readback);
+
+  if (!scoped_read) {
+    DLOG(ERROR) << "Failed to make begin read from representation";
+    return;
+  }
+
+  if (!begin_semaphores_readback.empty()) {
+    bool result = gr_direct_context->wait(begin_semaphores_readback.size(),
+                                          begin_semaphores_readback.data(),
+                                          /*deleteSemaphoresAfterWait=*/false);
+    DCHECK(result);
+  }
+
+  auto skimage = scoped_read->CreateSkImage(gr_direct_context);
+
+  if (!skimage) {
+    DLOG(ERROR) << "Failed to create SkImage from scoped read";
+    return;
+  }
+  DBG_LOG("skia_gpu.buffer_capture.debugging", "Image %s",
+          texture_size.ToString().c_str());
+
+  auto resolution_div = buffer_capture_low_res() ? 2 : 1;
+  SkImageInfo dst_info = SkImageInfo::Make(
+      texture_size.width() / resolution_div,
+      texture_size.height() / resolution_div, kBGRA_8888_SkColorType,
+      kPremul_SkAlphaType, sk_sp<SkColorSpace>());
+
+  auto si_info = std::make_unique<DebuggerCaptureBufferSharedImageInfo>();
+  si_info->si_format = context->format();
+  si_info->size = gfx::Size(dst_info.width(), dst_info.height());
+  si_info->color_space = gfx::ColorSpace(*context->color_space());
+  si_info->surface_origin = context->origin();
+  si_info->alpha_type = context->alpha_type();
+  si_info->usage = gpu::SHARED_IMAGE_USAGE_DISPLAY_READ;
+  si_info->mailbox = context->mailbox_holder().mailbox;
+
+  skimage->asyncRescaleAndReadPixels(
+      dst_info, SkIRect::MakeWH(texture_size.width(), texture_size.height()),
+      SkSurface::RescaleGamma::kSrc, SkSurface::RescaleMode::kRepeatedLinear,
+      &DebuggerCaptureBufferCallback, si_info.release());
+}
+
+}  // namespace viz
+#else
+namespace viz {
+void AttemptDebuggerBufferCapture(
+    ImageContextImpl* context,
+    gpu::SharedContextState* context_state,
+    gpu::SharedImageRepresentationFactory* shared_image_representation_factory,
+    GrDirectContext* gr_direct_context);
+}  // namespace viz
+#endif  // VIZ_DEBUGGER_IS_ON()

components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.h

diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.h b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.h
new file mode 100644
index 0000000..f4dfc9c
--- /dev/null
+++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu_debug_capture.h
@@ -0,0 +1,22 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SKIA_OUTPUT_SURFACE_IMPL_ON_GPU_DEBUG_CAPTURE_H_
+#define COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SKIA_OUTPUT_SURFACE_IMPL_ON_GPU_DEBUG_CAPTURE_H_
+
+#include "components/viz/service/display_embedder/image_context_impl.h"
+
+namespace gpu {
+class SharedImageRepresentationFactory;
+}  // namespace gpu
+
+namespace viz {
+void AttemptDebuggerBufferCapture(
+    ImageContextImpl* context,
+    gpu::SharedContextState* context_state,
+    gpu::SharedImageRepresentationFactory* shared_image_representation_factory,
+    GrDirectContext* gr_direct_context);
+}
+
+#endif  // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SKIA_OUTPUT_SURFACE_IMPL_ON_GPU_DEBUG_CAPTURE_H_

components/webcrypto/algorithm_dispatch.cc

diff --git a/components/webcrypto/algorithm_dispatch.cc b/components/webcrypto/algorithm_dispatch.cc
index db1378c7..88987de 100644
--- a/components/webcrypto/algorithm_dispatch.cc
+++ b/components/webcrypto/algorithm_dispatch.cc
@@ -263,8 +263,7 @@
   if (status.IsError())
     return status;
 
-  return impl->DeriveBits(algorithm, base_key, true, length_bits,
-                          derived_bytes);
+  return impl->DeriveBits(algorithm, base_key, length_bits, derived_bytes);
 }
 
 Status DeriveKey(const blink::WebCryptoAlgorithm& algorithm,
@@ -290,12 +289,11 @@
     return status;
 
   // Determine how many bits long the derived key should be.
-  unsigned int length_bits = 0;
-  bool has_length_bits = false;
-  status = import_impl->GetKeyLength(key_length_algorithm, &has_length_bits,
-                                     &length_bits);
-  if (status.IsError())
+  absl::optional<unsigned int> length_bits;
+  status = import_impl->GetKeyLength(key_length_algorithm, &length_bits);
+  if (status.IsError()) {
     return status;
+  }
 
   // Derive the key bytes.
   const AlgorithmImplementation* derive_impl = nullptr;
@@ -304,10 +302,11 @@
     return status;
 
   std::vector<uint8_t> derived_bytes;
-  status = derive_impl->DeriveBits(algorithm, base_key, has_length_bits,
-                                   length_bits, &derived_bytes);
-  if (status.IsError())
+  status =
+      derive_impl->DeriveBits(algorithm, base_key, length_bits, &derived_bytes);
+  if (status.IsError()) {
     return status;
+  }
 
   // Create the key using the derived bytes.
   return ImportKey(blink::kWebCryptoKeyFormatRaw, derived_bytes,

components/webcrypto/algorithm_implementation.cc

diff --git a/components/webcrypto/algorithm_implementation.cc b/components/webcrypto/algorithm_implementation.cc
index 0866e42..95c8b4a 100644
--- a/components/webcrypto/algorithm_implementation.cc
+++ b/components/webcrypto/algorithm_implementation.cc
@@ -64,16 +64,14 @@
 Status AlgorithmImplementation::DeriveBits(
     const blink::WebCryptoAlgorithm& algorithm,
     const blink::WebCryptoKey& base_key,
-    bool has_optional_length_bits,
-    unsigned int optional_length_bits,
+    absl::optional<unsigned int> length_bits,
     std::vector<uint8_t>* derived_bytes) const {
   return Status::ErrorUnsupported();
 }
 
 Status AlgorithmImplementation::GetKeyLength(
     const blink::WebCryptoAlgorithm& key_length_algorithm,
-    bool* has_length_bits,
-    unsigned int* length_bits) const {
+    absl::optional<unsigned int>* length_bits) const {
   return Status::ErrorUnsupported();
 }
 

components/webcrypto/algorithm_implementation.h

diff --git a/components/webcrypto/algorithm_implementation.h b/components/webcrypto/algorithm_implementation.h
index 3990555e..7ba35c4 100644
--- a/components/webcrypto/algorithm_implementation.h
+++ b/components/webcrypto/algorithm_implementation.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/containers/span.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/platform/web_crypto.h"
 
 namespace webcrypto {
@@ -106,20 +107,17 @@
   // (crypto.subtle.deriveBits() dispatches to this)
   virtual Status DeriveBits(const blink::WebCryptoAlgorithm& algorithm,
                             const blink::WebCryptoKey& base_key,
-                            bool has_optional_length_bits,
-                            unsigned int optional_length_bits,
+                            absl::optional<unsigned int> length_bits,
                             std::vector<uint8_t>* derived_bytes) const;
 
   // This is what is run whenever the spec says:
   //    "Let length be the result of executing the get key length algorithm"
   //
   // In the Web Crypto spec the operation returns either "null" or an
-  // "Integer". In this code "null" is represented by setting
-  // |*has_length_bits = false|.
+  // "Integer". In this code "null" is represented with |absl::nullopt|.
   virtual Status GetKeyLength(
       const blink::WebCryptoAlgorithm& key_length_algorithm,
-      bool* has_length_bits,
-      unsigned int* length_bits) const;
+      absl::optional<unsigned int>* length_bits) const;
 
   // This is what is run whenever the spec says:
   //    "Let result be the result of performing the import key operation"

components/webcrypto/algorithms/aes.cc

diff --git a/components/webcrypto/algorithms/aes.cc b/components/webcrypto/algorithms/aes.cc
index f7a0a03..a4f9ecdd 100644
--- a/components/webcrypto/algorithms/aes.cc
+++ b/components/webcrypto/algorithms/aes.cc
@@ -206,17 +206,17 @@
 
 Status AesAlgorithm::GetKeyLength(
     const blink::WebCryptoAlgorithm& key_length_algorithm,
-    bool* has_length_bits,
-    unsigned int* length_bits) const {
-  *has_length_bits = true;
+    absl::optional<unsigned int>* length_bits) const {
   *length_bits = key_length_algorithm.AesDerivedKeyParams()->LengthBits();
 
-  if (*length_bits == 128 || *length_bits == 256)
+  if (length_bits->value() == 128 || length_bits->value() == 256) {
     return Status::Success();
+  }
 
   // 192-bit AES is intentionally unsupported (http://crbug.com/533699).
-  if (*length_bits == 192)
+  if (length_bits->value() == 192) {
     return Status::ErrorAes192BitUnsupported();
+  }
 
   return Status::ErrorGetAesKeyLength();
 }

components/webcrypto/algorithms/aes.h

diff --git a/components/webcrypto/algorithms/aes.h b/components/webcrypto/algorithms/aes.h
index d6d767b..695afbc 100644
--- a/components/webcrypto/algorithms/aes.h
+++ b/components/webcrypto/algorithms/aes.h
@@ -53,8 +53,7 @@
                                 blink::WebCryptoKey* key) const override;
 
   Status GetKeyLength(const blink::WebCryptoAlgorithm& key_length_algorithm,
-                      bool* has_length_bits,
-                      unsigned int* length_bits) const override;
+                      absl::optional<unsigned int>* length_bits) const override;
 
  private:
   Status ImportKeyRaw(base::span<const uint8_t> key_data,

components/webcrypto/algorithms/ecdh.cc

diff --git a/components/webcrypto/algorithms/ecdh.cc b/components/webcrypto/algorithms/ecdh.cc
index 0525fc0..5795d63 100644
--- a/components/webcrypto/algorithms/ecdh.cc
+++ b/components/webcrypto/algorithms/ecdh.cc
@@ -48,8 +48,7 @@
 
   Status DeriveBits(const blink::WebCryptoAlgorithm& algorithm,
                     const blink::WebCryptoKey& base_key,
-                    bool has_optional_length_bits,
-                    unsigned int optional_length_bits,
+                    absl::optional<unsigned int> length_bits,
                     std::vector<uint8_t>* derived_bytes) const override {
     if (base_key.GetType() != blink::kWebCryptoKeyTypePrivate)
       return Status::ErrorUnexpectedKeyType();
@@ -92,30 +91,31 @@
 
     // If a desired key length was not specified, default to the field size
     // (rounded up to nearest byte).
-    unsigned int length_bits =
-        has_optional_length_bits ? optional_length_bits : field_size_bytes * 8;
+    unsigned int actual_length_bits =
+        length_bits.value_or(field_size_bytes * 8);
 
     // Short-circuit when deriving an empty key.
     // TODO(eroman): ECDH_compute_key() is not happy when given a NULL output.
     //               http://crbug.com/464194.
-    if (length_bits == 0) {
+    if (actual_length_bits == 0) {
       derived_bytes->clear();
       return Status::Success();
     }
 
-    if (length_bits > static_cast<unsigned int>(field_size_bytes * 8))
+    if (actual_length_bits > static_cast<unsigned int>(field_size_bytes * 8)) {
       return Status::ErrorEcdhLengthTooBig(field_size_bytes * 8);
+    }
 
     // Resize to target length in bytes (BoringSSL can operate on a shorter
     // buffer than field_size_bytes).
-    derived_bytes->resize(NumBitsToBytes(length_bits));
+    derived_bytes->resize(NumBitsToBytes(actual_length_bits));
 
     int result = ECDH_compute_key(derived_bytes->data(), derived_bytes->size(),
                                   public_key_point, private_key_ec, nullptr);
     if (result < 0 || static_cast<size_t>(result) != derived_bytes->size())
       return Status::OperationError();
 
-    TruncateToBitLength(length_bits, derived_bytes);
+    TruncateToBitLength(actual_length_bits, derived_bytes);
     return Status::Success();
   }
 };

components/webcrypto/algorithms/hkdf.cc

diff --git a/components/webcrypto/algorithms/hkdf.cc b/components/webcrypto/algorithms/hkdf.cc
index f3ee2c6..fda7807 100644
--- a/components/webcrypto/algorithms/hkdf.cc
+++ b/components/webcrypto/algorithms/hkdf.cc
@@ -63,15 +63,16 @@
 
   Status DeriveBits(const blink::WebCryptoAlgorithm& algorithm,
                     const blink::WebCryptoKey& base_key,
-                    bool has_optional_length_bits,
-                    unsigned int optional_length_bits,
+                    absl::optional<unsigned int> length_bits,
                     std::vector<uint8_t>* derived_bytes) const override {
     crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
-    if (!has_optional_length_bits)
+    if (!length_bits.has_value()) {
       return Status::ErrorHkdfDeriveBitsLengthNotSpecified();
+    }
 
-    if (optional_length_bits % 8)
+    if (*length_bits % 8) {
       return Status::ErrorHkdfLengthNotWholeByte();
+    }
 
     const blink::WebCryptoHkdfParams* params = algorithm.HkdfParams();
 
@@ -80,7 +81,7 @@
       return Status::ErrorUnsupported();
 
     // Size output to fit length
-    unsigned int derived_bytes_len = optional_length_bits / 8;
+    unsigned int derived_bytes_len = *length_bits / 8;
     derived_bytes->resize(derived_bytes_len);
 
     // Algorithm dispatch checks that the algorithm in |base_key| matches
@@ -119,10 +120,10 @@
                                     key);
   }
 
-  Status GetKeyLength(const blink::WebCryptoAlgorithm& key_length_algorithm,
-                      bool* has_length_bits,
-                      unsigned int* length_bits) const override {
-    *has_length_bits = false;
+  Status GetKeyLength(
+      const blink::WebCryptoAlgorithm& key_length_algorithm,
+      absl::optional<unsigned int>* length_bits) const override {
+    *length_bits = absl::nullopt;
     return Status::Success();
   }
 };

components/webcrypto/algorithms/hmac.cc

diff --git a/components/webcrypto/algorithms/hmac.cc b/components/webcrypto/algorithms/hmac.cc
index 77b35ed..12107b4 100644
--- a/components/webcrypto/algorithms/hmac.cc
+++ b/components/webcrypto/algorithms/hmac.cc
@@ -297,21 +297,27 @@
                                     key);
   }
 
-  Status GetKeyLength(const blink::WebCryptoAlgorithm& key_length_algorithm,
-                      bool* has_length_bits,
-                      unsigned int* length_bits) const override {
+  Status GetKeyLength(
+      const blink::WebCryptoAlgorithm& key_length_algorithm,
+      absl::optional<unsigned int>* length_bits) const override {
     const blink::WebCryptoHmacImportParams* params =
         key_length_algorithm.HmacImportParams();
 
-    *has_length_bits = true;
     if (params->HasLengthBits()) {
       *length_bits = params->OptionalLengthBits();
-      if (*length_bits == 0)
+      if (length_bits->value() == 0) {
         return Status::ErrorGetHmacKeyLengthZero();
+      }
       return Status::Success();
     }
 
-    return GetDigestBlockSizeBits(params->GetHash(), length_bits);
+    unsigned int block_size_bits;
+    Status status = GetDigestBlockSizeBits(params->GetHash(), &block_size_bits);
+    if (status.IsError()) {
+      return status;
+    }
+    *length_bits = block_size_bits;
+    return Status::Success();
   }
 };
 

components/webcrypto/algorithms/pbkdf2.cc

diff --git a/components/webcrypto/algorithms/pbkdf2.cc b/components/webcrypto/algorithms/pbkdf2.cc
index 7946f6f2..77c569a 100644
--- a/components/webcrypto/algorithms/pbkdf2.cc
+++ b/components/webcrypto/algorithms/pbkdf2.cc
@@ -64,22 +64,24 @@
 
   Status DeriveBits(const blink::WebCryptoAlgorithm& algorithm,
                     const blink::WebCryptoKey& base_key,
-                    bool has_optional_length_bits,
-                    unsigned int optional_length_bits,
+                    absl::optional<unsigned int> length_bits,
                     std::vector<uint8_t>* derived_bytes) const override {
     crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-    if (!has_optional_length_bits)
+    if (!length_bits.has_value()) {
       return Status::ErrorPbkdf2DeriveBitsLengthNotSpecified();
+    }
 
-    if (optional_length_bits % 8)
+    if (*length_bits % 8) {
       return Status::ErrorPbkdf2InvalidLength();
+    }
 
     // According to RFC 2898 "dkLength" (derived key length) is
     // described as being a "positive integer", so it is an error for
     // it to be 0.
-    if (optional_length_bits == 0)
+    if (*length_bits == 0) {
       return Status::ErrorPbkdf2DeriveBitsLengthZero();
+    }
 
     const blink::WebCryptoPbkdf2Params* params = algorithm.Pbkdf2Params();
 
@@ -90,7 +92,7 @@
     if (!digest_algorithm)
       return Status::ErrorUnsupported();
 
-    unsigned int keylen_bytes = optional_length_bits / 8;
+    unsigned int keylen_bytes = *length_bits / 8;
     derived_bytes->resize(keylen_bytes);
 
     const std::vector<uint8_t>& password = GetSymmetricKeyData(base_key);
@@ -122,10 +124,10 @@
                                     key);
   }
 
-  Status GetKeyLength(const blink::WebCryptoAlgorithm& key_length_algorithm,
-                      bool* has_length_bits,
-                      unsigned int* length_bits) const override {
-    *has_length_bits = false;
+  Status GetKeyLength(
+      const blink::WebCryptoAlgorithm& key_length_algorithm,
+      absl::optional<unsigned int>* length_bits) const override {
+    *length_bits = absl::nullopt;
     return Status::Success();
   }
 };

components/webcrypto/algorithms/x25519.cc

diff --git a/components/webcrypto/algorithms/x25519.cc b/components/webcrypto/algorithms/x25519.cc
index c01e41970..f71a859 100644
--- a/components/webcrypto/algorithms/x25519.cc
+++ b/components/webcrypto/algorithms/x25519.cc
@@ -173,8 +173,7 @@
 Status X25519Implementation::DeriveBits(
     const blink::WebCryptoAlgorithm& algorithm,
     const blink::WebCryptoKey& base_key,
-    bool has_optional_length_bits,
-    unsigned int optional_length_bits,
+    absl::optional<unsigned int> length_bits,
     std::vector<uint8_t>* derived_bytes) const {
   DCHECK(derived_bytes);
 
@@ -214,18 +213,20 @@
   // editors are discussing the possibility of performing the checks during the
   // key import operation instead.
 
-  if (!has_optional_length_bits || optional_length_bits == 0) {
+  // TODO(crbug.com/1433707): The second condition conflates zero and null, and
+  // does not match the spec.
+  if (!length_bits.has_value() || *length_bits == 0) {
     return Status::Success();
   }
 
-  if (8 * derived_len < optional_length_bits) {
+  if (8 * derived_len < *length_bits) {
     return Status::ErrorX25519LengthTooLong();
   }
 
   // Zeros "unused bits" in the final byte.
   // TODO(jfernandez): Diffie-Hellman primitives give back a structured output.
   // Truncation isn't safe!
-  TruncateToBitLength(optional_length_bits, derived_bytes);
+  TruncateToBitLength(*length_bits, derived_bytes);
 
   return Status::Success();
 }

components/webcrypto/algorithms/x25519.h

diff --git a/components/webcrypto/algorithms/x25519.h b/components/webcrypto/algorithms/x25519.h
index 3113fb97..0d377f7 100644
--- a/components/webcrypto/algorithms/x25519.h
+++ b/components/webcrypto/algorithms/x25519.h
@@ -31,8 +31,7 @@
 
   Status DeriveBits(const blink::WebCryptoAlgorithm& algorithm,
                     const blink::WebCryptoKey& base_key,
-                    bool has_optional_length_bits,
-                    unsigned int optional_length_bits,
+                    absl::optional<unsigned int> length_bits,
                     std::vector<uint8_t>* derived_bytes) const override;
 
   Status DeserializeKeyForClone(const blink::WebCryptoKeyAlgorithm& algorithm,

content/browser/attribution_reporting/BUILD.gn

diff --git a/content/browser/attribution_reporting/BUILD.gn b/content/browser/attribution_reporting/BUILD.gn
index 2a3699d5..7eaaa40 100644
--- a/content/browser/attribution_reporting/BUILD.gn
+++ b/content/browser/attribution_reporting/BUILD.gn
@@ -40,14 +40,6 @@
     {
       types = [
         {
-          mojom = "attribution_internals.mojom.AggregatableAttributionReportID"
-          cpp = "::content::AttributionReport::AggregatableAttributionData::Id"
-        },
-        {
-          mojom = "attribution_internals.mojom.EventLevelReportID"
-          cpp = "::content::AttributionReport::EventLevelData::Id"
-        },
-        {
           mojom = "attribution_internals.mojom.ReportID"
           cpp = "::content::AttributionReport::Id"
         },
@@ -56,7 +48,6 @@
         "attribution_internals_mojom_traits.h",
         "attribution_report.h",
       ]
-      traits_sources = [ "attribution_internals_mojom_traits.cc" ]
       traits_deps = [
         ":attribution_reporting_proto",
 

content/browser/attribution_reporting/attribution_data_host_manager_impl.cc

diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
index 6c3dacd..e8d7fc4 100644
--- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
+++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
@@ -27,7 +27,6 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "components/attribution_reporting/registration_type.mojom.h"
 #include "components/attribution_reporting/source_registration.h"
 #include "components/attribution_reporting/source_registration_error.mojom.h"
@@ -48,7 +47,9 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "net/http/http_response_headers.h"
 #include "services/data_decoder/public/cpp/data_decoder.h"
+#include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/trigger_attestation.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
 #include "third_party/blink/public/common/tokens/tokens.h"
@@ -379,7 +380,7 @@
     std::string os_source;
     const bool has_os =
         base::FeatureList::IsEnabled(
-            blink::features::kAttributionReportingCrossAppWeb) &&
+            network::features::kAttributionReportingCrossAppWeb) &&
         headers->GetNormalizedHeader(
             kAttributionReportingRegisterOsSourceHeader, &os_source);
 
@@ -519,7 +520,7 @@
       break;
     case Registrar::kOs:
       if (AttributionManager::GetOsSupport() ==
-          attribution_reporting::mojom::OsSupport::kDisabled) {
+          network::mojom::AttributionOsSupport::kDisabled) {
         // TODO: Report a DevTools issue.
         MaybeOnRegistrationsFinished(it);
         break;

content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc
index 6080c9c7..a97de06 100644
--- a/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl_unittest.cc
@@ -52,20 +52,20 @@
 #include "net/base/schemeful_site.h"
 #include "net/http/http_response_headers.h"
 #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
+#include "services/network/public/cpp/features.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/numeric/int128.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
-#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/mojom/conversions/attribution_data_host.mojom.h"
 #include "third_party/blink/public/mojom/conversions/attribution_reporting.mojom.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 #if BUILDFLAG(IS_ANDROID)
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "content/browser/attribution_reporting/attribution_os_level_manager_android.h"
 #include "content/browser/attribution_reporting/os_registration.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #endif
 
 namespace content {
@@ -1085,11 +1085,10 @@
 TEST_F(AttributionDataHostManagerImplTest, NavigationRedirectOsSource) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
-      blink::features::kAttributionReportingCrossAppWeb);
+      network::features::kAttributionReportingCrossAppWeb);
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   const auto reporter = *SuitableOrigin::Deserialize("https://report.test");
   const auto source_site = *SuitableOrigin::Deserialize("https://source.test");
@@ -1117,11 +1116,10 @@
        NavigationRedirectOsSource_InvalidOsHeader) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
-      blink::features::kAttributionReportingCrossAppWeb);
+      network::features::kAttributionReportingCrossAppWeb);
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   const auto reporter = *SuitableOrigin::Deserialize("https://report.test");
   const auto source_site = *SuitableOrigin::Deserialize("https://source.test");
@@ -1143,11 +1141,10 @@
 TEST_F(AttributionDataHostManagerImplTest, NavigationRedirectOsSource_InOrder) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
-      blink::features::kAttributionReportingCrossAppWeb);
+      network::features::kAttributionReportingCrossAppWeb);
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   auto reporter = *SuitableOrigin::Deserialize("https://report.test");
   auto source_site = *SuitableOrigin::Deserialize("https://source.test");
@@ -1201,7 +1198,7 @@
        NavigationRedirectOsSource_WebAndOsHeaders) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
-      blink::features::kAttributionReportingCrossAppWeb);
+      network::features::kAttributionReportingCrossAppWeb);
 
   const auto reporter = *SuitableOrigin::Deserialize("https://report.test");
   const auto source_site = *SuitableOrigin::Deserialize("https://source.test");
@@ -2005,11 +2002,10 @@
        NavigationBeaconOsSource_ParsingFinishesBeforeAndAfterNav) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
-      blink::features::kAttributionReportingCrossAppWeb);
+      network::features::kAttributionReportingCrossAppWeb);
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   auto reporting_origin = url::Origin::Create(GURL("https://report.test"));
   auto source_origin = *SuitableOrigin::Deserialize("https://source.test");

content/browser/attribution_reporting/attribution_host.cc

diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
index ce9b5f0..6641604 100644
--- a/content/browser/attribution_reporting/attribution_host.cc
+++ b/content/browser/attribution_reporting/attribution_host.cc
@@ -34,6 +34,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "mojo/public/cpp/bindings/message.h"
+#include "services/network/public/cpp/features.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
 #include "third_party/blink/public/common/features.h"
@@ -94,7 +95,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
   if (base::FeatureList::IsEnabled(
-          blink::features::kAttributionReportingCrossAppWeb)) {
+          network::features::kAttributionReportingCrossAppWeb)) {
     input_event_tracker_android_ =
         std::make_unique<AttributionInputEventTrackerAndroid>(web_contents);
   }

content/browser/attribution_reporting/attribution_internals.mojom

diff --git a/content/browser/attribution_reporting/attribution_internals.mojom b/content/browser/attribution_reporting/attribution_internals.mojom
index 7bb96d03..3140515 100644
--- a/content/browser/attribution_reporting/attribution_internals.mojom
+++ b/content/browser/attribution_reporting/attribution_internals.mojom
@@ -13,23 +13,12 @@
 import "url/mojom/origin.mojom";
 import "url/mojom/url.mojom";
 
-// Represents `AttributionReport::EventLevelData::Id`.
+// Represents `AttributionReport::Id`.
 // Will be used to issue commands for individual reports.
-struct EventLevelReportID {
+struct ReportID {
   int64 value;
 };
 
-// Represents `AttributionReport::AggregatableAttributionData::Id`.
-// Will be used to issue commands for individual reports.
-struct AggregatableAttributionReportID {
-  int64 value;
-};
-
-union ReportID {
-  EventLevelReportID event_level_id;
-  AggregatableAttributionReportID aggregatable_attribution_id;
-};
-
 // Contains event-level data to be displayed.
 struct WebUIReportEventLevelData {
   int64 priority;

content/browser/attribution_reporting/attribution_internals_browsertest.cc

diff --git a/content/browser/attribution_reporting/attribution_internals_browsertest.cc b/content/browser/attribution_reporting/attribution_internals_browsertest.cc
index e0861630..fe291d248 100644
--- a/content/browser/attribution_reporting/attribution_internals_browsertest.cc
+++ b/content/browser/attribution_reporting/attribution_internals_browsertest.cc
@@ -60,11 +60,11 @@
 #include "url/origin.h"
 
 #if BUILDFLAG(IS_ANDROID)
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "content/browser/attribution_reporting/attribution_input_event.h"
 #include "content/browser/attribution_reporting/attribution_os_level_manager_android.h"
 #include "content/browser/attribution_reporting/attribution_reporting.mojom.h"
 #include "content/browser/attribution_reporting/os_registration.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #endif
 
 namespace content {
@@ -82,7 +82,6 @@
 using ::testing::ElementsAre;
 using ::testing::IsNull;
 using ::testing::Return;
-using ::testing::VariantWith;
 
 const char kAttributionInternalsUrl[] = "chrome://attribution-internals/";
 
@@ -572,8 +571,7 @@
   ASSERT_TRUE(ExecJsInWebUI(JsReplace(kScript, kCompleteTitle)));
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   TitleWatcher title_watcher(shell()->web_contents(), kCompleteTitle);
   ClickRefreshButton();
@@ -930,16 +928,12 @@
           ReportBuilder(
               AttributionInfoBuilder(SourceBuilder().BuildStored()).Build())
               .SetPriority(7)
-              .SetReportId(AttributionReport::EventLevelData::Id(5))
+              .SetReportId(AttributionReport::Id(5))
               .Build()}))
       .WillOnce(RunOnceCallback<1>(std::vector<AttributionReport>{}));
 
-  EXPECT_CALL(
-      *manager(),
-      SendReportsForWebUI(
-          ElementsAre(VariantWith<AttributionReport::EventLevelData::Id>(
-              AttributionReport::EventLevelData::Id(5))),
-          _))
+  EXPECT_CALL(*manager(),
+              SendReportsForWebUI(ElementsAre(AttributionReport::Id(5)), _))
       .WillOnce([](const std::vector<AttributionReport::Id>& ids,
                    base::OnceClosure done) { std::move(done).Run(); });
 
@@ -1223,20 +1217,14 @@
       .WillOnce(RunOnceCallback<1>(std::vector<AttributionReport>{
           ReportBuilder(
               AttributionInfoBuilder(SourceBuilder().BuildStored()).Build())
-              .SetReportId(
-                  AttributionReport::AggregatableAttributionData::Id(5))
+              .SetReportId(AttributionReport::Id(5))
               .SetAggregatableHistogramContributions(
                   {AggregatableHistogramContribution(1, 2)})
               .BuildAggregatableAttribution()}))
       .WillOnce(RunOnceCallback<1>(std::vector<AttributionReport>{}));
 
-  EXPECT_CALL(
-      *manager(),
-      SendReportsForWebUI(
-          ElementsAre(
-              VariantWith<AttributionReport::AggregatableAttributionData::Id>(
-                  AttributionReport::AggregatableAttributionData::Id(5))),
-          _))
+  EXPECT_CALL(*manager(),
+              SendReportsForWebUI(ElementsAre(AttributionReport::Id(5)), _))
       .WillOnce([](const std::vector<AttributionReport::Id>& ids,
                    base::OnceClosure done) { std::move(done).Run(); });
 

content/browser/attribution_reporting/attribution_internals_handler_impl.cc

diff --git a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
index 4ca0645..ff5ea53 100644
--- a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
+++ b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
@@ -26,7 +26,6 @@
 #include "components/aggregation_service/parsing_utils.h"
 #include "components/attribution_reporting/aggregation_keys.h"
 #include "components/attribution_reporting/destination_set.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "components/attribution_reporting/parsing_utils.h"
 #include "components/attribution_reporting/source_registration.h"
 #include "components/attribution_reporting/source_registration_error.mojom.h"
@@ -52,6 +51,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/net_errors.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "third_party/abseil-cpp/absl/numeric/int128.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
@@ -185,7 +185,7 @@
       report.data());
 
   return attribution_internals::mojom::WebUIReport::New(
-      report.ReportId(), report.ReportURL(is_debug_report),
+      report.id(), report.ReportURL(is_debug_report),
       /*trigger_time=*/attribution_info.time.ToJsTime(),
       /*report_time=*/report.report_time().ToJsTime(),
       SerializeAttributionJson(report.ReportBody(), /*pretty_print=*/true),
@@ -241,7 +241,7 @@
   bool debug_mode = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAttributionReportingDebugMode);
   bool has_os_support = AttributionManager::GetOsSupport() ==
-                        attribution_reporting::mojom::OsSupport::kEnabled;
+                        network::mojom::AttributionOsSupport::kEnabled;
   std::move(callback).Run(attribution_reporting_enabled, debug_mode,
                           has_os_support);
 }

content/browser/attribution_reporting/attribution_internals_mojom_traits.cc

diff --git a/content/browser/attribution_reporting/attribution_internals_mojom_traits.cc b/content/browser/attribution_reporting/attribution_internals_mojom_traits.cc
deleted file mode 100644
index 7f6ca08..0000000
--- a/content/browser/attribution_reporting/attribution_internals_mojom_traits.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2021 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/attribution_reporting/attribution_internals_mojom_traits.h"
-
-#include "third_party/abseil-cpp/absl/types/variant.h"
-
-namespace mojo {
-
-namespace {
-using ::attribution_internals::mojom::ReportIDDataView;
-using ::content::AttributionReport;
-}  // namespace
-
-// static
-bool StructTraits<attribution_internals::mojom::EventLevelReportIDDataView,
-                  AttributionReport::EventLevelData::Id>::
-    Read(attribution_internals::mojom::EventLevelReportIDDataView data,
-         AttributionReport::EventLevelData::Id* out) {
-  *out = AttributionReport::EventLevelData::Id(data.value());
-  return true;
-}
-
-// static
-bool StructTraits<
-    attribution_internals::mojom::AggregatableAttributionReportIDDataView,
-    AttributionReport::AggregatableAttributionData::Id>::
-    Read(attribution_internals::mojom::AggregatableAttributionReportIDDataView
-             data,
-         AttributionReport::AggregatableAttributionData::Id* out) {
-  *out = AttributionReport::AggregatableAttributionData::Id(data.value());
-  return true;
-}
-
-// static
-AttributionReport::EventLevelData::Id
-UnionTraits<ReportIDDataView, AttributionReport::Id>::event_level_id(
-    const AttributionReport::Id& id) {
-  return absl::get<AttributionReport::EventLevelData::Id>(id);
-}
-
-// static
-AttributionReport::AggregatableAttributionData::Id
-UnionTraits<ReportIDDataView, AttributionReport::Id>::
-    aggregatable_attribution_id(const AttributionReport::Id& id) {
-  return absl::get<AttributionReport::AggregatableAttributionData::Id>(id);
-}
-
-// static
-bool UnionTraits<ReportIDDataView, AttributionReport::Id>::Read(
-    ReportIDDataView data,
-    AttributionReport::Id* out) {
-  switch (data.tag()) {
-    case ReportIDDataView::Tag::kEventLevelId: {
-      AttributionReport::EventLevelData::Id event_level_id;
-      if (!data.ReadEventLevelId(&event_level_id))
-        return false;
-      *out = event_level_id;
-      return true;
-    }
-    case ReportIDDataView::Tag::kAggregatableAttributionId: {
-      AttributionReport::AggregatableAttributionData::Id
-          aggregatable_attribution_id;
-      if (!data.ReadAggregatableAttributionId(&aggregatable_attribution_id))
-        return false;
-      *out = aggregatable_attribution_id;
-      return true;
-    }
-  }
-}
-
-// static
-ReportIDDataView::Tag
-UnionTraits<ReportIDDataView, AttributionReport::Id>::GetTag(
-    const AttributionReport::Id& id) {
-  switch (AttributionReport::GetReportType(id)) {
-    case AttributionReport::Type::kEventLevel:
-      return ReportIDDataView::Tag::kEventLevelId;
-    case AttributionReport::Type::kAggregatableAttribution:
-      return ReportIDDataView::Tag::kAggregatableAttributionId;
-  }
-}
-
-}  // namespace mojo

content/browser/attribution_reporting/attribution_internals_mojom_traits.h

diff --git a/content/browser/attribution_reporting/attribution_internals_mojom_traits.h b/content/browser/attribution_reporting/attribution_internals_mojom_traits.h
index be469c7..18a9fe6 100644
--- a/content/browser/attribution_reporting/attribution_internals_mojom_traits.h
+++ b/content/browser/attribution_reporting/attribution_internals_mojom_traits.h
@@ -10,55 +10,20 @@
 #include "content/browser/attribution_reporting/attribution_internals.mojom.h"
 #include "content/browser/attribution_reporting/attribution_report.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
-#include "mojo/public/cpp/bindings/union_traits.h"
 
 namespace mojo {
 
 template <>
-class StructTraits<attribution_internals::mojom::EventLevelReportIDDataView,
-                   content::AttributionReport::EventLevelData::Id> {
+class StructTraits<attribution_internals::mojom::ReportIDDataView,
+                   content::AttributionReport::Id> {
  public:
-  static int64_t value(
-      const content::AttributionReport::EventLevelData::Id& id) {
-    return *id;
-  }
-
-  static bool Read(
-      attribution_internals::mojom::EventLevelReportIDDataView data,
-      content::AttributionReport::EventLevelData::Id* out);
-};
-
-template <>
-class StructTraits<
-    attribution_internals::mojom::AggregatableAttributionReportIDDataView,
-    content::AttributionReport::AggregatableAttributionData::Id> {
- public:
-  static int64_t value(
-      const content::AttributionReport::AggregatableAttributionData::Id& id) {
-    return *id;
-  }
-
-  static bool Read(
-      attribution_internals::mojom::AggregatableAttributionReportIDDataView
-          data,
-      content::AttributionReport::AggregatableAttributionData::Id* out);
-};
-
-template <>
-class UnionTraits<attribution_internals::mojom::ReportIDDataView,
-                  content::AttributionReport::Id> {
- public:
-  static content::AttributionReport::EventLevelData::Id event_level_id(
-      const content::AttributionReport::Id& id);
-
-  static content::AttributionReport::AggregatableAttributionData::Id
-  aggregatable_attribution_id(const content::AttributionReport::Id& id);
+  static int64_t value(const content::AttributionReport::Id& id) { return *id; }
 
   static bool Read(attribution_internals::mojom::ReportIDDataView data,
-                   content::AttributionReport::Id* out);
-
-  static attribution_internals::mojom::ReportIDDataView::Tag GetTag(
-      const content::AttributionReport::Id& id);
+                   content::AttributionReport::Id* out) {
+    *out = content::AttributionReport::Id(data.value());
+    return true;
+  }
 };
 
 }  // namespace mojo

content/browser/attribution_reporting/attribution_manager.cc

diff --git a/content/browser/attribution_reporting/attribution_manager.cc b/content/browser/attribution_reporting/attribution_manager.cc
index b218cea3..b59558f 100644
--- a/content/browser/attribution_reporting/attribution_manager.cc
+++ b/content/browser/attribution_reporting/attribution_manager.cc
@@ -30,7 +30,7 @@
 }
 
 // static
-attribution_reporting::mojom::OsSupport AttributionManager::GetOsSupport() {
+network::mojom::AttributionOsSupport AttributionManager::GetOsSupport() {
   return AttributionManagerImpl::GetOsSupport();
 }
 

content/browser/attribution_reporting/attribution_manager.h

diff --git a/content/browser/attribution_reporting/attribution_manager.h b/content/browser/attribution_reporting/attribution_manager.h
index b8d1599d..a45375e8 100644
--- a/content/browser/attribution_reporting/attribution_manager.h
+++ b/content/browser/attribution_reporting/attribution_manager.h
@@ -11,13 +11,13 @@
 #include "base/functional/callback_forward.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
-#include "components/attribution_reporting/os_support.mojom-forward.h"
 #include "components/attribution_reporting/source_registration_error.mojom-forward.h"
 #include "components/attribution_reporting/source_type.mojom-forward.h"
 #include "content/browser/attribution_reporting/attribution_report.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/attribution_data_model.h"
 #include "content/public/browser/storage_partition.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 
 namespace attribution_reporting {
 class SuitableOrigin;
@@ -52,7 +52,7 @@
 
   static AttributionManager* FromBrowserContext(BrowserContext*);
 
-  static attribution_reporting::mojom::OsSupport GetOsSupport();
+  static network::mojom::AttributionOsSupport GetOsSupport();
 
   ~AttributionManager() override = default;
 

content/browser/attribution_reporting/attribution_manager_impl.cc

diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc
index a906864..d252a5c5 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl.cc
+++ b/content/browser/attribution_reporting/attribution_manager_impl.cc
@@ -33,7 +33,6 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "components/attribution_reporting/source_registration.h"
 #include "components/attribution_reporting/source_registration_error.mojom.h"
 #include "components/attribution_reporting/suitable_origin.h"
@@ -73,10 +72,11 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
+#include "services/network/public/cpp/features.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "services/network/public/mojom/network_change_manager.mojom-forward.h"
 #include "storage/browser/quota/special_storage_policy.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
-#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/storage_key/storage_key.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -449,11 +449,11 @@
 }
 
 // static
-attribution_reporting::mojom::OsSupport AttributionManagerImpl::GetOsSupport() {
+network::mojom::AttributionOsSupport AttributionManagerImpl::GetOsSupport() {
 #if BUILDFLAG(IS_ANDROID)
   return AttributionOsLevelManagerAndroid::GetOsSupport();
 #else
-  return attribution_reporting::mojom::OsSupport::kDisabled;
+  return network::mojom::AttributionOsSupport::kDisabled;
 #endif
 }
 
@@ -518,7 +518,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
   if (base::FeatureList::IsEnabled(
-          blink::features::kAttributionReportingCrossAppWeb)) {
+          network::features::kAttributionReportingCrossAppWeb)) {
     attribution_os_level_manager_ =
         std::make_unique<AttributionOsLevelManagerAndroid>();
   }
@@ -754,16 +754,14 @@
     return;
   }
 
-  const auto* data =
-      absl::get_if<AttributionReport::AggregatableAttributionData>(
-          &report.data());
-  DCHECK(data);
+  DCHECK_EQ(report.GetReportType(),
+            AttributionReport::Type::kAggregatableAttribution);
 
   auto [it, inserted] = pending_aggregatable_reports_.try_emplace(
-      data->id, PendingReportTimings{
-                    .creation_time = base::Time::Now(),
-                    .report_time = report.report_time(),
-                });
+      report.id(), PendingReportTimings{
+                       .creation_time = base::Time::Now(),
+                       .report_time = report.report_time(),
+                   });
   DCHECK(inserted);
 }
 
@@ -967,7 +965,7 @@
   for (AttributionReport& report : reports) {
     DCHECK_LE(report.report_time(), now);
 
-    bool inserted = reports_being_sent_.emplace(report.ReportId()).second;
+    bool inserted = reports_being_sent_.emplace(report.id()).second;
     if (!inserted) {
       if (web_ui_callback) {
         web_ui_callback.Run();
@@ -976,11 +974,9 @@
       continue;
     }
 
-    if (auto id = report.ReportId();
-        const auto* aggregatable_id =
-            absl::get_if<AttributionReport::AggregatableAttributionData::Id>(
-                &id)) {
-      pending_aggregatable_reports_.erase(*aggregatable_id);
+    if (report.GetReportType() ==
+        AttributionReport::Type::kAggregatableAttribution) {
+      pending_aggregatable_reports_.erase(report.id());
     }
 
     if (!IsReportAllowed(report)) {
@@ -1060,13 +1056,13 @@
           manager->NotifyReportsChanged();
         }
       },
-      std::move(done), weak_factory_.GetWeakPtr(), report.ReportId(),
+      std::move(done), weak_factory_.GetWeakPtr(), report.id(),
       new_report_time);
 
   if (new_report_time) {
     attribution_storage_
         .AsyncCall(&AttributionStorage::UpdateReportForSendFailure)
-        .WithArgs(report.ReportId(), *new_report_time)
+        .WithArgs(report.id(), *new_report_time)
         .Then(std::move(then));
 
     // TODO(apaseltiner): Consider surfacing retry attempts in internals UI.
@@ -1075,7 +1071,7 @@
   }
 
   attribution_storage_.AsyncCall(&AttributionStorage::DeleteReport)
-      .WithArgs(report.ReportId())
+      .WithArgs(report.id())
       .Then(std::move(then));
 
   LogMetricsOnReportCompleted(report, info.status);

content/browser/attribution_reporting/attribution_manager_impl.h

diff --git a/content/browser/attribution_reporting/attribution_manager_impl.h b/content/browser/attribution_reporting/attribution_manager_impl.h
index 7a3d9701..a1d2878 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl.h
+++ b/content/browser/attribution_reporting/attribution_manager_impl.h
@@ -113,7 +113,7 @@
       const base::FilePath& user_data_directory,
       scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy);
 
-  static attribution_reporting::mojom::OsSupport GetOsSupport();
+  static network::mojom::AttributionOsSupport GetOsSupport();
 
   AttributionManagerImpl(
       StoragePartitionImpl* storage_partition,
@@ -311,8 +311,7 @@
   // We keep track of pending reports timings in memory to record metrics
   // when the browser becomes unavailable to send reports due to becoming
   // offline or being shutdown.
-  base::flat_map<AttributionReport::AggregatableAttributionData::Id,
-                 PendingReportTimings>
+  base::flat_map<AttributionReport::Id, PendingReportTimings>
       pending_aggregatable_reports_;
 
   base::ObserverList<AttributionObserver> observers_;

content/browser/attribution_reporting/attribution_manager_impl_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc b/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc
index 1be24cd6..5aed11b 100644
--- a/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc
@@ -1299,7 +1299,7 @@
 
   checkpoint.Call(1);
 
-  attribution_manager_->SendReportsForWebUI({reports.front().ReportId()},
+  attribution_manager_->SendReportsForWebUI({reports.front().id()},
                                             base::DoNothing());
   task_environment_.FastForwardBy(base::TimeDelta());
 }
@@ -1336,7 +1336,7 @@
   checkpoint.Call(1);
 
   attribution_manager_->SendReportsForWebUI(
-      {reports.front().ReportId(), reports.back().ReportId()},
+      {reports.front().id(), reports.back().id()},
       base::BindLambdaForTesting([&]() { callback_calls++; }));
   task_environment_.FastForwardBy(base::TimeDelta());
   EXPECT_EQ(callback_calls, 0u);
@@ -2027,8 +2027,8 @@
 
   EXPECT_CALL(*report_sender_, SendReport(_, /*is_debug_report=*/false, _));
 
-  attribution_manager_->SendReportsForWebUI(
-      {AttributionReport::EventLevelData::Id(1)}, base::DoNothing());
+  attribution_manager_->SendReportsForWebUI({AttributionReport::Id(1)},
+                                            base::DoNothing());
   task_environment_.FastForwardBy(base::TimeDelta());
 
   histograms.ExpectTotalCount("Conversions.ExtraReportDelay2", 0);

content/browser/attribution_reporting/attribution_os_level_manager_android.cc

diff --git a/content/browser/attribution_reporting/attribution_os_level_manager_android.cc b/content/browser/attribution_reporting/attribution_os_level_manager_android.cc
index d7129a6..7e63f39 100644
--- a/content/browser/attribution_reporting/attribution_os_level_manager_android.cc
+++ b/content/browser/attribution_reporting/attribution_os_level_manager_android.cc
@@ -21,13 +21,13 @@
 #include "base/ranges/algorithm.h"
 #include "base/sequence_checker.h"
 #include "base/time/time.h"
-#include "components/attribution_reporting/os_support.mojom-shared.h"
 #include "content/browser/attribution_reporting/attribution_input_event.h"
 #include "content/browser/attribution_reporting/attribution_reporting.mojom.h"
 #include "content/browser/attribution_reporting/os_registration.h"
 #include "content/public/android/content_jni_headers/AttributionOsLevelManager_jni.h"
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "content/public/browser/render_process_host.h"
+#include "services/network/public/mojom/attribution.mojom-shared.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/android/gurl_android.h"
 #include "url/gurl.h"
@@ -40,7 +40,7 @@
 using ScopedOsSupportForTesting =
     ::content::AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting;
 
-using attribution_reporting::mojom::OsSupport;
+using network::mojom::AttributionOsSupport;
 
 #if DCHECK_IS_ON()
 const base::SequenceChecker& GetSequenceChecker() {
@@ -52,12 +52,14 @@
 // This flag is per device and can only be changed by the OS. Currently we don't
 // observe setting changes on the device and the flag is only initialized once
 // on startup. The value may vary in tests.
-absl::optional<OsSupport> g_os_support GUARDED_BY_CONTEXT(GetSequenceChecker());
+absl::optional<AttributionOsSupport> g_os_support
+    GUARDED_BY_CONTEXT(GetSequenceChecker());
 
-void SetOsSupport(OsSupport os_support) {
+void SetOsSupport(AttributionOsSupport os_support) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(GetSequenceChecker());
 
-  OsSupport previous = AttributionOsLevelManagerAndroid::GetOsSupport();
+  AttributionOsSupport previous =
+      AttributionOsLevelManagerAndroid::GetOsSupport();
 
   g_os_support = os_support;
 
@@ -97,7 +99,7 @@
   }
 }
 
-OsSupport ConvertToOsSupport(int value) {
+AttributionOsSupport ConvertToOsSupport(int value) {
   // See
   // https://developer.android.com/reference/androidx/privacysandbox/ads/adservices/measurement/MeasurementManager
   // for constant values.
@@ -106,11 +108,11 @@
 
   switch (value) {
     case kMeasurementApiStateDisabled:
-      return OsSupport::kDisabled;
+      return AttributionOsSupport::kDisabled;
     case kMeasurementApiStateEnabled:
-      return OsSupport::kEnabled;
+      return AttributionOsSupport::kEnabled;
     default:
-      return OsSupport::kDisabled;
+      return AttributionOsSupport::kDisabled;
   }
 }
 
@@ -122,7 +124,8 @@
   SetOsSupport(ConvertToOsSupport(state));
 }
 
-ScopedOsSupportForTesting::ScopedOsSupportForTesting(OsSupport os_support)
+ScopedOsSupportForTesting::ScopedOsSupportForTesting(
+    AttributionOsSupport os_support)
     : previous_(GetOsSupport()) {
   SetOsSupport(os_support);
 }
@@ -132,9 +135,9 @@
 }
 
 // static
-OsSupport AttributionOsLevelManagerAndroid::GetOsSupport() {
+AttributionOsSupport AttributionOsLevelManagerAndroid::GetOsSupport() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(GetSequenceChecker());
-  return g_os_support.value_or(OsSupport::kDisabled);
+  return g_os_support.value_or(AttributionOsSupport::kDisabled);
 }
 
 AttributionOsLevelManagerAndroid::AttributionOsLevelManagerAndroid() {
@@ -219,7 +222,7 @@
   }
 
   // Only make the async call once.
-  g_os_support.emplace(OsSupport::kDisabled);
+  g_os_support.emplace(AttributionOsSupport::kDisabled);
 
   Java_AttributionOsLevelManager_getMeasurementApiStatus(
       base::android::AttachCurrentThread(), jobj_);

content/browser/attribution_reporting/attribution_os_level_manager_android.h

diff --git a/content/browser/attribution_reporting/attribution_os_level_manager_android.h b/content/browser/attribution_reporting/attribution_os_level_manager_android.h
index 7e58724..738d65d2 100644
--- a/content/browser/attribution_reporting/attribution_os_level_manager_android.h
+++ b/content/browser/attribution_reporting/attribution_os_level_manager_android.h
@@ -13,9 +13,9 @@
 #include "base/functional/callback_forward.h"
 #include "base/sequence_checker.h"
 #include "base/thread_annotations.h"
-#include "components/attribution_reporting/os_support.mojom-forward.h"
 #include "content/browser/attribution_reporting/attribution_os_level_manager.h"
 #include "content/common/content_export.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 
 namespace content {
 
@@ -26,7 +26,7 @@
  public:
   class CONTENT_EXPORT ScopedOsSupportForTesting {
    public:
-    explicit ScopedOsSupportForTesting(attribution_reporting::mojom::OsSupport);
+    explicit ScopedOsSupportForTesting(network::mojom::AttributionOsSupport);
     ~ScopedOsSupportForTesting();
 
     ScopedOsSupportForTesting(const ScopedOsSupportForTesting&) = delete;
@@ -37,12 +37,12 @@
     ScopedOsSupportForTesting& operator=(ScopedOsSupportForTesting&&) = delete;
 
    private:
-    const attribution_reporting::mojom::OsSupport previous_;
+    const network::mojom::AttributionOsSupport previous_;
   };
 
   // Returns whether OS-level attribution is enabled. `kDisabled` is returned
   // before the result is returned from JNI.
-  static attribution_reporting::mojom::OsSupport GetOsSupport();
+  static network::mojom::AttributionOsSupport GetOsSupport();
 
   AttributionOsLevelManagerAndroid();
   ~AttributionOsLevelManagerAndroid() override;

content/browser/attribution_reporting/attribution_report.cc

diff --git a/content/browser/attribution_reporting/attribution_report.cc b/content/browser/attribution_reporting/attribution_report.cc
index bb57715..93e8232 100644
--- a/content/browser/attribution_reporting/attribution_report.cc
+++ b/content/browser/attribution_reporting/attribution_report.cc
@@ -32,12 +32,10 @@
 AttributionReport::EventLevelData::EventLevelData(
     uint64_t trigger_data,
     int64_t priority,
-    double randomized_trigger_rate,
-    Id id)
+    double randomized_trigger_rate)
     : trigger_data(trigger_data),
       priority(priority),
-      randomized_trigger_rate(randomized_trigger_rate),
-      id(id) {
+      randomized_trigger_rate(randomized_trigger_rate) {
   DCHECK_GE(randomized_trigger_rate, 0);
   DCHECK_LE(randomized_trigger_rate, 1);
 }
@@ -59,12 +57,10 @@
 
 AttributionReport::AggregatableAttributionData::AggregatableAttributionData(
     std::vector<AggregatableHistogramContribution> contributions,
-    Id id,
     ::aggregation_service::mojom::AggregationCoordinator
         aggregation_coordinator,
     absl::optional<std::string> attestation_token)
     : contributions(std::move(contributions)),
-      id(id),
       attestation_token(std::move(attestation_token)),
       aggregation_coordinator(aggregation_coordinator) {}
 
@@ -98,12 +94,14 @@
 }
 
 AttributionReport::AttributionReport(AttributionInfo attribution_info,
+                                     Id id,
                                      base::Time report_time,
                                      base::Time initial_report_time,
-                                     base::GUID external_report_id,
+                                     base::Uuid external_report_id,
                                      int failed_send_attempts,
                                      Data data)
     : attribution_info_(std::move(attribution_info)),
+      id_(id),
       report_time_(report_time),
       initial_report_time_(initial_report_time),
       external_report_id_(std::move(external_report_id)),
@@ -222,16 +220,12 @@
       data_);
 }
 
-AttributionReport::Id AttributionReport::ReportId() const {
-  return absl::visit([](const auto& v) { return Id(v.id); }, data_);
-}
-
 void AttributionReport::set_report_time(base::Time report_time) {
   report_time_ = report_time;
 }
 
 void AttributionReport::SetExternalReportIdForTesting(
-    base::GUID external_report_id) {
+    base::Uuid external_report_id) {
   DCHECK(external_report_id.is_valid());
   external_report_id_ = std::move(external_report_id);
 }

content/browser/attribution_reporting/attribution_report.h

diff --git a/content/browser/attribution_reporting/attribution_report.h b/content/browser/attribution_reporting/attribution_report.h
index a70ff89..8058f1e 100644
--- a/content/browser/attribution_reporting/attribution_report.h
+++ b/content/browser/attribution_reporting/attribution_report.h
@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>
 
-#include "base/guid.h"
 #include "base/numerics/checked_math.h"
 #include "base/time/time.h"
 #include "base/types/strong_alias.h"
+#include "base/uuid.h"
 #include "base/values.h"
 #include "components/aggregation_service/aggregation_service.mojom-forward.h"
 #include "content/browser/aggregation_service/aggregatable_report.h"
@@ -38,14 +38,13 @@
  public:
   using Type = ::attribution_reporting::mojom::ReportType;
 
+  using Id = base::StrongAlias<AttributionReport, int64_t>;
+
   // Struct that contains the data specific to the event-level report.
   struct CONTENT_EXPORT EventLevelData {
-    using Id = base::StrongAlias<EventLevelData, int64_t>;
-
     EventLevelData(uint64_t trigger_data,
                    int64_t priority,
-                   double randomized_trigger_rate,
-                   Id id);
+                   double randomized_trigger_rate);
     // This is added to allow default construction of
     // `AttributionReport::Data()`.
     EventLevelData();
@@ -67,20 +66,14 @@
     // registered.
     double randomized_trigger_rate;
 
-    // Id assigned by storage to uniquely identify a completed conversion.
-    Id id;
-
     // When adding new members, the corresponding `operator==()` definition in
     // `attribution_test_utils.h` should also be updated.
   };
 
   // Struct that contains the data specific to the aggregatable report.
   struct CONTENT_EXPORT AggregatableAttributionData {
-    using Id = base::StrongAlias<AggregatableAttributionData, int64_t>;
-
     AggregatableAttributionData(
         std::vector<AggregatableHistogramContribution> contributions,
-        Id id,
         ::aggregation_service::mojom::AggregationCoordinator
             aggregation_coordinator,
         absl::optional<std::string> attestation_token);
@@ -104,9 +97,6 @@
     // The historgram contributions.
     std::vector<AggregatableHistogramContribution> contributions;
 
-    // Id assigned by storage to uniquely identify an aggregatable contribution.
-    Id id;
-
     // The report assembled by the aggregation service. If null, the report has
     // not been assembled yet.
     absl::optional<AggregatableReport> assembled_report;
@@ -122,24 +112,18 @@
     // `attribution_test_utils.h` should also be updated.
   };
 
-  // TODO(linnan): Use a single Id type for both types of reports.
-  using Id = absl::variant<EventLevelData::Id, AggregatableAttributionData::Id>;
-
   using Data = absl::variant<EventLevelData, AggregatableAttributionData>;
 
-  static Type GetReportType(Id report_id) {
-    return static_cast<Type>(report_id.index());
-  }
-
   // Returns the minimum non-null time of `a` and `b`, or `absl::nullopt` if
   // both are null.
   static absl::optional<base::Time> MinReportTime(absl::optional<base::Time> a,
                                                   absl::optional<base::Time> b);
 
   AttributionReport(AttributionInfo attribution_info,
+                    Id id,
                     base::Time report_time,
                     base::Time initial_report_time,
-                    base::GUID external_report_id,
+                    base::Uuid external_report_id,
                     int failed_send_attempts,
                     Data data);
   AttributionReport(const AttributionReport&);
@@ -156,15 +140,15 @@
   // Populate additional headers that should be sent alongside the report.
   void PopulateAdditionalHeaders(net::HttpRequestHeaders&) const;
 
-  Id ReportId() const;
-
   const AttributionInfo& attribution_info() const { return attribution_info_; }
 
+  Id id() const { return id_; }
+
   base::Time report_time() const { return report_time_; }
 
   base::Time initial_report_time() const { return initial_report_time_; }
 
-  const base::GUID& external_report_id() const { return external_report_id_; }
+  const base::Uuid& external_report_id() const { return external_report_id_; }
 
   int failed_send_attempts() const { return failed_send_attempts_; }
 
@@ -174,14 +158,19 @@
 
   Type GetReportType() const { return static_cast<Type>(data_.index()); }
 
+  void set_id(Id id) { id_ = id; }
+
   void set_report_time(base::Time report_time);
 
-  void SetExternalReportIdForTesting(base::GUID external_report_id);
+  void SetExternalReportIdForTesting(base::Uuid external_report_id);
 
  private:
   // The attribution info.
   AttributionInfo attribution_info_;
 
+  // Id assigned by storage to uniquely identify an attribution report.
+  Id id_;
+
   // The time this conversion report should be sent.
   base::Time report_time_;
 
@@ -190,7 +179,7 @@
 
   // External report ID for deduplicating reports received by the reporting
   // origin.
-  base::GUID external_report_id_;
+  base::Uuid external_report_id_;
 
   // Number of times the browser has tried and failed to send this report.
   int failed_send_attempts_;

content/browser/attribution_reporting/attribution_src_browsertest.cc

diff --git a/content/browser/attribution_reporting/attribution_src_browsertest.cc b/content/browser/attribution_reporting/attribution_src_browsertest.cc
index 0d5693e..8554160 100644
--- a/content/browser/attribution_reporting/attribution_src_browsertest.cc
+++ b/content/browser/attribution_reporting/attribution_src_browsertest.cc
@@ -20,7 +20,6 @@
 #include "components/attribution_reporting/aggregatable_dedup_key.h"
 #include "components/attribution_reporting/aggregatable_trigger_data.h"
 #include "components/attribution_reporting/event_trigger_data.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "components/attribution_reporting/registration_type.mojom.h"
 #include "components/attribution_reporting/source_registration.h"
 #include "components/attribution_reporting/suitable_origin.h"
@@ -47,10 +46,10 @@
 #include "net/test/embedded_test_server/controllable_http_response.h"
 #include "net/test/embedded_test_server/default_handlers.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "services/network/public/cpp/features.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/numeric/int128.h"
-#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/navigation/impression.h"
 #include "third_party/blink/public/mojom/conversions/attribution_data_host.mojom.h"
 #include "third_party/blink/public/mojom/fenced_frame/fenced_frame.mojom.h"
@@ -58,6 +57,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "content/browser/attribution_reporting/attribution_os_level_manager_android.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #endif
 
 namespace content {
@@ -1024,7 +1024,7 @@
 
  private:
   base::test::ScopedFeatureList scoped_feature_list{
-      blink::features::kAttributionReportingCrossAppWeb};
+      network::features::kAttributionReportingCrossAppWeb};
 };
 
 IN_PROC_BROWSER_TEST_F(AttributionSrcCrossAppWebEnabledBrowserTest,
@@ -1075,9 +1075,26 @@
 
 #if BUILDFLAG(IS_ANDROID)
 
-IN_PROC_BROWSER_TEST_F(
-    AttributionSrcCrossAppWebEnabledBrowserTest,
-    OsLevelEnabledPriorToRendererInitialization_SetsSupportHeader) {
+class AttributionSrcCrossAppWebEnabledSubresourceBrowserTest
+    : public AttributionSrcCrossAppWebEnabledBrowserTest,
+      public ::testing::WithParamInterface<
+          std::pair<std::string, std::string>> {};
+
+INSTANTIATE_TEST_SUITE_P(
+    All,
+    AttributionSrcCrossAppWebEnabledSubresourceBrowserTest,
+    ::testing::Values(
+        std::make_pair("attributionsrcimg", "createAttributionSrcImg($1)"),
+        std::make_pair("attributionsrcscript",
+                       "createAttributionSrcScript($1)"),
+        std::make_pair("img", "createAttributionEligibleImgSrc($1)"),
+        std::make_pair("script", "createAttributionSrcScript($1)"),
+        std::make_pair("fetch", "doAttributionEligibleFetch($1)"),
+        std::make_pair("xhr", "doAttributionEligibleXHR($1)")),
+    [](const auto& info) { return info.param.first; });  // test name generator
+
+IN_PROC_BROWSER_TEST_P(AttributionSrcCrossAppWebEnabledSubresourceBrowserTest,
+                       Register) {
   // Create a separate server as we cannot register a `ControllableHttpResponse`
   // after the server starts.
   auto https_server = std::make_unique<net::EmbeddedTestServer>(
@@ -1097,16 +1114,16 @@
   ASSERT_TRUE(https_server->Start());
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   GURL page_url =
       https_server->GetURL("b.test", "/page_with_impression_creator.html");
   ASSERT_TRUE(NavigateToURL(web_contents(), page_url));
 
-  GURL register_url = https_server->GetURL("d.test", "/register_source1");
-  ASSERT_TRUE(ExecJs(web_contents(),
-                     JsReplace("createAttributionSrcImg($1);", register_url)));
+  const std::string& js_template = GetParam().second;
+
+  GURL register_url = https_server->GetURL("b.test", "/register_source1");
+  ASSERT_TRUE(ExecJs(web_contents(), JsReplace(js_template, register_url)));
 
   register_response1->WaitForRequest();
   ASSERT_EQ(register_response1->http_request()->headers.at(
@@ -1152,8 +1169,7 @@
   ASSERT_TRUE(NavigateToURL(web_contents(), page_url));
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   GURL register_url = https_server->GetURL("d.test", "/register_source1");
   ASSERT_TRUE(ExecJs(web_contents(),
@@ -1235,8 +1251,7 @@
   ASSERT_TRUE(https_server->Start());
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   GURL page_url =
       https_server->GetURL("b.test", "/page_with_impression_creator.html");

content/browser/attribution_reporting/attribution_storage_delegate.h

diff --git a/content/browser/attribution_reporting/attribution_storage_delegate.h b/content/browser/attribution_reporting/attribution_storage_delegate.h
index b0d03fc..2dcad0e 100644
--- a/content/browser/attribution_reporting/attribution_storage_delegate.h
+++ b/content/browser/attribution_reporting/attribution_storage_delegate.h
@@ -9,10 +9,10 @@
 
 #include <vector>
 
-#include "base/guid.h"
 #include "base/sequence_checker.h"
 #include "base/thread_annotations.h"
 #include "base/time/time.h"
+#include "base/uuid.h"
 #include "components/attribution_reporting/source_type.mojom-forward.h"
 #include "content/browser/attribution_reporting/attribution_config.h"
 #include "content/browser/attribution_reporting/attribution_reporting.mojom-forward.h"
@@ -102,7 +102,7 @@
   virtual base::TimeDelta GetDeleteExpiredRateLimitsFrequency() const = 0;
 
   // Returns a new report ID.
-  virtual base::GUID NewReportID() const = 0;
+  virtual base::Uuid NewReportID() const = 0;
 
   // Delays reports that missed their report time, such as the browser not
   // being open, or internet being disconnected. This gives them a noisy

content/browser/attribution_reporting/attribution_storage_delegate_impl.cc

diff --git a/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc b/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc
index c397c077..c8f244b 100644
--- a/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc
+++ b/content/browser/attribution_reporting/attribution_storage_delegate_impl.cc
@@ -13,12 +13,12 @@
 
 #include "base/check_op.h"
 #include "base/cxx17_backports.h"
-#include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
+#include "base/uuid.h"
 #include "components/attribution_reporting/source_type.mojom.h"
 #include "content/browser/attribution_reporting/attribution_config.h"
 #include "content/browser/attribution_reporting/attribution_constants.h"
@@ -175,9 +175,9 @@
   }
 }
 
-base::GUID AttributionStorageDelegateImpl::NewReportID() const {
+base::Uuid AttributionStorageDelegateImpl::NewReportID() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  return base::GUID::GenerateRandomV4();
+  return base::Uuid::GenerateRandomV4();
 }
 
 absl::optional<AttributionStorageDelegate::OfflineReportDelayConfig>

content/browser/attribution_reporting/attribution_storage_delegate_impl.h

diff --git a/content/browser/attribution_reporting/attribution_storage_delegate_impl.h b/content/browser/attribution_reporting/attribution_storage_delegate_impl.h
index 380160f..110fa73 100644
--- a/content/browser/attribution_reporting/attribution_storage_delegate_impl.h
+++ b/content/browser/attribution_reporting/attribution_storage_delegate_impl.h
@@ -72,7 +72,7 @@
   base::Time GetAggregatableReportTime(base::Time trigger_time) const override;
   base::TimeDelta GetDeleteExpiredSourcesFrequency() const override;
   base::TimeDelta GetDeleteExpiredRateLimitsFrequency() const override;
-  base::GUID NewReportID() const override;
+  base::Uuid NewReportID() const override;
   absl::optional<OfflineReportDelayConfig> GetOfflineReportDelayConfig()
       const override;
   void ShuffleReports(std::vector<AttributionReport>& reports) override;

content/browser/attribution_reporting/attribution_storage_delegate_impl_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_storage_delegate_impl_unittest.cc b/content/browser/attribution_reporting/attribution_storage_delegate_impl_unittest.cc
index cd21c76..d72f12b 100644
--- a/content/browser/attribution_reporting/attribution_storage_delegate_impl_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_storage_delegate_impl_unittest.cc
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/containers/flat_map.h"
-#include "base/guid.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
 #include "components/attribution_reporting/source_type.mojom.h"

content/browser/attribution_reporting/attribution_storage_sql.cc

diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
index eac6dba..acad128 100644
--- a/content/browser/attribution_reporting/attribution_storage_sql.cc
+++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
@@ -20,7 +20,6 @@
 #include "base/files/file_util.h"
 #include "base/functional/bind.h"
 #include "base/functional/overloaded.h"
-#include "base/guid.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
@@ -28,6 +27,7 @@
 #include "base/numerics/checked_math.h"
 #include "base/ranges/algorithm.h"
 #include "base/time/time.h"
+#include "base/uuid.h"
 #include "components/aggregation_service/aggregation_service.mojom.h"
 #include "components/attribution_reporting/aggregatable_dedup_key.h"
 #include "components/attribution_reporting/aggregatable_trigger_data.h"
@@ -521,19 +521,6 @@
   return user_data_directory.Append(kDatabasePath);
 }
 
-int64_t GetRawId(AttributionReport::Id id) {
-  return absl::visit([](auto v) { return *v; }, id);
-}
-
-AttributionReport::Id FromRawId(int64_t id, AttributionReport::Type type) {
-  switch (type) {
-    case AttributionReport::Type::kEventLevel:
-      return AttributionReport::EventLevelData::Id(id);
-    case AttributionReport::Type::kAggregatableAttribution:
-      return AttributionReport::AggregatableAttributionData::Id(id);
-  }
-}
-
 }  // namespace
 
 // static
@@ -768,13 +755,12 @@
           AttributionInfo(stored_source, fake_report.trigger_time,
                           /*debug_key=*/absl::nullopt,
                           /*context_origin=*/common_info.source_origin()),
-          fake_report.report_time,
+          AttributionReport::Id(kUnsetReportId), fake_report.report_time,
           /*initial_report_time=*/fake_report.report_time,
           delegate_->NewReportID(), /*failed_send_attempts=*/0,
-          AttributionReport::EventLevelData(
-              fake_report.trigger_data, /*priority=*/0,
-              /*randomized_trigger_rate=*/0,
-              AttributionReport::EventLevelData::Id(kUnsetReportId)));
+          AttributionReport::EventLevelData(fake_report.trigger_data,
+                                            /*priority=*/0,
+                                            /*randomized_trigger_rate=*/0));
       if (!StoreAttributionReport(fake_attribution_report)) {
         return StoreSourceResult(StorableSource::Result::kInternalError);
       }
@@ -843,8 +829,7 @@
   min_priority_statement.BindInt64(0, *source.source_id());
   min_priority_statement.BindTime(1, report.report_time());
 
-  absl::optional<AttributionReport::EventLevelData::Id>
-      conversion_id_with_min_priority;
+  absl::optional<AttributionReport::Id> conversion_id_with_min_priority;
   int64_t min_priority;
   base::Time max_trigger_time;
 
@@ -1308,12 +1293,12 @@
   // TODO(apaseltiner): Consider informing the manager if the trigger
   // data was out of range for DevTools issue reporting.
   report = AttributionReport(
-      attribution_info, report_time, /*initial_report_time=*/report_time,
-      delegate_->NewReportID(), /*failed_send_attempts=*/0,
+      attribution_info, AttributionReport::Id(kUnsetReportId), report_time,
+      /*initial_report_time=*/report_time, delegate_->NewReportID(),
+      /*failed_send_attempts=*/0,
       AttributionReport::EventLevelData(
           delegate_->SanitizeTriggerData(event_trigger->data, source_type),
-          event_trigger->priority, randomized_response_rate,
-          AttributionReport::EventLevelData::Id(kUnsetReportId)));
+          event_trigger->priority, randomized_response_rate));
 
   dedup_key = event_trigger->dedup_key;
 
@@ -1437,8 +1422,8 @@
   base::Time report_time = statement.ColumnTime(col++);
   base::Time initial_report_time = statement.ColumnTime(col++);
   int failed_send_attempts = statement.ColumnInt(col++);
-  base::GUID external_report_id =
-      base::GUID::ParseLowercase(statement.ColumnString(col++));
+  base::Uuid external_report_id =
+      base::Uuid::ParseLowercase(statement.ColumnString(col++));
   absl::optional<uint64_t> trigger_debug_key =
       ColumnUint64OrNull(statement, col++);
   auto context_origin =
@@ -1466,8 +1451,7 @@
       auto& event_level_data = data.emplace<AttributionReport::EventLevelData>(
           /*trigger_data=*/0, /*priority=*/0,
           delegate_->GetRandomizedResponseRate(
-              source_data->source.common_info().source_type()),
-          AttributionReport::EventLevelData::Id(report_id));
+              source_data->source.common_info().source_type()));
       if (!DeserializeReportMetadata(metadata, event_level_data)) {
         return absl::nullopt;
       }
@@ -1476,8 +1460,6 @@
     case AttributionReport::Type::kAggregatableAttribution: {
       auto& aggregatable_data =
           data.emplace<AttributionReport::AggregatableAttributionData>();
-      aggregatable_data.id =
-          AttributionReport::AggregatableAttributionData::Id(report_id);
       if (!DeserializeReportMetadata(
               metadata, delegate_->GetAggregatableBudgetPerSource(),
               aggregatable_data)) {
@@ -1490,8 +1472,8 @@
   return AttributionReport(
       AttributionInfo(std::move(source_data->source), trigger_time,
                       trigger_debug_key, std::move(*context_origin)),
-      report_time, initial_report_time, std::move(external_report_id),
-      failed_send_attempts, std::move(data));
+      AttributionReport::Id(report_id), report_time, initial_report_time,
+      std::move(external_report_id), failed_send_attempts, std::move(data));
 }
 
 std::vector<AttributionReport> AttributionStorageSql::GetAttributionReports(
@@ -1578,7 +1560,7 @@
     AttributionReport::Id id) {
   sql::Statement statement(db_.GetCachedStatement(
       SQL_FROM_HERE, attribution_queries::kGetReportSql));
-  statement.BindInt64(0, GetRawId(id));
+  statement.BindInt64(0, *id);
 
   if (!statement.Step()) {
     return absl::nullopt;
@@ -1646,7 +1628,7 @@
       "DELETE FROM reports WHERE report_id=?";
   sql::Statement statement(
       db_.GetCachedStatement(SQL_FROM_HERE, kDeleteReportSql));
-  statement.BindInt64(0, GetRawId(report_id));
+  statement.BindInt64(0, *report_id);
   return statement.Run();
 }
 
@@ -1661,7 +1643,7 @@
   sql::Statement statement(db_.GetCachedStatement(
       SQL_FROM_HERE, attribution_queries::kUpdateFailedReportSql));
   statement.BindTime(0, new_report_time);
-  statement.BindInt64(1, GetRawId(report_id));
+  statement.BindInt64(1, *report_id);
   return statement.Run() && db_.GetLastChangeCount() == 1;
 }
 
@@ -2411,21 +2393,17 @@
           statement.GetColumnType(3) != sql::ColumnType::kNull) {
         absl::optional<AttributionReport::Type> report_type =
             DeserializeReportType(statement.ColumnInt(3));
-        // TODO(linnan): Delete report even if report type is invalid.
-        if (!report_type) {
-          continue;
+        if (report_type) {
+          switch (*report_type) {
+            case AttributionReport::Type::kEventLevel:
+              ++num_event_reports_deleted;
+              break;
+            case AttributionReport::Type::kAggregatableAttribution:
+              ++num_aggregatable_reports_deleted;
+              break;
+          }
         }
-
-        int64_t report_id = statement.ColumnInt64(2);
-        switch (*report_type) {
-          case AttributionReport::Type::kEventLevel:
-            ++num_event_reports_deleted;
-            break;
-          case AttributionReport::Type::kAggregatableAttribution:
-            ++num_aggregatable_reports_deleted;
-            break;
-        }
-        if (!DeleteReport(FromRawId(report_id, *report_type))) {
+        if (!DeleteReport(AttributionReport::Id(statement.ColumnInt64(2)))) {
           return false;
         }
       }
@@ -2597,16 +2575,16 @@
         trigger.attestation().has_value());
   }
 
-  base::GUID external_report_id =
+  base::Uuid external_report_id =
       trigger.attestation().has_value()
           ? trigger.attestation()->aggregatable_report_id()
           : delegate_->NewReportID();
   report = AttributionReport(
-      attribution_info, report_time, /*initial_report_time=*/report_time,
-      std::move(external_report_id), /*failed_send_attempts=*/0,
+      attribution_info, AttributionReport::Id(kUnsetReportId), report_time,
+      /*initial_report_time=*/report_time, std::move(external_report_id),
+      /*failed_send_attempts=*/0,
       AttributionReport::AggregatableAttributionData(
           std::move(contributions),
-          AttributionReport::AggregatableAttributionData::Id(kUnsetReportId),
           trigger_registration.aggregation_coordinator,
           std::move(attestation_token)));
 
@@ -2646,18 +2624,7 @@
     return false;
   }
 
-  int64_t report_id = db_.GetLastInsertRowId();
-  absl::visit(
-      base::Overloaded{
-          [report_id](AttributionReport::EventLevelData& data) {
-            data.id = AttributionReport::EventLevelData::Id(report_id);
-          },
-          [report_id](AttributionReport::AggregatableAttributionData& data) {
-            data.id =
-                AttributionReport::AggregatableAttributionData::Id(report_id);
-          }},
-      report.data());
-
+  report.set_id(AttributionReport::Id(db_.GetLastInsertRowId()));
   return true;
 }
 

content/browser/attribution_reporting/attribution_storage_sql.h

diff --git a/content/browser/attribution_reporting/attribution_storage_sql.h b/content/browser/attribution_reporting/attribution_storage_sql.h
index 0372c5e..673fab90 100644
--- a/content/browser/attribution_reporting/attribution_storage_sql.h
+++ b/content/browser/attribution_reporting/attribution_storage_sql.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "base/files/file_path.h"
-#include "base/guid.h"
 #include "base/sequence_checker.h"
 #include "base/thread_annotations.h"
 #include "base/time/time.h"

content/browser/attribution_reporting/attribution_storage_sql_migrations_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_storage_sql_migrations_unittest.cc b/content/browser/attribution_reporting/attribution_storage_sql_migrations_unittest.cc
index 422e786..15acf14 100644
--- a/content/browser/attribution_reporting/attribution_storage_sql_migrations_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_storage_sql_migrations_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/guid.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"

content/browser/attribution_reporting/attribution_storage_sql_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc b/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc
index 2cd4259..edc4f66 100644
--- a/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc
@@ -954,7 +954,7 @@
   std::vector<AttributionReport> reports =
       storage()->GetAttributionReports(base::Time::Now());
   EXPECT_THAT(reports, SizeIs(1));
-  EXPECT_TRUE(storage()->DeleteReport(reports[0].ReportId()));
+  EXPECT_TRUE(storage()->DeleteReport(reports[0].id()));
   // Store another impression to trigger the expiry logic.
   storage()->StoreSource(
       SourceBuilder().SetExpiry(base::Milliseconds(3)).Build());
@@ -984,8 +984,7 @@
           ReportTypeIs(AttributionReport::Type::kEventLevel),
           ReportTypeIs(AttributionReport::Type::kAggregatableAttribution)));
 
-  EXPECT_TRUE(storage()->DeleteReport(
-      AttributionReport::AggregatableAttributionData::Id(2)));
+  EXPECT_TRUE(storage()->DeleteReport(AttributionReport::Id(2)));
   EXPECT_THAT(storage()->GetAttributionReports(base::Time::Max()),
               ElementsAre(ReportTypeIs(AttributionReport::Type::kEventLevel)));
 
@@ -1017,8 +1016,7 @@
           ReportTypeIs(AttributionReport::Type::kEventLevel),
           ReportTypeIs(AttributionReport::Type::kAggregatableAttribution)));
 
-  EXPECT_TRUE(
-      storage()->DeleteReport(AttributionReport::EventLevelData::Id(1)));
+  EXPECT_TRUE(storage()->DeleteReport(AttributionReport::Id(1)));
 
   task_environment_.FastForwardBy(base::Milliseconds(3));
   // Store another source to trigger the expiry logic.
@@ -1056,8 +1054,8 @@
 
   task_environment_.FastForwardBy(base::Milliseconds(3));
 
-  EXPECT_TRUE(storage()->DeleteReport(reports[0].ReportId()));
-  EXPECT_TRUE(storage()->DeleteReport(reports[1].ReportId()));
+  EXPECT_TRUE(storage()->DeleteReport(reports[0].id()));
+  EXPECT_TRUE(storage()->DeleteReport(reports[1].id()));
 
   // Store another source to trigger the expiry logic.
   storage()->StoreSource(

content/browser/attribution_reporting/attribution_storage_unittest.cc

diff --git a/content/browser/attribution_reporting/attribution_storage_unittest.cc b/content/browser/attribution_reporting/attribution_storage_unittest.cc
index c22901a..eccc0b8 100644
--- a/content/browser/attribution_reporting/attribution_storage_unittest.cc
+++ b/content/browser/attribution_reporting/attribution_storage_unittest.cc
@@ -18,7 +18,6 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/functional/callback.h"
 #include "base/functional/callback_helpers.h"
-#include "base/guid.h"
 #include "base/memory/raw_ptr.h"
 #include "base/ranges/algorithm.h"
 #include "base/strings/stringprintf.h"
@@ -191,7 +190,7 @@
 
   void DeleteReports(const std::vector<AttributionReport>& reports) {
     for (const auto& report : reports) {
-      EXPECT_TRUE(storage_->DeleteReport(report.ReportId()));
+      EXPECT_TRUE(storage_->DeleteReport(report.id()));
     }
   }
 
@@ -228,7 +227,7 @@
                 .event_level_status());
   EXPECT_THAT(storage->GetAttributionReports(base::Time::Now()), IsEmpty());
   EXPECT_THAT(storage->GetActiveSources(), IsEmpty());
-  EXPECT_TRUE(storage->DeleteReport(AttributionReport::EventLevelData::Id(0)));
+  EXPECT_TRUE(storage->DeleteReport(AttributionReport::Id(0)));
   EXPECT_NO_FATAL_FAILURE(storage->ClearData(
       base::Time::Min(), base::Time::Max(), base::NullCallback()));
   EXPECT_EQ(storage->AdjustOfflineReportTimes(), absl::nullopt);
@@ -2319,7 +2318,7 @@
             MaybeCreateAndStoreEventLevelReport(DefaultTrigger()));
   auto reports = storage()->GetAttributionReports(base::Time::Max());
   ASSERT_THAT(reports, SizeIs(1));
-  const AttributionReport::Id id1 = reports.front().ReportId();
+  const AttributionReport::Id id1 = reports.front().id();
 
   storage()->ClearData(base::Time::Min(), base::Time::Max(),
                        base::NullCallback());
@@ -2330,7 +2329,7 @@
             MaybeCreateAndStoreEventLevelReport(DefaultTrigger()));
   reports = storage()->GetAttributionReports(base::Time::Max());
   ASSERT_THAT(reports, SizeIs(1));
-  const AttributionReport::Id id2 = reports.front().ReportId();
+  const AttributionReport::Id id2 = reports.front().id();
 
   EXPECT_NE(id1, id2);
 }
@@ -2358,10 +2357,10 @@
 
   const base::TimeDelta delay = base::Days(2);
   const base::Time new_report_time = actual_reports[0].report_time() + delay;
-  EXPECT_TRUE(storage()->UpdateReportForSendFailure(
-      actual_reports[0].ReportId(), new_report_time));
-  EXPECT_TRUE(storage()->UpdateReportForSendFailure(
-      actual_reports[1].ReportId(), new_report_time));
+  EXPECT_TRUE(storage()->UpdateReportForSendFailure(actual_reports[0].id(),
+                                                    new_report_time));
+  EXPECT_TRUE(storage()->UpdateReportForSendFailure(actual_reports[1].id(),
+                                                    new_report_time));
 
   task_environment_.FastForwardBy(delay);
 

content/browser/attribution_reporting/attribution_test_utils.cc

diff --git a/content/browser/attribution_reporting/attribution_test_utils.cc b/content/browser/attribution_reporting/attribution_test_utils.cc
index 2617fe1b..f22ed377 100644
--- a/content/browser/attribution_reporting/attribution_test_utils.cc
+++ b/content/browser/attribution_reporting/attribution_test_utils.cc
@@ -69,8 +69,8 @@
 
 }  // namespace
 
-base::GUID DefaultExternalReportID() {
-  return base::GUID::ParseLowercase("21abd97f-73e8-4b88-9389-a9fee6abda5e");
+base::Uuid DefaultExternalReportID() {
+  return base::Uuid::ParseLowercase("21abd97f-73e8-4b88-9389-a9fee6abda5e");
 }
 
 base::Time GetExpiryTimeForTesting(base::TimeDelta declared_expiry,
@@ -430,7 +430,7 @@
 }
 
 ReportBuilder& ReportBuilder::SetExternalReportId(
-    base::GUID external_report_id) {
+    base::Uuid external_report_id) {
   external_report_id_ = std::move(external_report_id);
   return *this;
 }
@@ -440,18 +440,11 @@
   return *this;
 }
 
-ReportBuilder& ReportBuilder::SetReportId(
-    AttributionReport::EventLevelData::Id id) {
+ReportBuilder& ReportBuilder::SetReportId(AttributionReport::Id id) {
   report_id_ = id;
   return *this;
 }
 
-ReportBuilder& ReportBuilder::SetReportId(
-    AttributionReport::AggregatableAttributionData::Id id) {
-  aggregatable_attribution_report_id_ = id;
-  return *this;
-}
-
 ReportBuilder& ReportBuilder::SetAggregatableHistogramContributions(
     std::vector<AggregatableHistogramContribution> contributions) {
   DCHECK(!contributions.empty());
@@ -474,19 +467,20 @@
 
 AttributionReport ReportBuilder::Build() const {
   return AttributionReport(
-      attribution_info_, report_time_, /*initial_report_time=*/report_time_,
-      external_report_id_, /*failed_send_attempts=*/0,
+      attribution_info_, report_id_, report_time_,
+      /*initial_report_time=*/report_time_, external_report_id_,
+      /*failed_send_attempts=*/0,
       AttributionReport::EventLevelData(trigger_data_, priority_,
-                                        randomized_trigger_rate_, report_id_));
+                                        randomized_trigger_rate_));
 }
 
 AttributionReport ReportBuilder::BuildAggregatableAttribution() const {
   return AttributionReport(
-      attribution_info_, report_time_, /*initial_report_time=*/report_time_,
-      external_report_id_, /*failed_send_attempts=*/0,
+      attribution_info_, report_id_, report_time_,
+      /*initial_report_time=*/report_time_, external_report_id_,
+      /*failed_send_attempts=*/0,
       AttributionReport::AggregatableAttributionData(
-          contributions_, aggregatable_attribution_report_id_,
-          aggregation_coordinator_, attestation_token_));
+          contributions_, aggregation_coordinator_, attestation_token_));
 }
 
 bool operator==(const AttributionTrigger& a, const AttributionTrigger& b) {
@@ -563,8 +557,6 @@
   return tie(a) == tie(b);
 }
 
-// Does not compare ID as it is set by the underlying sqlite db and
-// should not be tested.
 bool operator==(const AttributionReport::EventLevelData& a,
                 const AttributionReport::EventLevelData& b) {
   const auto tie = [](const AttributionReport::EventLevelData& data) {
@@ -574,9 +566,7 @@
   return tie(a) == tie(b);
 }
 
-// Does not compare ID as it is set by the underlying sqlite db and
-// should not be tested.
-// Also does not compare the assembled report as it is returned by the
+// Does not compare the assembled report as it is returned by the
 // aggregation service from all the other data.
 bool operator==(const AttributionReport::AggregatableAttributionData& a,
                 const AttributionReport::AggregatableAttributionData& b) {
@@ -810,8 +800,7 @@
                          const AttributionReport::EventLevelData& data) {
   return out << "{trigger_data=" << data.trigger_data
              << ",priority=" << data.priority
-             << ",randomized_trigger_rate=" << data.randomized_trigger_rate
-             << ",id=" << *data.id;
+             << ",randomized_trigger_rate=" << data.randomized_trigger_rate;
 }
 
 std::ostream& operator<<(
@@ -825,7 +814,7 @@
     separator = ", ";
   }
 
-  out << "],id=" << *data.id;
+  out << "]";
   if (data.attestation_token.has_value()) {
     out << ",attestation_token=" << data.attestation_token.value();
   } else {
@@ -848,6 +837,7 @@
 
 std::ostream& operator<<(std::ostream& out, const AttributionReport& report) {
   return out << "{attribution_info=" << report.attribution_info()
+             << ",id=" << *report.id()
              << ",report_time=" << report.report_time()
              << ",initial_report_time=" << report.initial_report_time()
              << ",external_report_id=" << report.external_report_id()

content/browser/attribution_reporting/attribution_test_utils.h

diff --git a/content/browser/attribution_reporting/attribution_test_utils.h b/content/browser/attribution_reporting/attribution_test_utils.h
index 4855ed89..2a498708 100644
--- a/content/browser/attribution_reporting/attribution_test_utils.h
+++ b/content/browser/attribution_reporting/attribution_test_utils.h
@@ -13,8 +13,8 @@
 
 #include "base/containers/enum_set.h"
 #include "base/containers/flat_set.h"
-#include "base/guid.h"
 #include "base/time/time.h"
+#include "base/uuid.h"
 #include "components/aggregation_service/aggregation_service.mojom.h"
 #include "components/attribution_reporting/aggregatable_values.h"
 #include "components/attribution_reporting/aggregation_keys.h"
@@ -57,7 +57,7 @@
                   attribution_reporting::mojom::SourceType::kMinValue,
                   attribution_reporting::mojom::SourceType::kMaxValue>::All();
 
-base::GUID DefaultExternalReportID();
+base::Uuid DefaultExternalReportID();
 
 base::Time GetExpiryTimeForTesting(base::TimeDelta declared_expiry,
                                    base::Time source_time);
@@ -268,14 +268,11 @@
 
   ReportBuilder& SetPriority(int64_t priority);
 
-  ReportBuilder& SetExternalReportId(base::GUID external_report_id);
+  ReportBuilder& SetExternalReportId(base::Uuid external_report_id);
 
   ReportBuilder& SetRandomizedTriggerRate(double rate);
 
-  ReportBuilder& SetReportId(AttributionReport::EventLevelData::Id id);
-
-  ReportBuilder& SetReportId(
-      AttributionReport::AggregatableAttributionData::Id id);
+  ReportBuilder& SetReportId(AttributionReport::Id id);
 
   ReportBuilder& SetAggregatableHistogramContributions(
       std::vector<AggregatableHistogramContribution> contributions);
@@ -295,11 +292,9 @@
   uint64_t trigger_data_ = 0;
   base::Time report_time_;
   int64_t priority_ = 0;
-  base::GUID external_report_id_;
+  base::Uuid external_report_id_;
   double randomized_trigger_rate_ = 0;
-  AttributionReport::EventLevelData::Id report_id_{0};
-  AttributionReport::AggregatableAttributionData::Id
-      aggregatable_attribution_report_id_{0};
+  AttributionReport::Id report_id_{0};
   std::vector<AggregatableHistogramContribution> contributions_;
   ::aggregation_service::mojom::AggregationCoordinator
       aggregation_coordinator_ =

content/browser/attribution_reporting/attributions_browsertest.cc

diff --git a/content/browser/attribution_reporting/attributions_browsertest.cc b/content/browser/attribution_reporting/attributions_browsertest.cc
index 68c6cfef..fc8b7816 100644
--- a/content/browser/attribution_reporting/attributions_browsertest.cc
+++ b/content/browser/attribution_reporting/attributions_browsertest.cc
@@ -21,7 +21,6 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "content/browser/attribution_reporting/attribution_constants.h"
 #include "content/browser/attribution_reporting/attribution_manager.h"
 #include "content/browser/attribution_reporting/attribution_manager_impl.h"
@@ -64,6 +63,7 @@
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/test/embedded_test_server/request_handler_util.h"
+#include "services/network/public/cpp/features.h"
 #include "services/network/test/test_network_connection_tracker.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -79,6 +79,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "content/browser/attribution_reporting/attribution_os_level_manager_android.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #endif
 
 namespace content {
@@ -198,7 +199,7 @@
     // valid GUID.
     const std::string* report_id = body.FindString("report_id");
     ASSERT_TRUE(report_id);
-    EXPECT_TRUE(base::GUID::ParseLowercase(*report_id).is_valid());
+    EXPECT_TRUE(base::Uuid::ParseLowercase(*report_id).is_valid());
 
     EXPECT_TRUE(body.FindDouble("randomized_trigger_rate"));
 
@@ -1117,7 +1118,7 @@
 
  private:
   base::test::ScopedFeatureList scoped_feature_list_{
-      blink::features::kAttributionReportingCrossAppWeb};
+      network::features::kAttributionReportingCrossAppWeb};
 };
 
 IN_PROC_BROWSER_TEST_F(AttributionsCrossAppWebEnabledBrowserTest,
@@ -1179,8 +1180,7 @@
   ASSERT_TRUE(https_server()->Start());
 
   AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
-      scoped_os_support_setting(
-          attribution_reporting::mojom::OsSupport::kEnabled);
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
 
   GURL impression_url = https_server()->GetURL(
       "a.test", "/attribution_reporting/page_with_impression_creator.html");

content/browser/attribution_reporting/test/configurable_storage_delegate.cc

diff --git a/content/browser/attribution_reporting/test/configurable_storage_delegate.cc b/content/browser/attribution_reporting/test/configurable_storage_delegate.cc
index ba7be96..8a241e5 100644
--- a/content/browser/attribution_reporting/test/configurable_storage_delegate.cc
+++ b/content/browser/attribution_reporting/test/configurable_storage_delegate.cc
@@ -96,7 +96,7 @@
   return delete_expired_rate_limits_frequency_;
 }
 
-base::GUID ConfigurableStorageDelegate::NewReportID() const {
+base::Uuid ConfigurableStorageDelegate::NewReportID() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return DefaultExternalReportID();
 }

content/browser/attribution_reporting/test/configurable_storage_delegate.h

diff --git a/content/browser/attribution_reporting/test/configurable_storage_delegate.h b/content/browser/attribution_reporting/test/configurable_storage_delegate.h
index 2c5397e..95e3372 100644
--- a/content/browser/attribution_reporting/test/configurable_storage_delegate.h
+++ b/content/browser/attribution_reporting/test/configurable_storage_delegate.h
@@ -27,7 +27,7 @@
   base::Time GetAggregatableReportTime(base::Time trigger_time) const override;
   base::TimeDelta GetDeleteExpiredSourcesFrequency() const override;
   base::TimeDelta GetDeleteExpiredRateLimitsFrequency() const override;
-  base::GUID NewReportID() const override;
+  base::Uuid NewReportID() const override;
   absl::optional<OfflineReportDelayConfig> GetOfflineReportDelayConfig()
       const override;
   void ShuffleReports(std::vector<AttributionReport>&) override;

content/browser/attribution_reporting/test/mock_attribution_manager.h

diff --git a/content/browser/attribution_reporting/test/mock_attribution_manager.h b/content/browser/attribution_reporting/test/mock_attribution_manager.h
index 226f31a..271268e3 100644
--- a/content/browser/attribution_reporting/test/mock_attribution_manager.h
+++ b/content/browser/attribution_reporting/test/mock_attribution_manager.h
@@ -16,7 +16,6 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
-#include "components/attribution_reporting/os_support.mojom-forward.h"
 #include "components/attribution_reporting/source_registration_error.mojom-forward.h"
 #include "components/attribution_reporting/source_type.mojom-forward.h"
 #include "components/attribution_reporting/suitable_origin.h"
@@ -29,6 +28,7 @@
 #include "content/public/browser/attribution_data_model.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/storage_partition.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

content/browser/cache_storage/cache_storage.cc

diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc
index f686806..6116795 100644
--- a/content/browser/cache_storage/cache_storage.cc
+++ b/content/browser/cache_storage/cache_storage.cc
@@ -401,7 +401,7 @@
       const storage::BucketLocator& bucket_locator) {
     if (!base::WriteFile(tmp_path, data)) {
       base::DeleteFile(tmp_path);
-      quota_manager_proxy->NotifyWriteFailed(bucket_locator.storage_key);
+      quota_manager_proxy->OnClientWriteFailed(bucket_locator.storage_key);
       return false;
     }
 

content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc

diff --git a/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc b/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc
index fa894b2..2601834 100644
--- a/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc
+++ b/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc
@@ -95,7 +95,7 @@
 void CacheStorageBlobToDiskCache::DidWriteDataToEntry(int expected_bytes,
                                                       int rv) {
   if (rv != expected_bytes) {
-    quota_manager_proxy_->NotifyWriteFailed(storage_key_);
+    quota_manager_proxy_->OnClientWriteFailed(storage_key_);
     RunCallback(false /* success */);
     return;
   }

content/browser/cache_storage/cache_storage_cache.cc

diff --git a/content/browser/cache_storage/cache_storage_cache.cc b/content/browser/cache_storage/cache_storage_cache.cc
index 96ae251..cd1daca 100644
--- a/content/browser/cache_storage/cache_storage_cache.cc
+++ b/content/browser/cache_storage/cache_storage_cache.cc
@@ -1894,7 +1894,7 @@
   put_context->cache_entry.reset(result.ReleaseEntry());
 
   if (rv != net::OK) {
-    quota_manager_proxy_->NotifyWriteFailed(bucket_locator_.storage_key);
+    quota_manager_proxy_->OnClientWriteFailed(bucket_locator_.storage_key);
     PutComplete(std::move(put_context), CacheStorageError::kErrorExists);
     return;
   }
@@ -1991,7 +1991,7 @@
                          TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
 
   if (rv != expected_bytes) {
-    quota_manager_proxy_->NotifyWriteFailed(bucket_locator_.storage_key);
+    quota_manager_proxy_->OnClientWriteFailed(bucket_locator_.storage_key);
     PutComplete(
         std::move(put_context),
         MakeErrorStorage(ErrorStorageType::kPutDidWriteHeadersWrongBytes));

content/browser/devtools/devtools_instrumentation.cc

diff --git a/content/browser/devtools/devtools_instrumentation.cc b/content/browser/devtools/devtools_instrumentation.cc
index b485fd06..d2cac0c2 100644
--- a/content/browser/devtools/devtools_instrumentation.cc
+++ b/content/browser/devtools/devtools_instrumentation.cc
@@ -202,6 +202,10 @@
     case FederatedAuthRequestResult::kErrorFetchingWellKnownListEmpty: {
       return FederatedAuthRequestIssueReasonEnum::WellKnownListEmpty;
     }
+    case FederatedAuthRequestResult::
+        kErrorFetchingWellKnownInvalidContentType: {
+      return FederatedAuthRequestIssueReasonEnum::WellKnownInvalidContentType;
+    }
     case FederatedAuthRequestResult::kErrorConfigNotInWellKnown: {
       return FederatedAuthRequestIssueReasonEnum::ConfigNotInWellKnown;
     }
@@ -217,6 +221,9 @@
     case FederatedAuthRequestResult::kErrorFetchingConfigInvalidResponse: {
       return FederatedAuthRequestIssueReasonEnum::ConfigInvalidResponse;
     }
+    case FederatedAuthRequestResult::kErrorFetchingConfigInvalidContentType: {
+      return FederatedAuthRequestIssueReasonEnum::ConfigInvalidContentType;
+    }
     case FederatedAuthRequestResult::kErrorFetchingClientMetadataHttpNotFound: {
       return FederatedAuthRequestIssueReasonEnum::ClientMetadataHttpNotFound;
     }
@@ -227,6 +234,11 @@
         kErrorFetchingClientMetadataInvalidResponse: {
       return FederatedAuthRequestIssueReasonEnum::ClientMetadataInvalidResponse;
     }
+    case FederatedAuthRequestResult::
+        kErrorFetchingClientMetadataInvalidContentType: {
+      return FederatedAuthRequestIssueReasonEnum::
+          ClientMetadataInvalidContentType;
+    }
     case FederatedAuthRequestResult::kErrorFetchingAccountsHttpNotFound: {
       return FederatedAuthRequestIssueReasonEnum::AccountsHttpNotFound;
     }
@@ -239,6 +251,9 @@
     case FederatedAuthRequestResult::kErrorFetchingAccountsListEmpty: {
       return FederatedAuthRequestIssueReasonEnum::AccountsListEmpty;
     }
+    case FederatedAuthRequestResult::kErrorFetchingAccountsInvalidContentType: {
+      return FederatedAuthRequestIssueReasonEnum::AccountsInvalidContentType;
+    }
     case FederatedAuthRequestResult::kErrorFetchingIdTokenHttpNotFound: {
       return FederatedAuthRequestIssueReasonEnum::IdTokenHttpNotFound;
     }
@@ -248,6 +263,9 @@
     case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidResponse: {
       return FederatedAuthRequestIssueReasonEnum::IdTokenInvalidResponse;
     }
+    case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidContentType: {
+      return FederatedAuthRequestIssueReasonEnum::IdTokenInvalidContentType;
+    }
     case FederatedAuthRequestResult::kErrorCanceled: {
       return FederatedAuthRequestIssueReasonEnum::Canceled;
     }

content/browser/fenced_frame/fenced_frame_browsertest.cc

diff --git a/content/browser/fenced_frame/fenced_frame_browsertest.cc b/content/browser/fenced_frame/fenced_frame_browsertest.cc
index 0a077efc..8455f1d 100644
--- a/content/browser/fenced_frame/fenced_frame_browsertest.cc
+++ b/content/browser/fenced_frame/fenced_frame_browsertest.cc
@@ -14,6 +14,8 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
+#include "build/buildflag.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "content/browser/attribution_reporting/attribution_manager.h"
@@ -55,6 +57,7 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "services/network/public/cpp/cors/cors.h"
+#include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/simple_url_loader.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/blink/public/common/features.h"
@@ -65,6 +68,10 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
+#if BUILDFLAG(IS_ANDROID)
+#include "content/browser/attribution_reporting/attribution_os_level_manager_android.h"
+#endif
+
 namespace content {
 
 namespace {
@@ -5776,7 +5783,7 @@
  public:
   FencedFrameReportEventAttributionCrossAppWebEnabledBrowserTest() {
     scoped_feature_list_.InitAndEnableFeature(
-        blink::features::kAttributionReportingCrossAppWeb);
+        network::features::kAttributionReportingCrossAppWeb);
   }
 
  private:
@@ -5786,6 +5793,11 @@
 IN_PROC_BROWSER_TEST_F(
     FencedFrameReportEventAttributionCrossAppWebEnabledBrowserTest,
     ReportEventSameOriginSetsSupportHeader) {
+#if BUILDFLAG(IS_ANDROID)
+  AttributionOsLevelManagerAndroid::ScopedOsSupportForTesting
+      scoped_os_support_setting(network::mojom::AttributionOsSupport::kEnabled);
+#endif
+
   net::test_server::ControllableHttpResponse response(https_server(),
                                                       kReportingURL);
   ASSERT_TRUE(https_server()->Start());
@@ -5857,9 +5869,15 @@
   EXPECT_EQ(
       response.http_request()->headers.at("Attribution-Reporting-Eligible"),
       "event-source");
+#if BUILDFLAG(IS_ANDROID)
+  EXPECT_EQ(
+      response.http_request()->headers.at("Attribution-Reporting-Support"),
+      "web, os");
+#else
   EXPECT_EQ(
       response.http_request()->headers.at("Attribution-Reporting-Support"),
       "web");
+#endif
 }
 
 IN_PROC_BROWSER_TEST_F(

content/browser/fenced_frame/fenced_frame_reporter.cc

diff --git a/content/browser/fenced_frame/fenced_frame_reporter.cc b/content/browser/fenced_frame/fenced_frame_reporter.cc
index 237d8e6..d3faa972 100644
--- a/content/browser/fenced_frame/fenced_frame_reporter.cc
+++ b/content/browser/fenced_frame/fenced_frame_reporter.cc
@@ -374,13 +374,8 @@
                                attribution_reporting_data->is_automatic_beacon
                                    ? "navigation-source"
                                    : "event-source");
-
-    if (base::FeatureList::IsEnabled(
-            blink::features::kAttributionReportingCrossAppWeb)) {
-      request->headers.SetHeader("Attribution-Reporting-Support",
-                                 attribution_reporting::GetSupportHeader(
-                                     AttributionManager::GetOsSupport()));
-    }
+    request->attribution_reporting_os_support =
+        AttributionManager::GetOsSupport();
   }
 
   // Create and configure `SimpleURLLoader` instance.

content/browser/indexed_db/indexed_db_factory.cc

diff --git a/content/browser/indexed_db/indexed_db_factory.cc b/content/browser/indexed_db/indexed_db_factory.cc
index 4fad727..c919dac 100644
--- a/content/browser/indexed_db/indexed_db_factory.cc
+++ b/content/browser/indexed_db/indexed_db_factory.cc
@@ -728,7 +728,7 @@
                      bucket_locator);
 
     if (disk_full) {
-      context_->quota_manager_proxy()->NotifyWriteFailed(
+      context_->quota_manager_proxy()->OnClientWriteFailed(
           bucket_locator.storage_key);
       return {IndexedDBBucketStateHandle(), s,
               IndexedDBDatabaseError(blink::mojom::IDBException::kQuotaError,
@@ -969,7 +969,7 @@
     HandleBackingStoreCorruption(bucket_locator, error);
   } else {
     if (status.IsIOError()) {
-      context_->quota_manager_proxy()->NotifyWriteFailed(
+      context_->quota_manager_proxy()->OnClientWriteFailed(
           bucket_locator.storage_key);
     }
     HandleBackingStoreFailure(bucket_locator);

content/browser/loader/navigation_url_loader_impl.cc

diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
index 8ca41f9a..d838bac3 100644
--- a/content/browser/loader/navigation_url_loader_impl.cc
+++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -21,6 +21,7 @@
 #include "build/build_config.h"
 #include "components/download/public/common/download_stats.h"
 #include "content/browser/about_url_loader_factory.h"
+#include "content/browser/attribution_reporting/attribution_manager.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/client_hints/client_hints.h"
 #include "content/browser/data_url_loader_factory.h"
@@ -325,6 +326,9 @@
   new_request->has_storage_access =
       request_info.begin_params->has_storage_access;
 
+  new_request->attribution_reporting_os_support =
+      AttributionManager::GetOsSupport();
+
   return new_request;
 }
 

content/browser/media/media_license_storage_host.cc

diff --git a/content/browser/media/media_license_storage_host.cc b/content/browser/media/media_license_storage_host.cc
index 0ff8680..be41615 100644
--- a/content/browser/media/media_license_storage_host.cc
+++ b/content/browser/media/media_license_storage_host.cc
@@ -180,7 +180,7 @@
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (!success) {
-    manager_->quota_manager_proxy()->NotifyWriteFailed(storage_key());
+    manager_->quota_manager_proxy()->OnClientWriteFailed(storage_key());
     std::move(callback).Run(false);
     return;
   }

content/browser/renderer_host/navigation_request.cc

diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index abdb8e2..98e187b 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -40,9 +40,6 @@
 #include "base/types/pass_key.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
-#include "components/attribution_reporting/os_registration.h"
-#include "components/attribution_reporting/os_support.mojom.h"
-#include "content/browser/attribution_reporting/attribution_manager.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/browsing_topics/header_util.h"
 #include "content/browser/child_process_security_policy_impl.h"
@@ -464,13 +461,6 @@
 
   if (has_attribution_src_token) {
     headers->SetHeader("Attribution-Reporting-Eligible", "navigation-source");
-
-    if (base::FeatureList::IsEnabled(
-            blink::features::kAttributionReportingCrossAppWeb)) {
-      headers->SetHeader("Attribution-Reporting-Support",
-                         attribution_reporting::GetSupportHeader(
-                             AttributionManager::GetOsSupport()));
-    }
   }
 }
 

content/browser/renderer_host/navigation_request_browsertest.cc

diff --git a/content/browser/renderer_host/navigation_request_browsertest.cc b/content/browser/renderer_host/navigation_request_browsertest.cc
index e271f27..f55e3f4 100644
--- a/content/browser/renderer_host/navigation_request_browsertest.cc
+++ b/content/browser/renderer_host/navigation_request_browsertest.cc
@@ -738,7 +738,7 @@
           shell()->web_contents()->GetPrimaryMainFrame());
   EXPECT_TRUE(document_data);
   blink::RuntimeFeatureStateReadContext read_context =
-      document_data->runtime_feature_read_context();
+      document_data->runtime_feature_state_read_context();
   EXPECT_EQ(expected_feature_overrides, read_context.GetFeatureOverrides());
 }
 
@@ -784,7 +784,7 @@
           shell()->web_contents()->GetPrimaryMainFrame());
   EXPECT_TRUE(document_data);
   blink::RuntimeFeatureStateReadContext read_context =
-      document_data->runtime_feature_read_context();
+      document_data->runtime_feature_state_read_context();
   EXPECT_EQ(expected_feature_overrides, read_context.GetFeatureOverrides());
 }
 
@@ -829,7 +829,7 @@
           shell()->web_contents()->GetPrimaryMainFrame());
   EXPECT_TRUE(document_data);
   blink::RuntimeFeatureStateReadContext read_context =
-      document_data->runtime_feature_read_context();
+      document_data->runtime_feature_state_read_context();
   EXPECT_TRUE(read_context.GetFeatureOverrides().empty());
 }
 

content/browser/renderer_host/render_frame_host_impl.cc

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 76e19f7..dd265ea 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -4059,7 +4059,7 @@
 
   // If the deprecation trial is enabled, we have directive to override the
   // current value of net::features::ThirdPartyStoragePartitioning.
-  if (rfs_document_data_for_storage_key->runtime_feature_read_context()
+  if (rfs_document_data_for_storage_key->runtime_feature_state_read_context()
           .IsDisableThirdPartyStoragePartitioningEnabled()) {
     return false;
   }
@@ -4190,7 +4190,8 @@
         RuntimeFeatureStateDocumentData::GetForCurrentDocument(creator_frame);
     DCHECK(rfs_document_data_from_creator);
     RuntimeFeatureStateDocumentData::CreateForCurrentDocument(
-        this, rfs_document_data_from_creator->runtime_feature_read_context());
+        this,
+        rfs_document_data_from_creator->runtime_feature_state_read_context());
   } else {
     // Otherwise create a RuntimeFeatureStateContext. We need to construct a
     // RuntimeFeatureStateContext because its constructor initializes default
@@ -15095,7 +15096,7 @@
     return false;
   }
   blink::RuntimeFeatureStateReadContext read_context =
-      document_data->runtime_feature_read_context();
+      document_data->runtime_feature_state_read_context();
   return read_context.IsThirdPartyCookiesUserBypassEnabled();
 }
 

content/browser/renderer_host/render_frame_host_impl_browsertest.cc

diff --git a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
index 9c6da51..23c7f0c9 100644
--- a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
+++ b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
@@ -1018,7 +1018,7 @@
       RuntimeFeatureStateDocumentData::GetForCurrentDocument(
           web_contents()->GetPrimaryMainFrame());
   EXPECT_EQ(expected_overrides,
-            actual_document_data->runtime_feature_read_context()
+            actual_document_data->runtime_feature_state_read_context()
                 .GetFeatureOverrides());
 
   // Simulate receiving a feature diff from the renderer process.
@@ -1039,7 +1039,7 @@
   // Verify that the document data was altered with the correct overrides.
   runtime_feature_state_controller_remote.FlushForTesting();
   EXPECT_EQ(expected_overrides,
-            actual_document_data->runtime_feature_read_context()
+            actual_document_data->runtime_feature_state_read_context()
                 .GetFeatureOverrides());
 }
 
@@ -1068,7 +1068,7 @@
       RuntimeFeatureStateDocumentData::GetForCurrentDocument(
           web_contents()->GetPrimaryMainFrame());
   EXPECT_EQ(expected_overrides,
-            actual_document_data->runtime_feature_read_context()
+            actual_document_data->runtime_feature_state_read_context()
                 .GetFeatureOverrides());
 
   // Simulate receiving a feature diff from the renderer process.
@@ -1085,7 +1085,7 @@
   // Verify that no feature overrides were added.
   runtime_feature_state_controller_remote.FlushForTesting();
   EXPECT_EQ(expected_overrides,
-            actual_document_data->runtime_feature_read_context()
+            actual_document_data->runtime_feature_state_read_context()
                 .GetFeatureOverrides());
 }
 

content/browser/renderer_host/render_frame_host_impl_unittest.cc

diff --git a/content/browser/renderer_host/render_frame_host_impl_unittest.cc b/content/browser/renderer_host/render_frame_host_impl_unittest.cc
index 8c6c570..4b33afa9 100644
--- a/content/browser/renderer_host/render_frame_host_impl_unittest.cc
+++ b/content/browser/renderer_host/render_frame_host_impl_unittest.cc
@@ -1021,7 +1021,7 @@
   navigation->Commit();
 
   EXPECT_TRUE(RuntimeFeatureStateDocumentData::GetForCurrentDocument(main_rfh())
-                  ->runtime_feature_read_context()
+                  ->runtime_feature_state_read_context()
                   .IsDisableThirdPartyStoragePartitioningEnabled());
 
   // Create a child frame and navigate to `child_url`.
@@ -1080,14 +1080,14 @@
   navigation->Commit();
 
   EXPECT_TRUE(RuntimeFeatureStateDocumentData::GetForCurrentDocument(main_rfh())
-                  ->runtime_feature_read_context()
+                  ->runtime_feature_state_read_context()
                   .IsTestFeatureEnabled());
 
   // Now add a child and check its RFSRC.
   auto* child_frame = main_test_rfh()->AppendChild("child");
   EXPECT_TRUE(
       RuntimeFeatureStateDocumentData::GetForCurrentDocument(child_frame)
-          ->runtime_feature_read_context()
+          ->runtime_feature_state_read_context()
           .IsTestFeatureEnabled());
 
   // Navigating the child away should change the RFSRC.
@@ -1098,7 +1098,7 @@
       child_navigation->GetFinalRenderFrameHost());
   EXPECT_FALSE(
       RuntimeFeatureStateDocumentData::GetForCurrentDocument(child_frame)
-          ->runtime_feature_read_context()
+          ->runtime_feature_state_read_context()
           .IsTestFeatureEnabled());
 }
 

content/browser/renderer_host/render_process_host_impl.cc

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index a2d47ff..c1f18783 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -65,7 +65,6 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "cc/base/switches.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "components/discardable_memory/public/mojom/discardable_shared_memory_manager.mojom.h"
 #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
 #include "components/metrics/single_sample_metrics.h"
@@ -184,6 +183,7 @@
 #include "services/metrics/public/cpp/ukm_recorder.h"
 #include "services/metrics/public/mojom/ukm_interface.mojom.h"
 #include "services/metrics/ukm_recorder_factory_impl.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 #include "services/resource_coordinator/public/mojom/memory_instrumentation/memory_instrumentation.mojom.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
@@ -5487,7 +5487,7 @@
 }
 
 void RenderProcessHostImpl::SetOsSupportForAttributionReporting(
-    attribution_reporting::mojom::OsSupport os_support) {
+    network::mojom::AttributionOsSupport os_support) {
   GetRendererInterface()->SetOsSupportForAttributionReporting(os_support);
 }
 

content/browser/renderer_host/render_process_host_impl.h

diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index e3d9292..200758b 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -329,7 +329,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
   void SetOsSupportForAttributionReporting(
-      attribution_reporting::mojom::OsSupport os_support) override;
+      network::mojom::AttributionOsSupport os_support) override;
 #endif
 
   // IPC::Sender via RenderProcessHost.

content/browser/runtime_feature_state/runtime_feature_state_document_data.cc

diff --git a/content/browser/runtime_feature_state/runtime_feature_state_document_data.cc b/content/browser/runtime_feature_state/runtime_feature_state_document_data.cc
index cf718e0..bd6e557 100644
--- a/content/browser/runtime_feature_state/runtime_feature_state_document_data.cc
+++ b/content/browser/runtime_feature_state/runtime_feature_state_document_data.cc
@@ -13,6 +13,7 @@
 RuntimeFeatureStateDocumentData::RuntimeFeatureStateDocumentData(
     RenderFrameHost* rfh,
     const blink::RuntimeFeatureStateReadContext& read_context)
-    : DocumentUserData(rfh), runtime_feature_read_context_(read_context) {}
+    : DocumentUserData(rfh),
+      runtime_feature_state_read_context_(read_context) {}
 
 }  // namespace content

content/browser/runtime_feature_state/runtime_feature_state_document_data.h

diff --git a/content/browser/runtime_feature_state/runtime_feature_state_document_data.h b/content/browser/runtime_feature_state/runtime_feature_state_document_data.h
index edfbf7c..8089c56b 100644
--- a/content/browser/runtime_feature_state/runtime_feature_state_document_data.h
+++ b/content/browser/runtime_feature_state/runtime_feature_state_document_data.h
@@ -16,8 +16,9 @@
  public:
   ~RuntimeFeatureStateDocumentData() override;
 
-  const blink::RuntimeFeatureStateReadContext& runtime_feature_read_context() {
-    return runtime_feature_read_context_;
+  const blink::RuntimeFeatureStateReadContext&
+  runtime_feature_state_read_context() {
+    return runtime_feature_state_read_context_;
   }
 
   // We only want the read context to be mutable when an IPC is sent from the
@@ -27,7 +28,7 @@
   blink::RuntimeFeatureStateReadContext&
   GetMutableRuntimeFeatureStateReadContext(
       base::PassKey<RuntimeFeatureStateControllerImpl>) {
-    return runtime_feature_read_context_;
+    return runtime_feature_state_read_context_;
   }
 
  private:
@@ -42,7 +43,7 @@
 
   // The browser process' read-only copy containing the state for blink
   // runtime-enabled features.
-  blink::RuntimeFeatureStateReadContext runtime_feature_read_context_;
+  blink::RuntimeFeatureStateReadContext runtime_feature_state_read_context_;
 };
 
 }  // namespace content

content/browser/service_worker/service_worker_registry.cc

diff --git a/content/browser/service_worker/service_worker_registry.cc b/content/browser/service_worker/service_worker_registry.cc
index a3f554b..2b6f87c0 100644
--- a/content/browser/service_worker/service_worker_registry.cc
+++ b/content/browser/service_worker/service_worker_registry.cc
@@ -110,7 +110,7 @@
 
 // Notifies quota manager that a disk write operation failed so that it can
 // check for storage pressure.
-void MaybeNotifyWriteFailed(
+void CheckForClientWriteFailure(
     scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy,
     storage::mojom::ServiceWorkerDatabaseStatus status,
     const blink::StorageKey& key) {
@@ -119,7 +119,7 @@
 
   if (status == storage::mojom::ServiceWorkerDatabaseStatus::kErrorFailed ||
       status == storage::mojom::ServiceWorkerDatabaseStatus::kErrorIOError) {
-    quota_manager_proxy->NotifyWriteFailed(key);
+    quota_manager_proxy->OnClientWriteFailed(key);
   }
 }
 
@@ -1411,7 +1411,7 @@
   blink::ServiceWorkerStatusCode status =
       DatabaseStatusToStatusCode(database_status);
 
-  MaybeNotifyWriteFailed(quota_manager_proxy_, database_status, key);
+  CheckForClientWriteFailure(quota_manager_proxy_, database_status, key);
 
   if (status != blink::ServiceWorkerStatusCode::kOk) {
     ScheduleDeleteAndStartOver();
@@ -1517,7 +1517,7 @@
     const blink::StorageKey& key,
     StatusCallback callback,
     storage::mojom::ServiceWorkerDatabaseStatus status) {
-  MaybeNotifyWriteFailed(quota_manager_proxy_, status, key);
+  CheckForClientWriteFailure(quota_manager_proxy_, status, key);
   DidUpdateRegistration(std::move(callback), status);
 }
 
@@ -1525,7 +1525,7 @@
     const blink::StorageKey& key,
     storage::mojom::ServiceWorkerDatabaseStatus status) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  MaybeNotifyWriteFailed(quota_manager_proxy_, status, key);
+  CheckForClientWriteFailure(quota_manager_proxy_, status, key);
   if (status != storage::mojom::ServiceWorkerDatabaseStatus::kOk)
     ScheduleDeleteAndStartOver();
 }
@@ -1566,7 +1566,7 @@
     const blink::StorageKey& key,
     storage::mojom::ServiceWorkerDatabaseStatus status) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  MaybeNotifyWriteFailed(quota_manager_proxy_, status, key);
+  CheckForClientWriteFailure(quota_manager_proxy_, status, key);
   // |status| can be NOT_FOUND when the associated registration did not exist in
   // the database. In the case, we don't have to schedule the corruption
   // recovery.

content/browser/usb/usb_browsertest.cc

diff --git a/content/browser/usb/usb_browsertest.cc b/content/browser/usb/usb_browsertest.cc
index c9816266..07373c8 100644
--- a/content/browser/usb/usb_browsertest.cc
+++ b/content/browser/usb/usb_browsertest.cc
@@ -55,8 +55,14 @@
 
     // The chooser will always select the last-created `fake_device_info_`.
     EXPECT_CALL(delegate(), RunChooserInternal).WillRepeatedly([&]() {
+      permission_granted_ = true;
       return fake_device_info_.Clone();
     });
+    EXPECT_CALL(delegate(), HasDevicePermission).WillRepeatedly([&]() {
+      return permission_granted_;
+    });
+    EXPECT_CALL(delegate(), RevokeDevicePermissionWebInitiated)
+        .WillRepeatedly([&]() { permission_granted_ = false; });
 
     // All origins can request device permissions.
     EXPECT_CALL(delegate(), CanRequestDevicePermission)
@@ -119,12 +125,12 @@
       test_client_;
   device::FakeUsbDeviceManager device_manager_;
   device::mojom::UsbDeviceInfoPtr fake_device_info_;
+  bool permission_granted_ = false;
   url::Origin origin_;
 };
 
 IN_PROC_BROWSER_TEST_F(WebUsbTest, RequestAndGetDevices) {
   // Call getDevices with no device permissions.
-  EXPECT_CALL(delegate(), HasDevicePermission).WillRepeatedly(Return(false));
   EXPECT_EQ(ListValueOf(), EvalJs(web_contents(),
                                   R"((async () => {
         let devices = await navigator.usb.getDevices();
@@ -141,7 +147,6 @@
       })())"));
 
   // Call getDevices again with the device permission granted.
-  EXPECT_CALL(delegate(), HasDevicePermission).WillOnce(Return(true));
   EXPECT_EQ(ListValueOf("123456"), EvalJs(web_contents(),
                                           R"((async () => {
         let devices = await navigator.usb.getDevices();
@@ -167,7 +172,6 @@
 
 IN_PROC_BROWSER_TEST_F(WebUsbTest, AddRemoveDevice) {
   // Request permission to access the fake device.
-  EXPECT_CALL(delegate(), HasDevicePermission).WillRepeatedly(Return(false));
   EXPECT_EQ("123456", EvalJs(web_contents(),
                              R"((async () => {
         let device =
@@ -175,7 +179,6 @@
         return device.serialNumber;
       })())"));
 
-  EXPECT_CALL(delegate(), HasDevicePermission).WillRepeatedly(Return(true));
   EXPECT_TRUE(ExecJs(web_contents(),
                      R"(
         var removedPromise = new Promise(resolve => {
@@ -204,7 +207,6 @@
 }
 
 IN_PROC_BROWSER_TEST_F(WebUsbTest, ForgetDevice) {
-  EXPECT_CALL(delegate(), HasDevicePermission).WillRepeatedly(Return(false));
   EXPECT_EQ("123456", EvalJs(web_contents(),
                              R"((async () => {
         let device =
@@ -212,21 +214,18 @@
         return device.serialNumber;
       })())"));
 
-  EXPECT_CALL(delegate(), HasDevicePermission).WillRepeatedly(Return(true));
   EXPECT_EQ(1, EvalJs(web_contents(),
                       R"((async () => {
         const devices = await navigator.usb.getDevices();
         return devices.length;
       })())"));
 
-  EXPECT_CALL(delegate(), RevokeDevicePermissionWebInitiated);
   EXPECT_TRUE(ExecJs(web_contents(),
                      R"((async () => {
         const [device] = await navigator.usb.getDevices();
         await device.forget();
       })())"));
 
-  EXPECT_CALL(delegate(), HasDevicePermission).WillRepeatedly(Return(false));
   EXPECT_EQ(0, EvalJs(web_contents(),
                       R"((async () => {
         const devices = await navigator.usb.getDevices();

content/browser/webid/fedcm_metrics.cc

diff --git a/content/browser/webid/fedcm_metrics.cc b/content/browser/webid/fedcm_metrics.cc
index 62ca71a..dd50de3 100644
--- a/content/browser/webid/fedcm_metrics.cc
+++ b/content/browser/webid/fedcm_metrics.cc
@@ -180,6 +180,9 @@
       case IdpNetworkRequestManager::ParseStatus::kEmptyListError:
         match_status = FedCmIdpSigninMatchStatus::kMismatchWithNoContent;
         break;
+      case IdpNetworkRequestManager::ParseStatus::kInvalidContentTypeError:
+        match_status = FedCmIdpSigninMatchStatus::kMismatchWithInvalidResponse;
+        break;
       case IdpNetworkRequestManager::ParseStatus::kSuccess:
         match_status = FedCmIdpSigninMatchStatus::kMatchWithAccounts;
         break;

content/browser/webid/fedcm_metrics.h

diff --git a/content/browser/webid/fedcm_metrics.h b/content/browser/webid/fedcm_metrics.h
index fa985911..644f9a45 100644
--- a/content/browser/webid/fedcm_metrics.h
+++ b/content/browser/webid/fedcm_metrics.h
@@ -56,8 +56,12 @@
   kNotSignedInWithIdp,
   kAccountsListEmpty,
   kWellKnownListEmpty,
+  kWellKnownInvalidContentType,
+  kConfigInvalidContentType,
+  kAccountsInvalidContentType,
+  kIdTokenInvalidContentType,
 
-  kMaxValue = kWellKnownListEmpty
+  kMaxValue = kIdTokenInvalidContentType
 };
 
 // This enum describes whether user sign-in states between IDP and browser

content/browser/webid/federated_auth_request_impl.cc

diff --git a/content/browser/webid/federated_auth_request_impl.cc b/content/browser/webid/federated_auth_request_impl.cc
index cb5b07a..78531d44 100644
--- a/content/browser/webid/federated_auth_request_impl.cc
+++ b/content/browser/webid/federated_auth_request_impl.cc
@@ -146,22 +146,28 @@
     case FederatedAuthRequestResult::kErrorFetchingWellKnownNoResponse:
     case FederatedAuthRequestResult::kErrorFetchingWellKnownInvalidResponse:
     case FederatedAuthRequestResult::kErrorFetchingWellKnownListEmpty:
+    case FederatedAuthRequestResult::kErrorFetchingWellKnownInvalidContentType:
     case FederatedAuthRequestResult::kErrorConfigNotInWellKnown:
     case FederatedAuthRequestResult::kErrorWellKnownTooBig:
     case FederatedAuthRequestResult::kErrorFetchingConfigHttpNotFound:
     case FederatedAuthRequestResult::kErrorFetchingConfigNoResponse:
     case FederatedAuthRequestResult::kErrorFetchingConfigInvalidResponse:
+    case FederatedAuthRequestResult::kErrorFetchingConfigInvalidContentType:
     case FederatedAuthRequestResult::kErrorFetchingClientMetadataHttpNotFound:
     case FederatedAuthRequestResult::kErrorFetchingClientMetadataNoResponse:
     case FederatedAuthRequestResult::
         kErrorFetchingClientMetadataInvalidResponse:
+    case FederatedAuthRequestResult::
+        kErrorFetchingClientMetadataInvalidContentType:
     case FederatedAuthRequestResult::kErrorFetchingAccountsHttpNotFound:
     case FederatedAuthRequestResult::kErrorFetchingAccountsNoResponse:
     case FederatedAuthRequestResult::kErrorFetchingAccountsInvalidResponse:
     case FederatedAuthRequestResult::kErrorFetchingAccountsListEmpty:
+    case FederatedAuthRequestResult::kErrorFetchingAccountsInvalidContentType:
     case FederatedAuthRequestResult::kErrorFetchingIdTokenHttpNotFound:
     case FederatedAuthRequestResult::kErrorFetchingIdTokenNoResponse:
     case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidResponse:
+    case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidContentType:
     case FederatedAuthRequestResult::kErrorRpPageNotVisible:
     case FederatedAuthRequestResult::kError: {
       return RequestTokenStatus::kError;
@@ -181,11 +187,13 @@
       return IdpNetworkRequestManager::MetricsEndpointErrorCode::kRpFailure;
     }
     case FederatedAuthRequestResult::kErrorFetchingAccountsInvalidResponse:
-    case FederatedAuthRequestResult::kErrorFetchingAccountsListEmpty: {
+    case FederatedAuthRequestResult::kErrorFetchingAccountsListEmpty:
+    case FederatedAuthRequestResult::kErrorFetchingAccountsInvalidContentType: {
       return IdpNetworkRequestManager::MetricsEndpointErrorCode::
           kAccountsEndpointInvalidResponse;
     }
-    case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidResponse: {
+    case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidResponse:
+    case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidContentType: {
       return IdpNetworkRequestManager::MetricsEndpointErrorCode::
           kTokenEndpointInvalidResponse;
     }
@@ -215,7 +223,11 @@
     case FederatedAuthRequestResult::kErrorFetchingWellKnownInvalidResponse:
     case FederatedAuthRequestResult::kErrorFetchingConfigInvalidResponse:
     case FederatedAuthRequestResult::
-        kErrorFetchingClientMetadataInvalidResponse: {
+        kErrorFetchingClientMetadataInvalidResponse:
+    case FederatedAuthRequestResult::kErrorFetchingWellKnownInvalidContentType:
+    case FederatedAuthRequestResult::kErrorFetchingConfigInvalidContentType:
+    case FederatedAuthRequestResult::
+        kErrorFetchingClientMetadataInvalidContentType: {
       return IdpNetworkRequestManager::MetricsEndpointErrorCode::
           kIdpServerInvalidResponse;
     }
@@ -1259,6 +1271,14 @@
           TokenStatus::kAccountsListEmpty);
       return;
     }
+    case IdpNetworkRequestManager::ParseStatus::kInvalidContentTypeError: {
+      MaybeAddResponseCodeToConsole(kAccountsUrl, status.response_code);
+      HandleAccountsFetchFailure(
+          std::move(idp_info), old_idp_signin_status,
+          FederatedAuthRequestResult::kErrorFetchingAccountsInvalidContentType,
+          TokenStatus::kAccountsInvalidContentType);
+      return;
+    }
     case IdpNetworkRequestManager::ParseStatus::kSuccess: {
       if (IsFedCmLoginHintEnabled()) {
         FilterAccountsWithLoginHint(idp_info->provider->login_hint, accounts);
@@ -1526,6 +1546,14 @@
           /*should_delay_callback=*/true);
       return;
     }
+    case IdpNetworkRequestManager::ParseStatus::kInvalidContentTypeError: {
+      MaybeAddResponseCodeToConsole(kIdAssertionUrl, status.response_code);
+      CompleteRequestWithError(
+          FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidContentType,
+          TokenStatus::kIdTokenInvalidContentType,
+          /*should_delay_callback=*/true);
+      return;
+    }
     case IdpNetworkRequestManager::ParseStatus::kEmptyListError: {
       NOTREACHED() << "kEmptyListError is undefined for CompleteTokenRequest";
       return;

content/browser/webid/federated_auth_request_impl_unittest.cc

diff --git a/content/browser/webid/federated_auth_request_impl_unittest.cc b/content/browser/webid/federated_auth_request_impl_unittest.cc
index d5f5a33..48aa453 100644
--- a/content/browser/webid/federated_auth_request_impl_unittest.cc
+++ b/content/browser/webid/federated_auth_request_impl_unittest.cc
@@ -178,6 +178,7 @@
 
 struct MockWellKnown {
   std::set<std::string> provider_urls;
+  FetchStatus fetch_status;
 };
 
 // Mock information returned from IdpNetworkRequestManager::FetchConfig().
@@ -235,7 +236,7 @@
     /*auto_reauthn=*/false, blink::mojom::RpContext::kSignIn};
 
 static const MockIdpInfo kDefaultIdentityProviderInfo{
-    {kWellKnown},
+    {kWellKnown, {ParseStatus::kSuccess, net::HTTP_OK}},
     {
         {ParseStatus::kSuccess, net::HTTP_OK},
         kAccountsEndpoint,
@@ -327,9 +328,11 @@
     std::set<GURL> url_set(
         config_.idp_info[provider_key].well_known.provider_urls.begin(),
         config_.idp_info[provider_key].well_known.provider_urls.end());
-    FetchStatus success{ParseStatus::kSuccess, net::HTTP_OK};
     base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
-        FROM_HERE, base::BindOnce(std::move(callback), success, url_set));
+        FROM_HERE,
+        base::BindOnce(std::move(callback),
+                       config_.idp_info[provider_key].well_known.fetch_status,
+                       url_set));
   }
 
   void FetchConfig(const GURL& provider,
@@ -1153,7 +1156,8 @@
   EXPECT_NE(std::string(idp_config_url), kWellKnownMismatchConfigUrl);
 
   MockConfiguration config = kConfigurationValid;
-  config.idp_info[idp_config_url].well_known = {{kWellKnownMismatchConfigUrl}};
+  config.idp_info[idp_config_url].well_known = {
+      {kWellKnownMismatchConfigUrl}, {ParseStatus::kSuccess, net::HTTP_OK}};
   RunAuthTest(kDefaultRequestParameters, request_not_in_list, config);
   EXPECT_TRUE(DidFetchWellKnownAndConfig());
   EXPECT_FALSE(DidFetch(FetchedEndpoint::ACCOUNTS));
@@ -3437,4 +3441,137 @@
             blink::mojom::RpContext::kSignIn);
 }
 
+TEST_F(FederatedAuthRequestImplTest, WellKnownInvalidContentType) {
+  MockConfiguration configuration = kConfigurationValid;
+  configuration.idp_info[kProviderUrlFull]
+      .well_known.fetch_status.parse_status =
+      ParseStatus::kInvalidContentTypeError;
+  RequestExpectations expectations = {
+      RequestTokenStatus::kError,
+      {FederatedAuthRequestResult::kErrorFetchingWellKnownInvalidContentType},
+      /*selected_idp_config_url=*/absl::nullopt};
+
+  base::RunLoop ukm_loop;
+  ukm_recorder()->SetOnAddEntryCallback(FedCmEntry::kEntryName,
+                                        ukm_loop.QuitClosure());
+  RunAuthTest(kDefaultRequestParameters, expectations, configuration);
+  ukm_loop.Run();
+
+  EXPECT_FALSE(DidFetch(FetchedEndpoint::ACCOUNTS));
+  EXPECT_FALSE(did_show_accounts_dialog());
+  EXPECT_FALSE(did_show_idp_signin_status_mismatch_dialog());
+
+  histogram_tester_.ExpectUniqueSample(
+      "Blink.FedCm.Status.RequestIdToken",
+      TokenStatus::kWellKnownInvalidContentType, 1);
+
+  ExpectRequestTokenStatusUKM(TokenStatus::kWellKnownInvalidContentType);
+  CheckAllFedCmSessionIDs();
+}
+
+TEST_F(FederatedAuthRequestImplTest, ConfigInvalidContentType) {
+  MockConfiguration configuration = kConfigurationValid;
+  configuration.idp_info[kProviderUrlFull].config.fetch_status.parse_status =
+      ParseStatus::kInvalidContentTypeError;
+  RequestExpectations expectations = {
+      RequestTokenStatus::kError,
+      {FederatedAuthRequestResult::kErrorFetchingConfigInvalidContentType},
+      /*selected_idp_config_url=*/absl::nullopt};
+
+  base::RunLoop ukm_loop;
+  ukm_recorder()->SetOnAddEntryCallback(FedCmEntry::kEntryName,
+                                        ukm_loop.QuitClosure());
+  RunAuthTest(kDefaultRequestParameters, expectations, configuration);
+  ukm_loop.Run();
+
+  EXPECT_FALSE(DidFetch(FetchedEndpoint::ACCOUNTS));
+  EXPECT_FALSE(did_show_accounts_dialog());
+  EXPECT_FALSE(did_show_idp_signin_status_mismatch_dialog());
+
+  histogram_tester_.ExpectUniqueSample("Blink.FedCm.Status.RequestIdToken",
+                                       TokenStatus::kConfigInvalidContentType,
+                                       1);
+
+  ExpectRequestTokenStatusUKM(TokenStatus::kConfigInvalidContentType);
+  CheckAllFedCmSessionIDs();
+}
+
+TEST_F(FederatedAuthRequestImplTest, ClientMetadataInvalidContentType) {
+  MockConfiguration configuration = kConfigurationValid;
+  configuration.idp_info[kProviderUrlFull]
+      .client_metadata.fetch_status.parse_status =
+      ParseStatus::kInvalidContentTypeError;
+
+  base::RunLoop ukm_loop;
+  ukm_recorder()->SetOnAddEntryCallback(FedCmEntry::kEntryName,
+                                        ukm_loop.QuitClosure());
+  // The FedCM flow succeeds even if the client metadata fetch fails.
+  RunAuthTest(kDefaultRequestParameters, kExpectationSuccess, configuration);
+  ukm_loop.Run();
+
+  EXPECT_TRUE(DidFetch(FetchedEndpoint::ACCOUNTS));
+  EXPECT_TRUE(did_show_accounts_dialog());
+  EXPECT_FALSE(did_show_idp_signin_status_mismatch_dialog());
+
+  histogram_tester_.ExpectUniqueSample("Blink.FedCm.Status.RequestIdToken",
+                                       TokenStatus::kSuccess, 1);
+
+  ExpectRequestTokenStatusUKM(TokenStatus::kSuccess);
+  CheckAllFedCmSessionIDs();
+}
+
+TEST_F(FederatedAuthRequestImplTest, AccountsInvalidContentType) {
+  MockConfiguration configuration = kConfigurationValid;
+  configuration.idp_info[kProviderUrlFull].accounts_response.parse_status =
+      ParseStatus::kInvalidContentTypeError;
+  RequestExpectations expectations = {
+      RequestTokenStatus::kError,
+      {FederatedAuthRequestResult::kErrorFetchingAccountsInvalidContentType},
+      /*selected_idp_config_url=*/absl::nullopt};
+
+  base::RunLoop ukm_loop;
+  ukm_recorder()->SetOnAddEntryCallback(FedCmEntry::kEntryName,
+                                        ukm_loop.QuitClosure());
+  RunAuthTest(kDefaultRequestParameters, expectations, configuration);
+  ukm_loop.Run();
+
+  EXPECT_TRUE(DidFetch(FetchedEndpoint::ACCOUNTS));
+  EXPECT_FALSE(did_show_accounts_dialog());
+  EXPECT_FALSE(did_show_idp_signin_status_mismatch_dialog());
+
+  histogram_tester_.ExpectUniqueSample("Blink.FedCm.Status.RequestIdToken",
+                                       TokenStatus::kAccountsInvalidContentType,
+                                       1);
+
+  ExpectRequestTokenStatusUKM(TokenStatus::kAccountsInvalidContentType);
+  CheckAllFedCmSessionIDs();
+}
+
+TEST_F(FederatedAuthRequestImplTest, IdTokenInvalidContentType) {
+  MockConfiguration configuration = kConfigurationValid;
+  configuration.token_response.parse_status =
+      ParseStatus::kInvalidContentTypeError;
+  RequestExpectations expectations = {
+      RequestTokenStatus::kError,
+      {FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidContentType},
+      /*selected_idp_config_url=*/absl::nullopt};
+
+  base::RunLoop ukm_loop;
+  ukm_recorder()->SetOnAddEntryCallback(FedCmEntry::kEntryName,
+                                        ukm_loop.QuitClosure());
+  RunAuthTest(kDefaultRequestParameters, expectations, configuration);
+  ukm_loop.Run();
+
+  EXPECT_TRUE(DidFetch(FetchedEndpoint::ACCOUNTS));
+  EXPECT_TRUE(did_show_accounts_dialog());
+  EXPECT_FALSE(did_show_idp_signin_status_mismatch_dialog());
+
+  histogram_tester_.ExpectUniqueSample("Blink.FedCm.Status.RequestIdToken",
+                                       TokenStatus::kIdTokenInvalidContentType,
+                                       1);
+
+  ExpectRequestTokenStatusUKM(TokenStatus::kIdTokenInvalidContentType);
+  CheckAllFedCmSessionIDs();
+}
+
 }  // namespace content

content/browser/webid/federated_provider_fetcher.cc

diff --git a/content/browser/webid/federated_provider_fetcher.cc b/content/browser/webid/federated_provider_fetcher.cc
index 994e2a2..97ecc855b 100644
--- a/content/browser/webid/federated_provider_fetcher.cc
+++ b/content/browser/webid/federated_provider_fetcher.cc
@@ -118,6 +118,14 @@
                 additional_console_error_message);
         return;
       }
+      case IdpNetworkRequestManager::ParseStatus::kInvalidContentTypeError: {
+        OnError(fetch_result,
+                FederatedAuthRequestResult::
+                    kErrorFetchingWellKnownInvalidContentType,
+                TokenStatus::kWellKnownInvalidContentType,
+                additional_console_error_message);
+        return;
+      }
       case IdpNetworkRequestManager::ParseStatus::kSuccess: {
         NOTREACHED();
       }
@@ -196,6 +204,14 @@
                 additional_console_error_message);
         return;
       }
+      case IdpNetworkRequestManager::ParseStatus::kInvalidContentTypeError: {
+        OnError(
+            fetch_result,
+            FederatedAuthRequestResult::kErrorFetchingConfigInvalidContentType,
+            TokenStatus::kConfigInvalidContentType,
+            additional_console_error_message);
+        return;
+      }
       case IdpNetworkRequestManager::ParseStatus::kEmptyListError: {
         NOTREACHED() << "kEmptyListError is undefined for OnConfigFetched";
         return;

content/browser/webid/idp_network_request_manager.cc

diff --git a/content/browser/webid/idp_network_request_manager.cc b/content/browser/webid/idp_network_request_manager.cc
index ac9ea7f..3fad1f89 100644
--- a/content/browser/webid/idp_network_request_manager.cc
+++ b/content/browser/webid/idp_network_request_manager.cc
@@ -295,7 +295,7 @@
   }
 
   if (!IsJsonMimeType(mime_type)) {
-    return ParseStatus::kInvalidResponseError;
+    return ParseStatus::kInvalidContentTypeError;
   }
 
   return ParseStatus::kSuccess;

content/browser/webid/idp_network_request_manager.h

diff --git a/content/browser/webid/idp_network_request_manager.h b/content/browser/webid/idp_network_request_manager.h
index 247be69c7..5923c94 100644
--- a/content/browser/webid/idp_network_request_manager.h
+++ b/content/browser/webid/idp_network_request_manager.h
@@ -72,6 +72,7 @@
     // responses. It is used to classify a successful response where the list in
     // the response is empty.
     kEmptyListError,
+    kInvalidContentTypeError,
   };
   struct FetchStatus {
     ParseStatus parse_status;

content/browser/webid/idp_network_request_manager_unittest.cc

diff --git a/content/browser/webid/idp_network_request_manager_unittest.cc b/content/browser/webid/idp_network_request_manager_unittest.cc
index 06f7c8e..214ff52 100644
--- a/content/browser/webid/idp_network_request_manager_unittest.cc
+++ b/content/browser/webid/idp_network_request_manager_unittest.cc
@@ -1119,7 +1119,7 @@
   "provider_urls": ["https://idp.test/fedcm.json"]
   })",
                                              net::HTTP_OK, "text/html");
-  EXPECT_EQ(ParseStatus::kInvalidResponseError, fetch_status.parse_status);
+  EXPECT_EQ(ParseStatus::kInvalidContentTypeError, fetch_status.parse_status);
   EXPECT_EQ(net::HTTP_OK, fetch_status.response_code);
   EXPECT_EQ(std::set<GURL>{}, urls);
 }
@@ -1129,7 +1129,7 @@
   IdentityProviderMetadata idp_metadata;
   std::tie(fetch_status, idp_metadata) = SendConfigRequestAndWaitForResponse(
       R"({"branding" : { "color": "blue" } })", net::HTTP_OK, "text/html");
-  EXPECT_EQ(ParseStatus::kInvalidResponseError, fetch_status.parse_status);
+  EXPECT_EQ(ParseStatus::kInvalidContentTypeError, fetch_status.parse_status);
   EXPECT_EQ(net::HTTP_OK, fetch_status.response_code);
 }
 
@@ -1141,7 +1141,8 @@
   std::tie(accounts_response, accounts) = SendAccountsRequestAndWaitForResponse(
       test_single_account_json, /*client_id=*/"", net::HTTP_OK, "text/html");
 
-  EXPECT_EQ(ParseStatus::kInvalidResponseError, accounts_response.parse_status);
+  EXPECT_EQ(ParseStatus::kInvalidContentTypeError,
+            accounts_response.parse_status);
   EXPECT_EQ(net::HTTP_OK, accounts_response.response_code);
   EXPECT_TRUE(accounts.empty());
 }
@@ -1152,7 +1153,7 @@
   std::tie(fetch_status, token) = SendTokenRequestAndWaitForResponse(
       "account", "request", net::HTTP_OK, "text/html");
   EXPECT_EQ("", token);
-  EXPECT_EQ(ParseStatus::kInvalidResponseError, fetch_status.parse_status);
+  EXPECT_EQ(ParseStatus::kInvalidContentTypeError, fetch_status.parse_status);
   EXPECT_EQ(net::HTTP_OK, fetch_status.response_code);
 }
 

content/browser/webid/webid_utils.cc

diff --git a/content/browser/webid/webid_utils.cc b/content/browser/webid/webid_utils.cc
index ffb505f4..95bb1f7 100644
--- a/content/browser/webid/webid_utils.cc
+++ b/content/browser/webid/webid_utils.cc
@@ -134,6 +134,11 @@
     case FederatedAuthRequestResult::kErrorFetchingWellKnownListEmpty: {
       return "Provider's FedCM well-known file has no config URLs.";
     }
+    case FederatedAuthRequestResult::
+        kErrorFetchingWellKnownInvalidContentType: {
+      return "Provider's FedCM well-known content type must be a JSON content "
+             "type.";
+    }
     case FederatedAuthRequestResult::kErrorConfigNotInWellKnown: {
       return "Provider's FedCM config file not listed in its well-known file.";
     }
@@ -150,6 +155,10 @@
     case FederatedAuthRequestResult::kErrorFetchingConfigInvalidResponse: {
       return "Provider's FedCM config file is invalid.";
     }
+    case FederatedAuthRequestResult::kErrorFetchingConfigInvalidContentType: {
+      return "Provider's FedCM config file content type must be a JSON content "
+             "type.";
+    }
     case FederatedAuthRequestResult::kErrorFetchingClientMetadataHttpNotFound: {
       return "The provider's client metadata endpoint cannot be found.";
     }
@@ -161,6 +170,11 @@
         kErrorFetchingClientMetadataInvalidResponse: {
       return "Provider's client metadata is invalid.";
     }
+    case FederatedAuthRequestResult::
+        kErrorFetchingClientMetadataInvalidContentType: {
+      return "Provider's client metadata content type must be a JSON content "
+             "type.";
+    }
     case FederatedAuthRequestResult::kErrorFetchingAccountsHttpNotFound: {
       return "The provider's accounts list endpoint cannot be found.";
     }
@@ -176,6 +190,10 @@
     case FederatedAuthRequestResult::kErrorFetchingAccountsListEmpty: {
       return "Provider's accounts list is empty.";
     }
+    case FederatedAuthRequestResult::kErrorFetchingAccountsInvalidContentType: {
+      return "Provider's accounts list endpoint content type must be a JSON "
+             "content type.";
+    }
     case FederatedAuthRequestResult::kErrorFetchingIdTokenHttpNotFound: {
       return "The provider's id token endpoint cannot be found.";
     }
@@ -186,6 +204,10 @@
     case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidResponse: {
       return "Provider's token is invalid.";
     }
+    case FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidContentType: {
+      return "Provider's token endpoint content type must be a JSON content "
+             "type.";
+    }
     case FederatedAuthRequestResult::kErrorCanceled: {
       return "The request has been aborted.";
     }

content/common/renderer.mojom

diff --git a/content/common/renderer.mojom b/content/common/renderer.mojom
index 58a6012..856cfaa 100644
--- a/content/common/renderer.mojom
+++ b/content/common/renderer.mojom
@@ -4,13 +4,13 @@
 
 module content.mojom;
 
-import "components/attribution_reporting/os_support.mojom";
 import "content/common/agent_scheduling_group.mojom";
 import "content/common/native_types.mojom";
 import "ipc/ipc.mojom";
 import "mojo/public/mojom/base/generic_pending_receiver.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "services/network/public/mojom/network_types.mojom";
+import "services/network/public/mojom/attribution.mojom";
 import "skia/public/mojom/skcolor.mojom";
 import "third_party/blink/public/mojom/browser_interface_broker.mojom";
 import "third_party/blink/public/mojom/user_agent/user_agent_metadata.mojom";
@@ -187,11 +187,10 @@
                      string reduced_user_agent,
                      blink.mojom.UserAgentMetadata metadata,
                      array<string> cors_exempt_header_list,
-                     attribution_reporting.mojom.OsSupport attribution_os_support);
+                     network.mojom.AttributionOsSupport attribution_os_support);
 
   // Set the OS-level support for Attribution Reporting indicating whether
   // OS-level attribution is enabled.
   [EnableIf=is_android]
-  SetOsSupportForAttributionReporting(
-      attribution_reporting.mojom.OsSupport os_support);
+  SetOsSupportForAttributionReporting(network.mojom.AttributionOsSupport os_support);
 };

content/public/browser/render_process_host.h

diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h
index 4d62d5a..72a1a6b 100644
--- a/content/public/browser/render_process_host.h
+++ b/content/public/browser/render_process_host.h
@@ -50,8 +50,8 @@
 #include "ui/gfx/native_widget_types.h"
 
 #if BUILDFLAG(IS_ANDROID)
-#include "components/attribution_reporting/os_support.mojom-forward.h"
 #include "content/public/browser/android/child_process_importance.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 #endif
 
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -705,7 +705,7 @@
   // See
   // https://github.com/WICG/attribution-reporting-api/blob/main/app_to_web.md.
   virtual void SetOsSupportForAttributionReporting(
-      attribution_reporting::mojom::OsSupport os_support) = 0;
+      network::mojom::AttributionOsSupport os_support) = 0;
 #endif
 
   // Static management functions -----------------------------------------------

content/public/browser/storage_notification_service.h

diff --git a/content/public/browser/storage_notification_service.h b/content/public/browser/storage_notification_service.h
index cd8c95d1..1259e92 100644
--- a/content/public/browser/storage_notification_service.h
+++ b/content/public/browser/storage_notification_service.h
@@ -14,7 +14,7 @@
 
 namespace {
 using StoragePressureNotificationCallback =
-    base::RepeatingCallback<void(const blink::StorageKey)>;
+    base::RepeatingCallback<void(const blink::StorageKey&)>;
 }
 
 namespace content {
@@ -39,7 +39,7 @@
   // when QuotaManager determines appropriate to alert the user that the device
   // is in a state of storage pressure.
   virtual void MaybeShowStoragePressureNotification(
-      const blink::StorageKey) = 0;
+      const blink::StorageKey& storage_key) = 0;
   virtual StoragePressureNotificationCallback
   CreateThreadSafePressureNotificationCallback() = 0;
 };

content/public/common/content_switch_dependent_feature_overrides.cc

diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc b/content/public/common/content_switch_dependent_feature_overrides.cc
index 7171156..24f3169c0 100644
--- a/content/public/common/content_switch_dependent_feature_overrides.cc
+++ b/content/public/common/content_switch_dependent_feature_overrides.cc
@@ -172,7 +172,7 @@
      std::cref(blink::features::kConversionMeasurement),
      base::FeatureList::OVERRIDE_ENABLE_FEATURE},
     {switches::kEnablePrivacySandboxAdsApis,
-     std::cref(blink::features::kAttributionReportingCrossAppWeb),
+     std::cref(network::features::kAttributionReportingCrossAppWeb),
      base::FeatureList::OVERRIDE_ENABLE_FEATURE},
     {switches::kEnablePrivacySandboxAdsApis,
      std::cref(blink::features::kFencedFrames),

content/public/renderer/render_thread.h

diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h
index c4373348..7225bee 100644
--- a/content/public/renderer/render_thread.h
+++ b/content/public/renderer/render_thread.h
@@ -13,9 +13,9 @@
 #include "base/functional/callback_forward.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/task/single_thread_task_runner.h"
-#include "components/attribution_reporting/os_support.mojom-forward.h"
 #include "content/common/content_export.h"
 #include "content/public/child/child_thread.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 #include "third_party/blink/public/common/tokens/tokens.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/perfetto/include/perfetto/tracing/traced_proto.h"
@@ -116,7 +116,7 @@
   // Returns whether OS-level support is enabled for Attribution Reporting API.
   // See
   // https://github.com/WICG/attribution-reporting-api/blob/main/app_to_web.md.
-  virtual attribution_reporting::mojom::OsSupport
+  virtual network::mojom::AttributionOsSupport
   GetOsSupportForAttributionReporting() = 0;
 
  private:

content/public/test/mock_render_process_host.h

diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h
index 50b2840..231cc33 100644
--- a/content/public/test/mock_render_process_host.h
+++ b/content/public/test/mock_render_process_host.h
@@ -36,8 +36,8 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "base/android/child_process_binding_types.h"
-#include "components/attribution_reporting/os_support.mojom-forward.h"
 #include "content/public/browser/android/child_process_importance.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 #endif
 
 namespace blink {
@@ -289,7 +289,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
   void SetOsSupportForAttributionReporting(
-      attribution_reporting::mojom::OsSupport os_support) override {}
+      network::mojom::AttributionOsSupport os_support) override {}
 #endif
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)

content/public/test/mock_render_thread.cc

diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 1dbc8ee..28cdf11d 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -11,7 +11,6 @@
 #include "base/task/single_thread_task_runner.h"
 #include "base/unguessable_token.h"
 #include "build/build_config.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "content/common/associated_interfaces.mojom.h"
 #include "content/common/frame.mojom.h"
 #include "content/common/render_message_filter.mojom.h"
@@ -22,6 +21,7 @@
 #include "ipc/ipc_sync_message.h"
 #include "ipc/message_filter.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/dom_storage/session_storage_namespace_id.h"
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -327,9 +327,9 @@
   page_broadcasts_.clear();
 }
 
-attribution_reporting::mojom::OsSupport
+network::mojom::AttributionOsSupport
 MockRenderThread::GetOsSupportForAttributionReporting() {
-  return attribution_reporting::mojom::OsSupport::kDisabled;
+  return network::mojom::AttributionOsSupport::kDisabled;
 }
 
 }  // namespace content

content/public/test/mock_render_thread.h

diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index 1defdcb..b026a20 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -93,7 +93,7 @@
   void WriteIntoTrace(
       perfetto::TracedProto<perfetto::protos::pbzero::RenderProcessHost> proto)
       override;
-  attribution_reporting::mojom::OsSupport GetOsSupportForAttributionReporting()
+  network::mojom::AttributionOsSupport GetOsSupportForAttributionReporting()
       override;
 
   // Returns a new, unique routing ID that can be assigned to the next view,

content/public/test/render_frame_host_test_support.cc

diff --git a/content/public/test/render_frame_host_test_support.cc b/content/public/test/render_frame_host_test_support.cc
index e3f0febe..0ce39b6 100644
--- a/content/public/test/render_frame_host_test_support.cc
+++ b/content/public/test/render_frame_host_test_support.cc
@@ -21,7 +21,7 @@
   DCHECK(document_data);
 
   blink::RuntimeFeatureStateReadContext read_context =
-      document_data->runtime_feature_read_context();
+      document_data->runtime_feature_state_read_context();
 
   return read_context.IsDisableThirdPartyStoragePartitioningEnabled();
 }

content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index d0aa009..03cdd5c 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -926,7 +926,7 @@
     const std::string& reduced_user_agent,
     const blink::UserAgentMetadata& user_agent_metadata,
     const std::vector<std::string>& cors_exempt_header_list,
-    attribution_reporting::mojom::OsSupport attribution_os_support) {
+    network::mojom::AttributionOsSupport attribution_os_support) {
   DCHECK(user_agent_.IsNull());
   DCHECK(reduced_user_agent_.IsNull());
   DCHECK(full_user_agent_.IsNull());
@@ -1830,14 +1830,14 @@
   return rendering_color_space_;
 }
 
-attribution_reporting::mojom::OsSupport
+network::mojom::AttributionOsSupport
 RenderThreadImpl::GetOsSupportForAttributionReporting() {
   return attribution_os_support_;
 }
 
 #if BUILDFLAG(IS_ANDROID)
 void RenderThreadImpl::SetOsSupportForAttributionReporting(
-    attribution_reporting::mojom::OsSupport attribution_os_support) {
+    network::mojom::AttributionOsSupport attribution_os_support) {
   attribution_os_support_ = attribution_os_support;
 }
 #endif

content/renderer/render_thread_impl.h

diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 70c955c4..765068e4 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -29,7 +29,6 @@
 #include "base/types/pass_key.h"
 #include "build/build_config.h"
 #include "cc/tiles/gpu_image_decode_cache.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "content/child/child_thread_impl.h"
 #include "content/common/agent_scheduling_group.mojom.h"
 #include "content/common/content_export.h"
@@ -52,6 +51,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/network_change_notifier.h"
 #include "net/nqe/effective_connection_type.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "services/viz/public/mojom/compositing/compositing_mode_watcher.mojom.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
@@ -187,7 +187,7 @@
   void WriteIntoTrace(
       perfetto::TracedProto<perfetto::protos::pbzero::RenderProcessHost> proto)
       override;
-  attribution_reporting::mojom::OsSupport GetOsSupportForAttributionReporting()
+  network::mojom::AttributionOsSupport GetOsSupportForAttributionReporting()
       override;
 
   // IPC::Listener implementation via ChildThreadImpl:
@@ -434,7 +434,7 @@
       const std::string& reduced_user_agent,
       const blink::UserAgentMetadata& user_agent_metadata,
       const std::vector<std::string>& cors_exempt_header_list,
-      attribution_reporting::mojom::OsSupport attribution_os_support) override;
+      network::mojom::AttributionOsSupport attribution_os_support) override;
   void UpdateScrollbarTheme(
       mojom::UpdateScrollbarThemeParamsPtr params) override;
   void OnSystemColorsChanged(int32_t aqua_color_variant) override;
@@ -452,7 +452,7 @@
   void SetIsIsolatedContext(bool value) override;
 #if BUILDFLAG(IS_ANDROID)
   void SetOsSupportForAttributionReporting(
-      attribution_reporting::mojom::OsSupport os_support) override;
+      network::mojom::AttributionOsSupport os_support) override;
 #endif
   void OnMemoryPressure(
       base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level);
@@ -503,7 +503,7 @@
   blink::WebString reduced_user_agent_;
   blink::UserAgentMetadata user_agent_metadata_;
 
-  attribution_reporting::mojom::OsSupport attribution_os_support_;
+  network::mojom::AttributionOsSupport attribution_os_support_;
 
   // Sticky once true, indicates that compositing is done without Gpu, so
   // resources given to the compositor or to the viz service should be

content/renderer/renderer_blink_platform_impl.cc

diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index acc5e11..24d8314 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -32,7 +32,6 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "cc/trees/raster_context_provider_wrapper.h"
-#include "components/attribution_reporting/os_support.mojom.h"
 #include "components/url_formatter/url_formatter.h"
 #include "components/viz/common/features.h"
 #include "content/child/child_process.h"
@@ -80,6 +79,7 @@
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
 #include "storage/common/database/database_identifier.h"
@@ -995,12 +995,12 @@
   return io_thread_id_;
 }
 
-attribution_reporting::mojom::OsSupport
+network::mojom::AttributionOsSupport
 RendererBlinkPlatformImpl::GetOsSupportForAttributionReporting() {
   auto* render_thread = RenderThreadImpl::current();
   // RenderThreadImpl is null in some tests.
   if (!render_thread)
-    return attribution_reporting::mojom::OsSupport::kDisabled;
+    return network::mojom::AttributionOsSupport::kDisabled;
   return render_thread->GetOsSupportForAttributionReporting();
 }
 

content/renderer/renderer_blink_platform_impl.h

diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index 594e30a4..4d573349 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -215,7 +215,7 @@
       const blink::WebURL& url,
       blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
   base::PlatformThreadId GetIOThreadId() const override;
-  attribution_reporting::mojom::OsSupport GetOsSupportForAttributionReporting()
+  network::mojom::AttributionOsSupport GetOsSupportForAttributionReporting()
       override;
   scoped_refptr<base::SingleThreadTaskRunner> VideoFrameCompositorTaskRunner()
       override;

content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt

diff --git a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
index 37632ad..7917a93 100644
--- a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
@@ -231,7 +231,6 @@
 crbug.com/1426916 [ chromeos chromeos-board-amd64-generic passthrough ] conformance/extensions/s3tc-and-rgtc.html [ Slow ]
 crbug.com/1426916 [ chromeos chromeos-board-amd64-generic passthrough ] conformance/textures/canvas_sub_rectangle/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html [ Slow ]
 crbug.com/1426916 [ chromeos chromeos-board-amd64-generic passthrough ] conformance2/extensions/webgl-multi-draw-instanced-base-vertex-base-instance.html [ Slow ]
-crbug.com/1426916 [ chromeos chromeos-board-amd64-generic passthrough ] conformance2/sync/sync-webgl-specific.html [ Slow ]
 crbug.com/1426916 [ chromeos chromeos-board-amd64-generic passthrough ] conformance2/textures/canvas_sub_rectangle/tex-2d-rg32f-rg-float.html [ Slow ]
 crbug.com/1426916 [ chromeos chromeos-board-amd64-generic passthrough ] conformance2/textures/canvas_sub_rectangle/tex-2d-rg8ui-rg_integer-unsigned_byte.html [ Slow ]
 crbug.com/1426916 [ chromeos chromeos-board-amd64-generic passthrough ] conformance2/uniforms/incompatible-texture-type-for-sampler.html [ Slow ]
@@ -892,6 +891,8 @@
 # Failures on validating command decoder only; won't fix.
 crbug.com/angleproject/5038 [ chromeos chromeos-board-amd64-generic mesa_ge_21.0 no-passthrough target-cpu-64 ] conformance/extensions/ext-color-buffer-half-float.html [ Failure ]
 
+# Still frequently times out with Slow expectation.
+crbug.com/1426913 [ chromeos chromeos-board-amd64-generic passthrough ] conformance2/sync/sync-webgl-specific.html [ Failure ]
 
 ##############################
 # Lacros-like Linux Failures #

gpu/command_buffer/client/buffer_tracker_unittest.cc

diff --git a/gpu/command_buffer/client/buffer_tracker_unittest.cc b/gpu/command_buffer/client/buffer_tracker_unittest.cc
index 2c05760..dee24d9c 100644
--- a/gpu/command_buffer/client/buffer_tracker_unittest.cc
+++ b/gpu/command_buffer/client/buffer_tracker_unittest.cc
@@ -33,13 +33,14 @@
   scoped_refptr<gpu::Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) override {
     if (context_lost_) {
       *id = -1;
       return nullptr;
     }
-    return MockClientCommandBuffer::CreateTransferBuffer(size, id);
+    return MockClientCommandBuffer::CreateTransferBuffer(size, id, alignment);
   }
 
   void set_context_lost(bool context_lost) {

gpu/command_buffer/client/client_discardable_manager_unittest.cc

diff --git a/gpu/command_buffer/client/client_discardable_manager_unittest.cc b/gpu/command_buffer/client/client_discardable_manager_unittest.cc
index 1ab2e01..4f2fa68d 100644
--- a/gpu/command_buffer/client/client_discardable_manager_unittest.cc
+++ b/gpu/command_buffer/client/client_discardable_manager_unittest.cc
@@ -34,11 +34,12 @@
   scoped_refptr<gpu::Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) override {
     *id = next_id_++;
     active_ids_.insert(*id);
-    return MakeMemoryBuffer(size);
+    return MakeMemoryBuffer(size, alignment);
   }
   void DestroyTransferBuffer(int32_t id) override {
     auto found = active_ids_.find(id);

gpu/command_buffer/client/client_test_helper.cc

diff --git a/gpu/command_buffer/client/client_test_helper.cc b/gpu/command_buffer/client/client_test_helper.cc
index be91ffa..f21ec2d 100644
--- a/gpu/command_buffer/client/client_test_helper.cc
+++ b/gpu/command_buffer/client/client_test_helper.cc
@@ -137,6 +137,7 @@
 scoped_refptr<gpu::Buffer> MockClientCommandBuffer::CreateTransferBuffer(
     uint32_t size,
     int32_t* id,
+    uint32_t alignment,
     TransferBufferAllocationOption option) {
   return CreateTransferBufferHelper(size, id);
 }

gpu/command_buffer/client/client_test_helper.h

diff --git a/gpu/command_buffer/client/client_test_helper.h b/gpu/command_buffer/client/client_test_helper.h
index a7464d5..5399b36 100644
--- a/gpu/command_buffer/client/client_test_helper.h
+++ b/gpu/command_buffer/client/client_test_helper.h
@@ -69,6 +69,7 @@
   scoped_refptr<gpu::Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) override;
 

gpu/command_buffer/client/command_buffer_direct_locked.cc

diff --git a/gpu/command_buffer/client/command_buffer_direct_locked.cc b/gpu/command_buffer/client/command_buffer_direct_locked.cc
index 04de60d..5cb71b2 100644
--- a/gpu/command_buffer/client/command_buffer_direct_locked.cc
+++ b/gpu/command_buffer/client/command_buffer_direct_locked.cc
@@ -44,12 +44,14 @@
 scoped_refptr<Buffer> CommandBufferDirectLocked::CreateTransferBuffer(
     uint32_t size,
     int32_t* id,
+    uint32_t alignment,
     TransferBufferAllocationOption option) {
   if (fail_create_transfer_buffer_) {
     *id = -1;
     return nullptr;
   } else {
-    return CommandBufferDirect::CreateTransferBuffer(size, id, option);
+    return CommandBufferDirect::CreateTransferBuffer(size, id, alignment,
+                                                     option);
   }
 }
 

gpu/command_buffer/client/command_buffer_direct_locked.h

diff --git a/gpu/command_buffer/client/command_buffer_direct_locked.h b/gpu/command_buffer/client/command_buffer_direct_locked.h
index 4195797..a4c1bbf 100644
--- a/gpu/command_buffer/client/command_buffer_direct_locked.h
+++ b/gpu/command_buffer/client/command_buffer_direct_locked.h
@@ -30,6 +30,7 @@
   scoped_refptr<Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) override;
 

gpu/command_buffer/client/mapped_memory.cc

diff --git a/gpu/command_buffer/client/mapped_memory.cc b/gpu/command_buffer/client/mapped_memory.cc
index 8acb49e..b4b3572 100644
--- a/gpu/command_buffer/client/mapped_memory.cc
+++ b/gpu/command_buffer/client/mapped_memory.cc
@@ -112,8 +112,8 @@
     return nullptr;
 
   int32_t id = -1;
-  scoped_refptr<gpu::Buffer> shm =
-      cmd_buf->CreateTransferBuffer(safe_chunk_size, &id, option);
+  scoped_refptr<gpu::Buffer> shm = cmd_buf->CreateTransferBuffer(
+      safe_chunk_size, &id, /* alignment */ 0, option);
   if (id  < 0)
     return nullptr;
   DCHECK(shm.get());

gpu/command_buffer/client/transfer_buffer.cc

diff --git a/gpu/command_buffer/client/transfer_buffer.cc b/gpu/command_buffer/client/transfer_buffer.cc
index 698da14..81a3848 100644
--- a/gpu/command_buffer/client/transfer_buffer.cc
+++ b/gpu/command_buffer/client/transfer_buffer.cc
@@ -119,7 +119,7 @@
   for (;size >= min_buffer_size_; size /= 2) {
     int32_t id = -1;
     scoped_refptr<gpu::Buffer> buffer =
-        helper_->command_buffer()->CreateTransferBuffer(size, &id);
+        helper_->command_buffer()->CreateTransferBuffer(size, &id, alignment_);
     if (id != -1) {
       last_allocated_size_ = size;
       DCHECK(buffer.get());

gpu/command_buffer/client/transfer_buffer_unittest.cc

diff --git a/gpu/command_buffer/client/transfer_buffer_unittest.cc b/gpu/command_buffer/client/transfer_buffer_unittest.cc
index 6781aa8..f9b70370 100644
--- a/gpu/command_buffer/client/transfer_buffer_unittest.cc
+++ b/gpu/command_buffer/client/transfer_buffer_unittest.cc
@@ -230,17 +230,19 @@
   MockClientCommandBufferCanFail() = default;
   ~MockClientCommandBufferCanFail() override = default;
 
-  MOCK_METHOD3(CreateTransferBuffer,
+  MOCK_METHOD4(CreateTransferBuffer,
                scoped_refptr<Buffer>(uint32_t size,
                                      int32_t* id,
+                                     uint32_t alignment,
                                      TransferBufferAllocationOption option));
 
   scoped_refptr<gpu::Buffer> RealCreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment,
       TransferBufferAllocationOption option) {
-    return MockClientCommandBufferMockFlush::CreateTransferBuffer(size, id,
-                                                                  option);
+    return MockClientCommandBufferMockFlush::CreateTransferBuffer(
+        size, id, alignment, option);
   }
 };
 
@@ -278,7 +280,7 @@
   command_buffer_->SetTokenForSetGetBuffer(0);
 
   EXPECT_CALL(*command_buffer(),
-              CreateTransferBuffer(kCommandBufferSizeBytes, _, _))
+              CreateTransferBuffer(kCommandBufferSizeBytes, _, _, _))
       .WillOnce(
           Invoke(command_buffer(),
                  &MockClientCommandBufferCanFail::RealCreateTransferBuffer))
@@ -291,7 +293,7 @@
   transfer_buffer_id_ = command_buffer()->GetNextFreeTransferBufferId();
 
   EXPECT_CALL(*command_buffer(),
-              CreateTransferBuffer(kStartTransferBufferSize, _, _))
+              CreateTransferBuffer(kStartTransferBufferSize, _, _, _))
       .WillOnce(
           Invoke(command_buffer(),
                  &MockClientCommandBufferCanFail::RealCreateTransferBuffer))
@@ -342,7 +344,7 @@
     EXPECT_CALL(*command_buffer(), OrderingBarrier(_))
         .Times(1)
         .RetiresOnSaturation();
-    EXPECT_CALL(*command_buffer(), CreateTransferBuffer(size, _, _))
+    EXPECT_CALL(*command_buffer(), CreateTransferBuffer(size, _, _, _))
         .WillOnce(
             Invoke(command_buffer(),
                    &MockClientCommandBufferCanFail::RealCreateTransferBuffer))
@@ -439,7 +441,7 @@
     EXPECT_CALL(*command_buffer(), OrderingBarrier(_))
         .Times(1)
         .RetiresOnSaturation();
-    EXPECT_CALL(*command_buffer(), CreateTransferBuffer(size, _, _))
+    EXPECT_CALL(*command_buffer(), CreateTransferBuffer(size, _, _, _))
         .WillOnce(
             Invoke(command_buffer(),
                    &MockClientCommandBufferCanFail::RealCreateTransferBuffer))
@@ -489,7 +491,7 @@
     EXPECT_CALL(*command_buffer(), OrderingBarrier(_))
         .Times(1)
         .RetiresOnSaturation();
-    EXPECT_CALL(*command_buffer(), CreateTransferBuffer(size, _, _))
+    EXPECT_CALL(*command_buffer(), CreateTransferBuffer(size, _, _, _))
         .WillOnce(
             Invoke(command_buffer(),
                    &MockClientCommandBufferCanFail::RealCreateTransferBuffer))
@@ -537,12 +539,12 @@
 
   // Try to allocate again, fail first request
   EXPECT_CALL(*command_buffer(),
-              CreateTransferBuffer(kStartTransferBufferSize, _, _))
+              CreateTransferBuffer(kStartTransferBufferSize, _, _, _))
       .WillOnce(
           DoAll(SetArgPointee<1>(-1), Return(scoped_refptr<gpu::Buffer>())))
       .RetiresOnSaturation();
   EXPECT_CALL(*command_buffer(),
-              CreateTransferBuffer(kMinTransferBufferSize, _, _))
+              CreateTransferBuffer(kMinTransferBufferSize, _, _, _))
       .WillOnce(
           Invoke(command_buffer(),
                  &MockClientCommandBufferCanFail::RealCreateTransferBuffer))
@@ -570,7 +572,7 @@
 
   // Try to allocate again,
   EXPECT_CALL(*command_buffer(),
-              CreateTransferBuffer(kMinTransferBufferSize, _, _))
+              CreateTransferBuffer(kMinTransferBufferSize, _, _, _))
       .WillOnce(
           Invoke(command_buffer(),
                  &MockClientCommandBufferCanFail::RealCreateTransferBuffer))
@@ -596,7 +598,7 @@
   EXPECT_FALSE(transfer_buffer_->HaveBuffer());
 
   // Try to allocate again, fail both requests.
-  EXPECT_CALL(*command_buffer(), CreateTransferBuffer(_, _, _))
+  EXPECT_CALL(*command_buffer(), CreateTransferBuffer(_, _, _, _))
       .WillOnce(
           DoAll(SetArgPointee<1>(-1), Return(scoped_refptr<gpu::Buffer>())))
       .WillOnce(
@@ -626,7 +628,7 @@
 
   // See that it gets reallocated.
   EXPECT_CALL(*command_buffer(),
-              CreateTransferBuffer(kStartTransferBufferSize, _, _))
+              CreateTransferBuffer(kStartTransferBufferSize, _, _, _))
       .WillOnce(
           Invoke(command_buffer(),
                  &MockClientCommandBufferCanFail::RealCreateTransferBuffer))

gpu/command_buffer/common/buffer.cc

diff --git a/gpu/command_buffer/common/buffer.cc b/gpu/command_buffer/common/buffer.cc
index d3d5ac8..a99be70 100644
--- a/gpu/command_buffer/common/buffer.cc
+++ b/gpu/command_buffer/common/buffer.cc
@@ -9,6 +9,7 @@
 #include <ostream>
 
 #include "base/atomic_sequence_num.h"
+#include "base/bits.h"
 #include "base/check_op.h"
 #include "base/format_macros.h"
 #include "base/no_destructor.h"
@@ -34,13 +35,14 @@
   return base::UnguessableToken();
 }
 
-MemoryBufferBacking::MemoryBufferBacking(uint32_t size)
-    : memory_(new char[size]), size_(size) {}
+MemoryBufferBacking::MemoryBufferBacking(uint32_t size, uint32_t alignment)
+    : memory_(new char[size + alignment]), size_(size), alignment_(alignment) {}
 
 MemoryBufferBacking::~MemoryBufferBacking() = default;
 
 void* MemoryBufferBacking::GetMemory() const {
-  return memory_.get();
+  return alignment_ > 0 ? base::bits::AlignUp(memory_.get(), alignment_)
+                        : memory_.get();
 }
 
 uint32_t MemoryBufferBacking::GetSize() const {

gpu/command_buffer/common/buffer.h

diff --git a/gpu/command_buffer/common/buffer.h b/gpu/command_buffer/common/buffer.h
index b441738..28e47ee 100644
--- a/gpu/command_buffer/common/buffer.h
+++ b/gpu/command_buffer/common/buffer.h
@@ -29,7 +29,7 @@
 
 class GPU_EXPORT MemoryBufferBacking : public BufferBacking {
  public:
-  explicit MemoryBufferBacking(uint32_t size);
+  explicit MemoryBufferBacking(uint32_t size, uint32_t alignment = 0);
 
   MemoryBufferBacking(const MemoryBufferBacking&) = delete;
   MemoryBufferBacking& operator=(const MemoryBufferBacking&) = delete;
@@ -41,6 +41,7 @@
  private:
   std::unique_ptr<char[]> memory_;
   uint32_t size_;
+  uint32_t alignment_;
 };
 
 
@@ -108,9 +109,10 @@
       std::move(shared_memory_region), std::move(shared_memory_mapping)));
 }
 
-inline scoped_refptr<Buffer> MakeMemoryBuffer(uint32_t size) {
+inline scoped_refptr<Buffer> MakeMemoryBuffer(uint32_t size,
+                                              uint32_t alignment = 0) {
   return base::MakeRefCounted<Buffer>(
-      std::make_unique<MemoryBufferBacking>(size));
+      std::make_unique<MemoryBufferBacking>(size, alignment));
 }
 
 // Generates a process unique buffer ID which can be safely used with

gpu/command_buffer/common/command_buffer.h

diff --git a/gpu/command_buffer/common/command_buffer.h b/gpu/command_buffer/common/command_buffer.h
index 40acc174..5cc7983 100644
--- a/gpu/command_buffer/common/command_buffer.h
+++ b/gpu/command_buffer/common/command_buffer.h
@@ -119,6 +119,7 @@
   virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) = 0;
 

gpu/command_buffer/service/command_buffer_direct.cc

diff --git a/gpu/command_buffer/service/command_buffer_direct.cc b/gpu/command_buffer/service/command_buffer_direct.cc
index 13ad519..4a46a88 100644
--- a/gpu/command_buffer/service/command_buffer_direct.cc
+++ b/gpu/command_buffer/service/command_buffer_direct.cc
@@ -55,8 +55,9 @@
 scoped_refptr<Buffer> CommandBufferDirect::CreateTransferBuffer(
     uint32_t size,
     int32_t* id,
+    uint32_t alignment,
     TransferBufferAllocationOption option) {
-  return service_.CreateTransferBuffer(size, id);
+  return service_.CreateTransferBuffer(size, id, alignment);
 }
 
 void CommandBufferDirect::DestroyTransferBuffer(int32_t id) {

gpu/command_buffer/service/command_buffer_direct.h

diff --git a/gpu/command_buffer/service/command_buffer_direct.h b/gpu/command_buffer/service/command_buffer_direct.h
index 7483bd85..6fa3e7f4 100644
--- a/gpu/command_buffer/service/command_buffer_direct.h
+++ b/gpu/command_buffer/service/command_buffer_direct.h
@@ -38,6 +38,7 @@
   scoped_refptr<Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) override;
   void DestroyTransferBuffer(int32_t id) override;

gpu/command_buffer/service/command_buffer_service.cc

diff --git a/gpu/command_buffer/service/command_buffer_service.cc b/gpu/command_buffer/service/command_buffer_service.cc
index be460adc..7368f3e 100644
--- a/gpu/command_buffer/service/command_buffer_service.cc
+++ b/gpu/command_buffer/service/command_buffer_service.cc
@@ -309,12 +309,15 @@
   UpdateState();
 }
 
-scoped_refptr<Buffer> CommandBufferService::CreateTransferBuffer(uint32_t size,
-                                                                 int32_t* id) {
+scoped_refptr<Buffer> CommandBufferService::CreateTransferBuffer(
+    uint32_t size,
+    int32_t* id,
+    uint32_t alignment) {
   *id = GetNextBufferId();
-  auto result = CreateTransferBufferWithId(size, *id);
-  if (!result)
+  auto result = CreateTransferBufferWithId(size, *id, alignment);
+  if (!result) {
     *id = -1;
+  }
   return result;
 }
 
@@ -335,8 +338,9 @@
 
 scoped_refptr<Buffer> CommandBufferService::CreateTransferBufferWithId(
     uint32_t size,
-    int32_t id) {
-  scoped_refptr<Buffer> buffer = MakeMemoryBuffer(size);
+    int32_t id,
+    uint32_t alignment) {
+  scoped_refptr<Buffer> buffer = MakeMemoryBuffer(size, alignment);
   if (!RegisterTransferBuffer(id, buffer)) {
     SetParseError(gpu::error::kOutOfBounds);
     return nullptr;

gpu/command_buffer/service/command_buffer_service.h

diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index 557a168..4c6ca4af 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -112,10 +112,14 @@
 
   // Creates an in-process transfer buffer and register it with a newly created
   // id.
-  scoped_refptr<Buffer> CreateTransferBuffer(uint32_t size, int32_t* id);
+  scoped_refptr<Buffer> CreateTransferBuffer(uint32_t size,
+                                             int32_t* id,
+                                             uint32_t alignment = 0);
 
   // Creates an in-process transfer buffer and register it with a given id.
-  scoped_refptr<Buffer> CreateTransferBufferWithId(uint32_t size, int32_t id);
+  scoped_refptr<Buffer> CreateTransferBufferWithId(uint32_t size,
+                                                   int32_t id,
+                                                   uint32_t alignment = 0);
 
   // Sets whether commands should be processed by this scheduler. Setting to
   // false unschedules. Setting to true reschedules.

gpu/config/gpu_driver_bug_list.json

diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
index 05c6286..29163fe 100644
--- a/gpu/config/gpu_driver_bug_list.json
+++ b/gpu/config/gpu_driver_bug_list.json
@@ -4196,6 +4196,22 @@
       "features": [
         "disable_metal"
       ]
+    },
+    {
+      "id": 411,
+      "cr_bugs": [1433287],
+      "description": "Disable VP9 HW encode on Intel GPU with old drivers",
+      "os": {
+        "type": "win"
+      },
+      "vendor_id": "0x8086",
+      "driver_version": {
+        "op": "<",
+        "value": "30.0.100.9667"
+      },
+      "features": [
+        "disable_accelerated_vp9_encode"
+      ]
     }
   ]
 }

gpu/ipc/client/command_buffer_proxy_impl.cc

diff --git a/gpu/ipc/client/command_buffer_proxy_impl.cc b/gpu/ipc/client/command_buffer_proxy_impl.cc
index 8469e93..ab04701b 100644
--- a/gpu/ipc/client/command_buffer_proxy_impl.cc
+++ b/gpu/ipc/client/command_buffer_proxy_impl.cc
@@ -342,6 +342,7 @@
 scoped_refptr<gpu::Buffer> CommandBufferProxyImpl::CreateTransferBuffer(
     uint32_t size,
     int32_t* id,
+    uint32_t alignment,
     TransferBufferAllocationOption option) {
   CheckLock();
   base::AutoLock lock(last_state_lock_);

gpu/ipc/client/command_buffer_proxy_impl.h

diff --git a/gpu/ipc/client/command_buffer_proxy_impl.h b/gpu/ipc/client/command_buffer_proxy_impl.h
index c4bedde..18859f8 100644
--- a/gpu/ipc/client/command_buffer_proxy_impl.h
+++ b/gpu/ipc/client/command_buffer_proxy_impl.h
@@ -118,6 +118,7 @@
   scoped_refptr<gpu::Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) override;
   void DestroyTransferBuffer(int32_t id) override;

gpu/ipc/client/command_buffer_proxy_impl_unittest.cc

diff --git a/gpu/ipc/client/command_buffer_proxy_impl_unittest.cc b/gpu/ipc/client/command_buffer_proxy_impl_unittest.cc
index 8f01de6..16d78ff 100644
--- a/gpu/ipc/client/command_buffer_proxy_impl_unittest.cc
+++ b/gpu/ipc/client/command_buffer_proxy_impl_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 
+#include <limits>
 #include <utility>
 #include <vector>
 
@@ -290,7 +291,7 @@
 
   int32_t id = -1;
   scoped_refptr<gpu::Buffer> transfer_buffer_oom = proxy->CreateTransferBuffer(
-      std::numeric_limits<uint32_t>::max(), &id,
+      std::numeric_limits<uint32_t>::max(), &id, 0,
       TransferBufferAllocationOption::kReturnNullOnOOM);
   if (transfer_buffer_oom) {
     // In this test, there's no guarantee allocating UINT32_MAX will definitely
@@ -315,7 +316,7 @@
       .RetiresOnSaturation();
 
   transfer_buffer_oom = proxy->CreateTransferBuffer(
-      std::numeric_limits<uint32_t>::max(), &id,
+      std::numeric_limits<uint32_t>::max(), &id, 0,
       TransferBufferAllocationOption::kLoseContextOnOOM);
 
   EXPECT_CALL(mock_gpu_channel_, DestroyCommandBuffer(_))

gpu/ipc/in_process_command_buffer.cc

diff --git a/gpu/ipc/in_process_command_buffer.cc b/gpu/ipc/in_process_command_buffer.cc
index 7cc29133..b459188b 100644
--- a/gpu/ipc/in_process_command_buffer.cc
+++ b/gpu/ipc/in_process_command_buffer.cc
@@ -747,8 +747,9 @@
 scoped_refptr<Buffer> InProcessCommandBuffer::CreateTransferBuffer(
     uint32_t size,
     int32_t* id,
+    uint32_t alignment,
     TransferBufferAllocationOption option) {
-  scoped_refptr<Buffer> buffer = MakeMemoryBuffer(size);
+  scoped_refptr<Buffer> buffer = MakeMemoryBuffer(size, alignment);
   *id = GetNextBufferId();
   ScheduleGpuTask(
       base::BindOnce(&InProcessCommandBuffer::RegisterTransferBufferOnGpuThread,

gpu/ipc/in_process_command_buffer.h

diff --git a/gpu/ipc/in_process_command_buffer.h b/gpu/ipc/in_process_command_buffer.h
index 774a235..47e677c 100644
--- a/gpu/ipc/in_process_command_buffer.h
+++ b/gpu/ipc/in_process_command_buffer.h
@@ -117,6 +117,7 @@
   scoped_refptr<Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       TransferBufferAllocationOption option =
           TransferBufferAllocationOption::kLoseContextOnOOM) override;
   void DestroyTransferBuffer(int32_t id) override;

gpu/ipc/service/gpu_init.cc

diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
index cb706502..390032b 100644
--- a/gpu/ipc/service/gpu_init.cc
+++ b/gpu/ipc/service/gpu_init.cc
@@ -936,6 +936,12 @@
 
   InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
 
+  if (!gl_disabled) {
+    if (!CollectGpuExtraInfo(&gpu_extra_info_, gpu_preferences)) {
+      VLOG(1) << "gpu::CollectGpuExtraInfo failed";
+    }
+  }
+
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   // Driver may create a compatibility profile context when collect graphics
   // information on Linux platform. Try to collect graphics information

infra/config/generated/builders/reclient/Win x64 Builder reclient staging untrusted/properties.json

diff --git a/infra/config/generated/builders/reclient/Win x64 Builder reclient staging untrusted/properties.json b/infra/config/generated/builders/reclient/Win x64 Builder reclient staging untrusted/properties.json
index a518eca..a1e0e8e 100644
--- a/infra/config/generated/builders/reclient/Win x64 Builder reclient staging untrusted/properties.json
+++ b/infra/config/generated/builders/reclient/Win x64 Builder reclient staging untrusted/properties.json
@@ -44,13 +44,11 @@
   },
   "$build/reclient": {
     "bootstrap_env": {
-      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "false",
-      "RBE_deps_cache_mode": "reproxy",
-      "RBE_experimental_goma_deps_cache": "True",
-      "RBE_ip_reset_min_delay": "-1s"
+      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "true"
     },
     "instance": "rbe-chromium-untrusted",
-    "metrics_project": "chromium-reclient-metrics"
+    "metrics_project": "chromium-reclient-metrics",
+    "scandeps_server": true
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

infra/config/generated/builders/reclient/Win x64 Builder reclient staging/properties.json

diff --git a/infra/config/generated/builders/reclient/Win x64 Builder reclient staging/properties.json b/infra/config/generated/builders/reclient/Win x64 Builder reclient staging/properties.json
index 17763d1..6f6cd0b 100644
--- a/infra/config/generated/builders/reclient/Win x64 Builder reclient staging/properties.json
+++ b/infra/config/generated/builders/reclient/Win x64 Builder reclient staging/properties.json
@@ -44,13 +44,11 @@
   },
   "$build/reclient": {
     "bootstrap_env": {
-      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "false",
-      "RBE_deps_cache_mode": "reproxy",
-      "RBE_experimental_goma_deps_cache": "True",
-      "RBE_ip_reset_min_delay": "-1s"
+      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "true"
     },
     "instance": "rbe-chromium-trusted",
-    "metrics_project": "chromium-reclient-metrics"
+    "metrics_project": "chromium-reclient-metrics",
+    "scandeps_server": true
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

infra/config/generated/builders/reclient/Win x64 Builder reclient test untrusted/properties.json

diff --git a/infra/config/generated/builders/reclient/Win x64 Builder reclient test untrusted/properties.json b/infra/config/generated/builders/reclient/Win x64 Builder reclient test untrusted/properties.json
index 55cc784..52126c31 100644
--- a/infra/config/generated/builders/reclient/Win x64 Builder reclient test untrusted/properties.json
+++ b/infra/config/generated/builders/reclient/Win x64 Builder reclient test untrusted/properties.json
@@ -44,13 +44,11 @@
   },
   "$build/reclient": {
     "bootstrap_env": {
-      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "false",
-      "RBE_deps_cache_mode": "reproxy",
-      "RBE_experimental_goma_deps_cache": "True",
-      "RBE_ip_reset_min_delay": "-1s"
+      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "true"
     },
     "instance": "rbe-chromium-untrusted-test",
-    "metrics_project": "chromium-reclient-metrics"
+    "metrics_project": "chromium-reclient-metrics",
+    "scandeps_server": true
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

infra/config/generated/builders/reclient/Win x64 Builder reclient test/properties.json

diff --git a/infra/config/generated/builders/reclient/Win x64 Builder reclient test/properties.json b/infra/config/generated/builders/reclient/Win x64 Builder reclient test/properties.json
index 9634100..aa0e50b8 100644
--- a/infra/config/generated/builders/reclient/Win x64 Builder reclient test/properties.json
+++ b/infra/config/generated/builders/reclient/Win x64 Builder reclient test/properties.json
@@ -44,13 +44,11 @@
   },
   "$build/reclient": {
     "bootstrap_env": {
-      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "false",
-      "RBE_deps_cache_mode": "reproxy",
-      "RBE_experimental_goma_deps_cache": "True",
-      "RBE_ip_reset_min_delay": "-1s"
+      "GOMA_COMPILER_PROXY_ENABLE_CRASH_DUMP": "true"
     },
     "instance": "rbe-chromium-trusted-test",
-    "metrics_project": "chromium-reclient-metrics"
+    "metrics_project": "chromium-reclient-metrics",
+    "scandeps_server": true
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json
index 7914b3e4..0d12594 100644
--- a/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/chromeos-amd64-generic-rel-compilator/properties.json
@@ -51,7 +51,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/fuchsia-arm64-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/fuchsia-arm64-rel-compilator/properties.json b/infra/config/generated/builders/try/fuchsia-arm64-rel-compilator/properties.json
index 5419689..346d218 100644
--- a/infra/config/generated/builders/try/fuchsia-arm64-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/fuchsia-arm64-rel-compilator/properties.json
@@ -45,7 +45,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel-compilator/properties.json b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel-compilator/properties.json
index 2a8992d..1a0b663 100644
--- a/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/fuchsia-x64-cast-receiver-rel-compilator/properties.json
@@ -50,7 +50,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/ios-simulator-compilator/properties.json

diff --git a/infra/config/generated/builders/try/ios-simulator-compilator/properties.json b/infra/config/generated/builders/try/ios-simulator-compilator/properties.json
index a5bdee0..6a52b4fa 100644
--- a/infra/config/generated/builders/try/ios-simulator-compilator/properties.json
+++ b/infra/config/generated/builders/try/ios-simulator-compilator/properties.json
@@ -55,7 +55,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics",
     "scandeps_server": true
   },

infra/config/generated/builders/try/lacros-amd64-generic-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/lacros-amd64-generic-rel-compilator/properties.json b/infra/config/generated/builders/try/lacros-amd64-generic-rel-compilator/properties.json
index 2f5a33f5..0e5e3ba 100644
--- a/infra/config/generated/builders/try/lacros-amd64-generic-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/lacros-amd64-generic-rel-compilator/properties.json
@@ -56,7 +56,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json b/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json
index a5d7443e..e5df027 100644
--- a/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/linux-chromeos-rel-compilator/properties.json
@@ -51,7 +51,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/linux-lacros-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/linux-lacros-rel-compilator/properties.json b/infra/config/generated/builders/try/linux-lacros-rel-compilator/properties.json
index 893dfc9d..aa5c0c6 100644
--- a/infra/config/generated/builders/try/linux-lacros-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/linux-lacros-rel-compilator/properties.json
@@ -86,7 +86,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/linux-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/linux-rel-compilator/properties.json b/infra/config/generated/builders/try/linux-rel-compilator/properties.json
index adf5c36..ae8b07c 100644
--- a/infra/config/generated/builders/try/linux-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/linux-rel-compilator/properties.json
@@ -160,7 +160,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json b/infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json
index 80aa461..e2ae8630 100644
--- a/infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/linux-wayland-rel-compilator/properties.json
@@ -83,7 +83,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json

diff --git a/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json b/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json
index f421f27..5642fb3 100644
--- a/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json
+++ b/infra/config/generated/builders/try/linux_chromium_asan_rel_ng-compilator/properties.json
@@ -79,7 +79,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json

diff --git a/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json b/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json
index 241b4deb..41c7ecf9 100644
--- a/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json
+++ b/infra/config/generated/builders/try/linux_chromium_tsan_rel_ng-compilator/properties.json
@@ -77,7 +77,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/generated/builders/try/mac-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/mac-rel-compilator/properties.json b/infra/config/generated/builders/try/mac-rel-compilator/properties.json
index 8280823..343accc 100644
--- a/infra/config/generated/builders/try/mac-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/mac-rel-compilator/properties.json
@@ -161,7 +161,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics",
     "scandeps_server": true
   },

infra/config/generated/builders/try/mac12-arm64-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/mac12-arm64-rel-compilator/properties.json b/infra/config/generated/builders/try/mac12-arm64-rel-compilator/properties.json
index d229737f9..a42722a 100644
--- a/infra/config/generated/builders/try/mac12-arm64-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/mac12-arm64-rel-compilator/properties.json
@@ -79,7 +79,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics",
     "scandeps_server": true
   },

infra/config/generated/builders/try/win-rel-compilator/properties.json

diff --git a/infra/config/generated/builders/try/win-rel-compilator/properties.json b/infra/config/generated/builders/try/win-rel-compilator/properties.json
index 7e92d16..f1a6fb83 100644
--- a/infra/config/generated/builders/try/win-rel-compilator/properties.json
+++ b/infra/config/generated/builders/try/win-rel-compilator/properties.json
@@ -164,7 +164,7 @@
   },
   "$build/reclient": {
     "instance": "rbe-chromium-untrusted",
-    "jobs": 300,
+    "jobs": 225,
     "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {

infra/config/lib/builders.star

diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star
index 31ab45df..2ffa463 100644
--- a/infra/config/lib/builders.star
+++ b/infra/config/lib/builders.star
@@ -145,6 +145,7 @@
         LOW_JOBS_FOR_CI = 80,
         HIGH_JOBS_FOR_CI = 500,
         LOW_JOBS_FOR_CQ = 150,
+        MID_JOBS_FOR_CQ = 225,
         HIGH_JOBS_FOR_CQ = 300,
     ),
 )

infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star b/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
index 2fc70927..9b5e483 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
@@ -17,7 +17,7 @@
     cores = 8,
     os = os.LINUX_DEFAULT,
     compilator_cores = 16,
-    compilator_reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CQ,
+    compilator_reclient_jobs = reclient.jobs.MID_JOBS_FOR_CQ,
     execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
     orchestrator_cores = 2,
     reclient_instance = reclient.instance.DEFAULT_UNTRUSTED,

infra/config/subprojects/chromium/try/tryserver.chromium.fuchsia.star

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.fuchsia.star b/infra/config/subprojects/chromium/try/tryserver.chromium.fuchsia.star
index be16903..64a7d83 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.fuchsia.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.fuchsia.star
@@ -17,7 +17,7 @@
     cores = 8,
     os = os.LINUX_DEFAULT,
     compilator_cores = 8,
-    compilator_reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CQ,
+    compilator_reclient_jobs = reclient.jobs.MID_JOBS_FOR_CQ,
     execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
     orchestrator_cores = 2,
     reclient_instance = reclient.instance.DEFAULT_UNTRUSTED,

infra/config/subprojects/chromium/try/tryserver.chromium.linux.star

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
index 2d21808..2e013fa 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
@@ -17,7 +17,7 @@
     cores = 8,
     os = os.LINUX_DEFAULT,
     compilator_cores = 8,
-    compilator_reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CQ,
+    compilator_reclient_jobs = reclient.jobs.MID_JOBS_FOR_CQ,
     execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
     orchestrator_cores = 2,
     reclient_instance = reclient.instance.DEFAULT_UNTRUSTED,

infra/config/subprojects/chromium/try/tryserver.chromium.mac.star

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
index 173ec61e..e88b00a 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.mac.star
@@ -16,7 +16,7 @@
     builderless = True,
     os = os.MAC_ANY,
     ssd = True,
-    compilator_reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CQ,
+    compilator_reclient_jobs = reclient.jobs.MID_JOBS_FOR_CQ,
     execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
     orchestrator_cores = 2,
     reclient_instance = reclient.instance.DEFAULT_UNTRUSTED,

infra/config/subprojects/chromium/try/tryserver.chromium.win.star

diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.win.star b/infra/config/subprojects/chromium/try/tryserver.chromium.win.star
index c6bd156..919b2ef6 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.win.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.win.star
@@ -17,7 +17,7 @@
     cores = 8,
     os = os.WINDOWS_DEFAULT,
     compilator_cores = 16,
-    compilator_reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CQ,
+    compilator_reclient_jobs = reclient.jobs.MID_JOBS_FOR_CQ,
     execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
     orchestrator_cores = 2,
     reclient_instance = reclient.instance.DEFAULT_UNTRUSTED,

infra/config/subprojects/reclient/reclient.star

diff --git a/infra/config/subprojects/reclient/reclient.star b/infra/config/subprojects/reclient/reclient.star
index 3b49eda..127380e0 100644
--- a/infra/config/subprojects/reclient/reclient.star
+++ b/infra/config/subprojects/reclient/reclient.star
@@ -233,7 +233,6 @@
     os = os.WINDOWS_ANY,
     console_view_category = "win",
     execution_timeout = 5 * time.hour,
-    reclient_scandeps_server = False,
 )
 
 fyi_reclient_test_builder(
@@ -256,7 +255,6 @@
     os = os.WINDOWS_ANY,
     console_view_category = "win",
     execution_timeout = 5 * time.hour,
-    reclient_scandeps_server = False,
 )
 
 fyi_reclient_staging_builder(

ios/chrome/browser/bring_android_tabs/bring_android_tabs_to_ios_service.mm

diff --git a/ios/chrome/browser/bring_android_tabs/bring_android_tabs_to_ios_service.mm b/ios/chrome/browser/bring_android_tabs/bring_android_tabs_to_ios_service.mm
index a8963ec..00ae7168 100644
--- a/ios/chrome/browser/bring_android_tabs/bring_android_tabs_to_ios_service.mm
+++ b/ios/chrome/browser/bring_android_tabs/bring_android_tabs_to_ios_service.mm
@@ -66,10 +66,6 @@
       }
     }
   }
-  if (GetBringYourOwnTabsPromptType() ==
-      BringYourOwnTabsPromptType::kDisabled) {
-    return false;
-  }
   return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE;
 }
 
@@ -149,10 +145,15 @@
   if (!position_of_tabs_in_synced_sessions_.empty()) {
     return;
   }
-  // If the tabs are empty, it's possible that the tabs aren't loaded because
-  // the last invocation to `LoadTabs()` happens before the user enrolls in
-  // sync. Try again.
-  if (UserIsAndroidSwitcher(device_switcher_result_dispatcher_)) {
+  // If the feature is enabled and the user is an android switcher BUT the tabs
+  // are empty, it's possible that the tabs aren't loaded because the last
+  // invocation to `LoadTabs()` happens before the user enrolls in sync. Try
+  // again.
+  // The feature check is called right before
+  // `UserIsAndroidSwitcher()` to avoid collecting unnecessary/noisy data.
+  if (GetBringYourOwnTabsPromptType() !=
+          BringYourOwnTabsPromptType::kDisabled &&
+      UserIsAndroidSwitcher(device_switcher_result_dispatcher_)) {
     LoadSyncedSessionsAndComputeTabPositions();
   }
 }

ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_mediator.mm

diff --git a/ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_mediator.mm b/ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_mediator.mm
index b3b3087..7e6ab585 100644
--- a/ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_mediator.mm
+++ b/ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_mediator.mm
@@ -174,10 +174,6 @@
       NOTREACHED_NORETURN();
     }
   }
-
-  // All codepaths above clear the sync-requested bit, either because the user
-  // is signed out or because SyncService::StopAndClear() does the job.
-  CHECK(!self.syncService->GetUserSettings()->IsSyncRequested());
 }
 
 - (void)signinWithIdentityOnStartAfterSignout {

ios/chrome/browser/ui/browser_container/edit_menu_app_interface.h

diff --git a/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.h b/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.h
index 3baf601d..33e5ec3 100644
--- a/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.h
+++ b/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.h
@@ -32,6 +32,8 @@
 // Some individual matchers for specific actions
 + (id<GREYMatcher>)editMenuLinkToTextButtonMatcher;
 + (id<GREYMatcher>)editMenuCopyButtonMatcher;
++ (id<GREYMatcher>)editMenuCutButtonMatcher;
++ (id<GREYMatcher>)editMenuPasteButtonMatcher;
 
 // Retrieve the accessibility IDs of menu items visible on screen.
 + (NSArray<NSString*>*)editMenuActions;

ios/chrome/browser/ui/browser_container/edit_menu_app_interface.mm

diff --git a/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.mm b/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.mm
index d2a71ab..60b67f48 100644
--- a/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.mm
+++ b/ios/chrome/browser/ui/browser_container/edit_menu_app_interface.mm
@@ -137,6 +137,14 @@
   return [EditMenuAppInterface editMenuActionWithAccessibilityLabel:@"Copy"];
 }
 
++ (id<GREYMatcher>)editMenuCutButtonMatcher {
+  return [EditMenuAppInterface editMenuActionWithAccessibilityLabel:@"Cut"];
+}
+
++ (id<GREYMatcher>)editMenuPasteButtonMatcher {
+  return [EditMenuAppInterface editMenuActionWithAccessibilityLabel:@"Paste"];
+}
+
 + (NSArray*)editMenuActions {
   NSMutableArray* menuElements = [NSMutableArray array];
   for (UIScene* scene in UIApplication.sharedApplication.connectedScenes) {

ios/chrome/browser/ui/content_suggestions/BUILD.gn

diff --git a/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 1325bf8..c294bda 100644
--- a/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -135,11 +135,15 @@
   deps = [
     ":content_suggestions_constant",
     "//base",
+    "//components/favicon_base",
+    "//components/ntp_tiles",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/ui/content_suggestions:constants",
+    "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
+    "//ios/chrome/browser/ui/favicon",
   ]
 }
 
@@ -160,13 +164,6 @@
   sources = [
     "content_suggestions_commands.h",
     "content_suggestions_consumer.h",
-    "content_suggestions_header_commands.h",
-    "content_suggestions_header_consumer.h",
-    "content_suggestions_header_view.h",
-    "content_suggestions_header_view.mm",
-    "content_suggestions_header_view_controller.h",
-    "content_suggestions_header_view_controller.mm",
-    "content_suggestions_header_view_controller_delegate.h",
     "content_suggestions_view_controller.h",
     "content_suggestions_view_controller.mm",
     "content_suggestions_view_controller_audience.h",
@@ -176,47 +173,25 @@
     ":constants",
     ":content_suggestions_constant",
     ":feature_flags",
+    ":metrics",
     ":public",
-    "resources:content_suggestions_no_image",
-    "resources:content_suggestions_offline",
-    "resources:ntp_search_icon",
     "//base",
     "//components/strings",
-    "//ios/chrome/app/strings",
     "//ios/chrome/browser/drag_and_drop",
-    "//ios/chrome/browser/ntp",
-    "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
-    "//ios/chrome/browser/shared/ui/elements",
-    "//ios/chrome/browser/shared/ui/list_model",
-    "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/content_suggestions:metrics",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
-    "//ios/chrome/browser/ui/content_suggestions/identifier",
-    "//ios/chrome/browser/ui/lens:lens_availability",
-    "//ios/chrome/browser/ui/lens:lens_entrypoint",
-    "//ios/chrome/browser/ui/ntp",
-    "//ios/chrome/browser/ui/ntp:logo",
-    "//ios/chrome/browser/ui/omnibox:features",
-    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
-    "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
+    "//ios/chrome/browser/ui/ntp:constants",
     "//ios/chrome/browser/ui/start_surface:feature_flags",
-    "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:constants",
     "//ios/chrome/browser/url_loading",
-    "//ios/chrome/browser/url_loading:url_loading_params_header",
-    "//ios/chrome/common:button_config",
     "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/colors",
-    "//ios/chrome/common/ui/elements",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
-    "//ios/public/provider/chrome/browser/lens:lens_api",
-    "//ios/web/common",
     "//ui/base",
+    "//url",
   ]
   public_deps = [ ":content_suggestions_ui_util" ]
   configs += [ "//build/config/compiler:enable_arc" ]

ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.h b/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.h
index 8ee3137..151cd30e 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.h
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.h
@@ -15,6 +15,7 @@
 
 @protocol ContentSuggestionsCollectionConsumer;
 @protocol ContentSuggestionsConsumer;
+@class ContentSuggestionsMetricsRecorder;
 @class ContentSuggestionsMostVisitedItem;
 @class FaviconAttributesProvider;
 class LargeIconCache;
@@ -45,6 +46,10 @@
 // Fetches the favicon for this `item`.
 - (void)fetchFaviconForMostVisited:(ContentSuggestionsMostVisitedItem*)item;
 
+// Recorder for content suggestions metrics.
+@property(nonatomic, assign)
+    ContentSuggestionsMetricsRecorder* contentSuggestionsMetricsRecorder;
+
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_FAVICON_MEDIATOR_H_

ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.mm
index dd249ab9..d1d86f3 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_favicon_mediator.mm
@@ -10,10 +10,10 @@
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_consumer.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
+#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.h"
 #import "ios/chrome/browser/ui/content_suggestions/identifier/content_suggestions_section_information.h"
 #import "ios/chrome/browser/ui/favicon/favicon_attributes_provider.h"
 #import "ios/chrome/browser/ui/favicon/favicon_attributes_with_payload.h"
-#import "ios/chrome/browser/ui/ntp/metrics/metrics.h"
 #import "ui/gfx/image/image.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -101,8 +101,8 @@
   for (size_t i = 0; i < _mostVisitedDataForLogging.size(); ++i) {
     ntp_tiles::NTPTile& ntpTile = _mostVisitedDataForLogging[i];
     if (ntpTile.url == item.URL) {
-      RecordNTPTileImpression(i, ntpTile.source, ntpTile.title_source,
-                              item.attributes, ntpTile.url);
+      [self.contentSuggestionsMetricsRecorder recordMostVisitedTileShown:item
+                                                                 atIndex:i];
       // Reset the URL to be sure to log the impression only once.
       ntpTile.url = GURL();
       break;

ios/chrome/browser/ui/content_suggestions/content_suggestions_header_commands.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_commands.h b/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_commands.h
deleted file mode 100644
index d921c14..0000000
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_commands.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2021 The Chromium Authors
-// 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_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_COMMANDS_H_
-#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_COMMANDS_H_
-
-// Commands protocol allowing the ContentSuggestionsHeaderViewController to
-// interact with the coordinator layer.
-@protocol ContentSuggestionsHeaderCommands
-
-// Informs the receiver that the ContentSuggestionsHeaderViewController's size
-// has changed.
-- (void)updateForHeaderSizeChange;
-
-// Informs the receiver that the fakebox was tapped.
-- (void)fakeboxTapped;
-
-// Informs the receiver that the identity disc was tapped.
-- (void)identityDiscWasTapped;
-
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_COMMANDS_H_

ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller_delegate.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller_delegate.h b/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller_delegate.h
deleted file mode 100644
index 577f396..0000000
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller_delegate.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Chromium Authors
-// 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_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_CONTROLLER_DELEGATE_H_
-#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_CONTROLLER_DELEGATE_H_
-
-#import <UIKit/UIKit.h>
-
-// Delegate for the ContentSuggestionsHeaderViewController.
-@protocol ContentSuggestionsHeaderViewControllerDelegate
-
-// Whether the scrollview is scrolled to the omnibox.
-@property(nonatomic, assign, readonly) BOOL scrolledToMinimumHeight;
-
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_CONTROLLER_DELEGATE_H_

ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
index f291731..bc19368 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.mm
@@ -61,7 +61,6 @@
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.h"
 #import "ios/chrome/browser/ui/content_suggestions/start_suggest_service_factory.h"
 #import "ios/chrome/browser/ui/ntp/feed_delegate.h"
-#import "ios/chrome/browser/ui/ntp/metrics/metrics.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/start_surface/start_surface_util.h"
 #import "ios/chrome/browser/ui/whats_new/whats_new_util.h"
@@ -499,9 +498,9 @@
       recordAction:new_tab_page_uma::ACTION_OPENED_MOST_VISITED_ENTRY];
   [self.NTPMetrics recordContentSuggestionsActionForType:
                        IOSContentSuggestionsActionType::kMostVisitedTile];
-  [self.contentSuggestionsMetricsRecorder recordMostVisitedTileOpened];
-  RecordNTPTileClick(mostVisitedIndex, item.source, item.titleSource,
-                     item.attributes, GURL());
+  [self.contentSuggestionsMetricsRecorder
+      recordMostVisitedTileOpened:item
+                          atIndex:mostVisitedIndex];
 }
 
 // Shows a snackbar with an action to undo the removal of the most visited item
@@ -659,6 +658,14 @@
   }
 }
 
+- (void)setContentSuggestionsMetricsRecorder:
+    (ContentSuggestionsMetricsRecorder*)contentSuggestionsMetricsRecorder {
+  CHECK(self.faviconMediator);
+  _contentSuggestionsMetricsRecorder = contentSuggestionsMetricsRecorder;
+  self.faviconMediator.contentSuggestionsMetricsRecorder =
+      self.contentSuggestionsMetricsRecorder;
+}
+
 - (BOOL)contentSuggestionsEnabled {
   return self.articleForYouEnabled->GetValue()->GetBool() &&
          self.contentSuggestionsPolicyEnabled->GetValue()->GetBool();

ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.h b/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.h
index 79a7ffe..165a132 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.h
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.h
@@ -11,6 +11,8 @@
 
 typedef NS_ENUM(NSInteger, NTPCollectionShortcutType);
 
+@class ContentSuggestionsMostVisitedItem;
+
 // Metrics recorder for the content suggestions.
 @interface ContentSuggestionsMetricsRecorder : NSObject
 
@@ -29,8 +31,13 @@
 // Logs the most visited tiles being shown.
 - (void)recordMostVisitedTilesShown;
 
-// Logs a most visited tile being opened
-- (void)recordMostVisitedTileOpened;
+// Logs a single most visited tile `item` being shown at `index`.
+- (void)recordMostVisitedTileShown:(ContentSuggestionsMostVisitedItem*)item
+                           atIndex:(NSInteger)index;
+
+// Logs a most visited tile `item` being opened at `index`.
+- (void)recordMostVisitedTileOpened:(ContentSuggestionsMostVisitedItem*)item
+                            atIndex:(NSInteger)index;
 
 // Logs a most visited tile being removed.
 - (void)recordMostVisitedTileRemoved;

ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.mm b/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.mm
index d1afc57..a851fa9 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.mm
+++ b/ios/chrome/browser/ui/content_suggestions/content_suggestions_metrics_recorder.mm
@@ -8,8 +8,14 @@
 #import "base/metrics/histogram_macros.h"
 #import "base/metrics/user_metrics.h"
 #import "base/metrics/user_metrics_action.h"
+#import "components/favicon_base/favicon_types.h"
+#import "components/ntp_tiles/metrics.h"
+#import "components/ntp_tiles/ntp_tile_impression.h"
+#import "components/ntp_tiles/tile_visual_type.h"
+#import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_constants.h"
+#import "ios/chrome/browser/ui/favicon/favicon_attributes_with_payload.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -17,6 +23,8 @@
 
 @implementation ContentSuggestionsMetricsRecorder
 
+#pragma mark - Public
+
 - (void)recordReturnToRecentTabTileShown {
   base::RecordAction(
       base::UserMetricsAction("IOS.StartSurface.ShowReturnToRecentTabTile"));
@@ -58,12 +66,53 @@
   base::RecordAction(base::UserMetricsAction("MobileNTPShowMostVisited"));
 }
 
-- (void)recordMostVisitedTileOpened {
+- (void)recordMostVisitedTileShown:(ContentSuggestionsMostVisitedItem*)item
+                           atIndex:(NSInteger)index {
+  ntp_tiles::metrics::RecordTileImpression(ntp_tiles::NTPTileImpression(
+      index, item.source, item.titleSource,
+      [self getVisualTypeFromAttributes:item.attributes],
+      [self getIconTypeFromAttributes:item.attributes], item.URL));
+}
+
+- (void)recordMostVisitedTileOpened:(ContentSuggestionsMostVisitedItem*)item
+                            atIndex:(NSInteger)index {
   base::RecordAction(base::UserMetricsAction("MobileNTPMostVisited"));
+
+  ntp_tiles::metrics::RecordTileClick(ntp_tiles::NTPTileImpression(
+      index, item.source, item.titleSource,
+      [self getVisualTypeFromAttributes:item.attributes],
+      [self getIconTypeFromAttributes:item.attributes], item.URL));
 }
 
 - (void)recordMostVisitedTileRemoved {
   base::RecordAction(base::UserMetricsAction("MostVisited_UrlBlacklisted"));
 }
 
+#pragma mark - Private
+
+// Returns the visual type of a favicon for metrics logging.
+- (ntp_tiles::TileVisualType)getVisualTypeFromAttributes:
+    (FaviconAttributes*)attributes {
+  if (!attributes) {
+    return ntp_tiles::TileVisualType::NONE;
+  } else if (attributes.faviconImage) {
+    return ntp_tiles::TileVisualType::ICON_REAL;
+  }
+  return attributes.defaultBackgroundColor
+             ? ntp_tiles::TileVisualType::ICON_DEFAULT
+             : ntp_tiles::TileVisualType::ICON_COLOR;
+}
+
+// Returns the icon type of a favicon for metrics logging.
+- (favicon_base::IconType)getIconTypeFromAttributes:
+    (FaviconAttributes*)attributes {
+  favicon_base::IconType icon_type = favicon_base::IconType::kInvalid;
+  if (attributes.faviconImage) {
+    FaviconAttributesWithPayload* favicon_attributes =
+        base::mac::ObjCCastStrict<FaviconAttributesWithPayload>(attributes);
+    icon_type = favicon_attributes.iconType;
+  }
+  return icon_type;
+}
+
 @end

ios/chrome/browser/ui/ntp/BUILD.gn

diff --git a/ios/chrome/browser/ui/ntp/BUILD.gn b/ios/chrome/browser/ui/ntp/BUILD.gn
index 9699b04e..36d15a71 100644
--- a/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -184,101 +184,80 @@
     "feed_wrapper_view_controller.h",
     "feed_wrapper_view_controller.mm",
     "new_tab_page_consumer.h",
+    "new_tab_page_header_commands.h",
+    "new_tab_page_header_consumer.h",
+    "new_tab_page_header_view.h",
+    "new_tab_page_header_view.mm",
+    "new_tab_page_header_view_controller.h",
+    "new_tab_page_header_view_controller.mm",
+    "new_tab_page_header_view_controller_delegate.h",
     "new_tab_page_mediator.h",
     "new_tab_page_mediator.mm",
     "new_tab_page_view_controller.h",
     "new_tab_page_view_controller.mm",
   ]
   deps = [
+    ":constants",
+    ":feature_flags",
     ":logo",
     ":ntp",
-    "resources:fake_omnibox_bottom_gradient_color",
-    "resources:fake_omnibox_top_gradient_color",
-    "resources:ntp_background_bottom_gradient_color",
-    "resources:ntp_opentabs",
-    "resources:ntp_opentabs_clock",
-    "resources:ntp_opentabs_header",
-    "resources:ntp_opentabs_laptop",
-    "resources:ntp_opentabs_last_row",
-    "resources:ntp_opentabs_last_row_h",
-    "resources:ntp_opentabs_list_item",
-    "resources:ntp_opentabs_list_item_h",
-    "resources:ntp_opentabs_phone",
-    "resources:ntp_opentabs_recent_arrow",
-    "resources:ntp_opentabs_tablet",
-    "resources:ntp_recently_closed",
     "//base",
-    "//base:i18n",
-    "//components/favicon/core",
-    "//components/favicon_base",
-    "//components/google/core/common",
-    "//components/history/core/browser",
-    "//components/keyed_service/core",
-    "//components/metrics",
-    "//components/ntp_tiles",
-    "//components/prefs",
+    "//components/signin/public/base",
     "//components/signin/public/identity_manager/objc",
     "//components/strings",
     "//ios/chrome/app/strings",
-    "//ios/chrome/app/theme",
-    "//ios/chrome/browser/application_context",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/discover_feed",
     "//ios/chrome/browser/discover_feed:constants",
     "//ios/chrome/browser/discover_feed:discover_feed_factory",
-    "//ios/chrome/browser/favicon",
-    "//ios/chrome/browser/flags:system_flags",
-    "//ios/chrome/browser/history",
-    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/ntp:features",
-    "//ios/chrome/browser/ntp_tiles",
     "//ios/chrome/browser/policy:policy_util",
-    "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
+    "//ios/chrome/browser/shared/ui/elements",
     "//ios/chrome/browser/shared/ui/symbols",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui_util",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
+    "//ios/chrome/browser/ui/content_suggestions:metrics",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
-    "//ios/chrome/browser/ui/favicon",
     "//ios/chrome/browser/ui/gestures",
-    "//ios/chrome/browser/ui/ntp/feed_top_section",
+    "//ios/chrome/browser/ui/lens:lens_availability",
+    "//ios/chrome/browser/ui/lens:lens_entrypoint",
     "//ios/chrome/browser/ui/ntp/metrics",
+    "//ios/chrome/browser/ui/omnibox:features",
+    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
     "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/start_surface:feature_flags",
     "//ios/chrome/browser/ui/thumb_strip:public",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/browser/ui/toolbar/public:constants",
     "//ios/chrome/browser/url:constants",
     "//ios/chrome/browser/url_loading",
-    "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common:button_config",
-    "//ios/chrome/common:string_util",
-    "//ios/chrome/common/app_group",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
-    "//ios/public/provider/chrome/browser/branded_images:branded_images_api",
+    "//ios/public/provider/chrome/browser/lens:lens_api",
     "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
-    "//ios/web",
-    "//net",
-    "//skia",
+    "//ios/web/public",
+    "//ios/web/public/navigation",
     "//ui/base",
     "//ui/gfx",
+    "//ui/gfx/ios:uikit_util",
     "//url",
   ]
   frameworks = [

ios/chrome/browser/ui/ntp/metrics/BUILD.gn

diff --git a/ios/chrome/browser/ui/ntp/metrics/BUILD.gn b/ios/chrome/browser/ui/ntp/metrics/BUILD.gn
index cbd06d17..e947c2d 100644
--- a/ios/chrome/browser/ui/ntp/metrics/BUILD.gn
+++ b/ios/chrome/browser/ui/ntp/metrics/BUILD.gn
@@ -14,8 +14,6 @@
     "feed_session_recorder+testing.h",
     "feed_session_recorder.h",
     "feed_session_recorder.mm",
-    "metrics.h",
-    "metrics.mm",
     "new_tab_page_metrics_recorder.h",
     "new_tab_page_metrics_recorder.mm",
   ]

ios/chrome/browser/ui/ntp/metrics/metrics.h

diff --git a/ios/chrome/browser/ui/ntp/metrics/metrics.h b/ios/chrome/browser/ui/ntp/metrics/metrics.h
deleted file mode 100644
index cde064c..0000000
--- a/ios/chrome/browser/ui/ntp/metrics/metrics.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Chromium Authors
-// 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_NTP_METRICS_METRICS_H_
-#define IOS_CHROME_BROWSER_UI_NTP_METRICS_METRICS_H_
-
-#import "components/ntp_tiles/tile_source.h"
-#import "components/ntp_tiles/tile_title_source.h"
-#import "ios/chrome/common/ui/favicon/favicon_attributes.h"
-#import "url/gurl.h"
-
-void RecordNTPTileImpression(int index,
-                             ntp_tiles::TileSource source,
-                             ntp_tiles::TileTitleSource title_source,
-                             const FaviconAttributes* attributes,
-                             const GURL& url);
-
-void RecordNTPTileClick(int index,
-                        ntp_tiles::TileSource source,
-                        ntp_tiles::TileTitleSource title_source,
-                        const FaviconAttributes* attributes,
-                        const GURL& url);
-
-#endif  // IOS_CHROME_BROWSER_UI_NTP_METRICS_METRICS_H_

ios/chrome/browser/ui/ntp/metrics/metrics.mm

diff --git a/ios/chrome/browser/ui/ntp/metrics/metrics.mm b/ios/chrome/browser/ui/ntp/metrics/metrics.mm
deleted file mode 100644
index 4f1ed33..0000000
--- a/ios/chrome/browser/ui/ntp/metrics/metrics.mm
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2017 The Chromium Authors
-// 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/ntp/metrics/metrics.h"
-
-#import "base/mac/foundation_util.h"
-#import "components/favicon_base/favicon_types.h"
-#import "components/ntp_tiles/metrics.h"
-#import "components/ntp_tiles/ntp_tile_impression.h"
-#import "components/ntp_tiles/tile_visual_type.h"
-#import "ios/chrome/browser/application_context/application_context.h"
-#import "ios/chrome/browser/ui/favicon/favicon_attributes_with_payload.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace {
-
-ntp_tiles::TileVisualType VisualTypeFromAttributes(
-    const FaviconAttributes* attributes) {
-  if (!attributes) {
-    return ntp_tiles::TileVisualType::NONE;
-  } else if (attributes.faviconImage) {
-    return ntp_tiles::TileVisualType::ICON_REAL;
-  }
-  return attributes.defaultBackgroundColor
-             ? ntp_tiles::TileVisualType::ICON_DEFAULT
-             : ntp_tiles::TileVisualType::ICON_COLOR;
-}
-
-favicon_base::IconType IconTypeFromAttributes(
-    const FaviconAttributes* attributes) {
-  favicon_base::IconType icon_type = favicon_base::IconType::kInvalid;
-  if (attributes.faviconImage) {
-    FaviconAttributesWithPayload* favicon_attributes =
-        base::mac::ObjCCastStrict<FaviconAttributesWithPayload>(attributes);
-    icon_type = favicon_attributes.iconType;
-  }
-  return icon_type;
-}
-
-}  // namespace
-
-void RecordNTPTileImpression(int index,
-                             ntp_tiles::TileSource source,
-                             ntp_tiles::TileTitleSource title_source,
-                             const FaviconAttributes* attributes,
-                             const GURL& url) {
-  ntp_tiles::metrics::RecordTileImpression(ntp_tiles::NTPTileImpression(
-      index, source, title_source, VisualTypeFromAttributes(attributes),
-      IconTypeFromAttributes(attributes), url));
-}
-
-void RecordNTPTileClick(int index,
-                        ntp_tiles::TileSource source,
-                        ntp_tiles::TileTitleSource title_source,
-                        const FaviconAttributes* attributes,
-                        const GURL& url) {
-  ntp_tiles::metrics::RecordTileClick(ntp_tiles::NTPTileImpression(
-      index, source, title_source, VisualTypeFromAttributes(attributes),
-      IconTypeFromAttributes(attributes), url));
-}

ios/chrome/browser/ui/ntp/new_tab_page_component_factory.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_component_factory.mm b/ios/chrome/browser/ui/ntp/new_tab_page_component_factory.mm
index 9b17696..4137c7d6 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_component_factory.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_component_factory.mm
@@ -14,9 +14,9 @@
 #import "ios/chrome/browser/signin/chrome_account_manager_service_factory.h"
 #import "ios/chrome/browser/signin/identity_manager_factory.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/user_account_image_update_delegate.h"
 #import "ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_mediator.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h"
 #import "ios/chrome/browser/url_loading/url_loading_browser_agent.h"
@@ -45,8 +45,8 @@
   return discoverFeedService->GetFeedMetricsRecorder();
 }
 
-- (ContentSuggestionsHeaderViewController*)headerController {
-  return [[ContentSuggestionsHeaderViewController alloc] init];
+- (NewTabPageHeaderViewController*)headerViewController {
+  return [[NewTabPageHeaderViewController alloc] init];
 }
 
 - (NewTabPageMediator*)NTPMediatorForBrowser:(Browser*)browser

ios/chrome/browser/ui/ntp/new_tab_page_component_factory_protocol.h

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_component_factory_protocol.h b/ios/chrome/browser/ui/ntp/new_tab_page_component_factory_protocol.h
index c47cda9..5e8a11f 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_component_factory_protocol.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_component_factory_protocol.h
@@ -11,8 +11,8 @@
 }
 
 @class ContentSuggestionsCoordinator;
-@class ContentSuggestionsHeaderViewController;
 @class FeedMetricsRecorder;
+@class NewTabPageHeaderViewController;
 @class NewTabPageMediator;
 @class NewTabPageViewController;
 @protocol UserAccountImageUpdateDelegate;
@@ -27,7 +27,7 @@
 - (FeedMetricsRecorder*)feedMetricsRecorderForBrowser:(Browser*)browser;
 
 // The header view controller containing the fake omnibox and logo.
-- (ContentSuggestionsHeaderViewController*)headerController;
+- (NewTabPageHeaderViewController*)headerViewController;
 
 // Mediator owned by the NewTabPageCoordinator
 - (NewTabPageMediator*)NTPMediatorForBrowser:(Browser*)browser

ios/chrome/browser/ui/ntp/new_tab_page_coordinator+private.h

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator+private.h b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator+private.h
index ba03c65..467316ae 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator+private.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator+private.h
@@ -8,22 +8,22 @@
 #import "ios/chrome/browser/ui/ntp/new_tab_page_coordinator.h"
 
 #import "ios/chrome/browser/shared/coordinator/scene/scene_state_observer.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_commands.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_commands.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
 
 @class ContentSuggestionsCoordinator;
-@class ContentSuggestionsHeaderViewController;
+@class NewTabPageHeaderViewController;
 @class NewTabPageViewController;
 
 // This is a private category that is intended to only be imported in
 // new_tab_page_coordinator.mm and tests.
-@interface NewTabPageCoordinator (Private) <ContentSuggestionsHeaderCommands,
+@interface NewTabPageCoordinator (Private) <NewTabPageHeaderCommands,
                                             SceneStateObserver,
                                             WebStateListObserving>
 
 @property(nonatomic, strong, readonly)
-    ContentSuggestionsHeaderViewController* headerController;
+    NewTabPageHeaderViewController* headerViewController;
 
 @property(nonatomic, strong)
     ContentSuggestionsCoordinator* contentSuggestionsCoordinator;

ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
index c3a797ce..b8a2ff3 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
@@ -67,8 +67,6 @@
 #import "ios/chrome/browser/ui/authentication/enterprise/enterprise_utils.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_commands.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.h"
 #import "ios/chrome/browser/ui/context_menu/link_preview/link_preview_coordinator.h"
 #import "ios/chrome/browser/ui/ntp/discover_feed_constants.h"
@@ -93,6 +91,8 @@
 #import "ios/chrome/browser/ui/ntp/new_tab_page_delegate.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_follow_delegate.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_commands.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_mediator.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h"
 #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
@@ -125,7 +125,6 @@
 
 @interface NewTabPageCoordinator () <AppStateObserver,
                                      BooleanObserver,
-                                     ContentSuggestionsHeaderCommands,
                                      DiscoverFeedObserverBridgeDelegate,
                                      DiscoverFeedPreviewDelegate,
                                      FeedControlDelegate,
@@ -138,6 +137,7 @@
                                      NewTabPageContentDelegate,
                                      NewTabPageDelegate,
                                      NewTabPageFollowDelegate,
+                                     NewTabPageHeaderCommands,
                                      OverscrollActionsControllerDelegate,
                                      PrefObserverDelegate,
                                      SceneStateObserver> {
@@ -236,7 +236,7 @@
 
 // The header view controller containing the fake omnibox and logo.
 @property(nonatomic, strong)
-    ContentSuggestionsHeaderViewController* headerController;
+    NewTabPageHeaderViewController* headerViewController;
 
 // The coordinator for handling feed management.
 @property(nonatomic, strong)
@@ -350,7 +350,7 @@
   if ([self isFeedHeaderVisible]) {
     [self configureFeedAndHeader];
   }
-  [self configureHeaderController];
+  [self configureheaderViewController];
   [self configureContentSuggestionsCoordinator];
   [self configureNTPMediator];
   [self configureFeedMetricsRecorder];
@@ -392,7 +392,7 @@
   self.feedManagementCoordinator = nil;
   [self.contentSuggestionsCoordinator stop];
   self.contentSuggestionsCoordinator = nil;
-  self.headerController = nil;
+  self.headerViewController = nil;
   // Remove before nil to ensure View Hierarchy doesn't hold last strong
   // reference.
   [self.containedViewController willMoveToParentViewController:nil];
@@ -493,7 +493,7 @@
 }
 
 - (void)locationBarDidBecomeFirstResponder {
-  [self.headerController locationBarBecomesFirstResponder];
+  [self.headerViewController locationBarBecomesFirstResponder];
   self.NTPViewController.omniboxFocused = YES;
 }
 
@@ -578,7 +578,7 @@
 // Starts all NTP observers.
 - (void)startObservers {
   DCHECK(self.prefService);
-  DCHECK(self.headerController);
+  DCHECK(self.headerViewController);
 
   _prefChangeRegistrar = std::make_unique<PrefChangeRegistrar>();
   _prefChangeRegistrar->Init(self.prefService);
@@ -618,11 +618,11 @@
   id<NewTabPageComponentFactoryProtocol> componentFactory =
       self.componentFactory;
   self.NTPViewController = [componentFactory NTPViewController];
-  self.headerController = [componentFactory headerController];
+  self.headerViewController = [componentFactory headerViewController];
   self.NTPMediator =
       [componentFactory NTPMediatorForBrowser:browser
                                      webState:self.webState
-                     identityDiscImageUpdater:self.headerController];
+                     identityDiscImageUpdater:self.headerViewController];
   self.contentSuggestionsCoordinator =
       [componentFactory contentSuggestionsCoordinatorForBrowser:browser];
   self.feedMetricsRecorder =
@@ -666,25 +666,25 @@
   }
 }
 
-// Configures `self.headerController`.
-- (void)configureHeaderController {
-  DCHECK(self.headerController);
+// Configures `self.headerViewController`.
+- (void)configureheaderViewController {
+  DCHECK(self.headerViewController);
   DCHECK(self.NTPMediator);
 
-  self.headerController.isGoogleDefaultSearchEngine =
+  self.headerViewController.isGoogleDefaultSearchEngine =
       [self isGoogleDefaultSearchEngine];
   // TODO(crbug.com/1045047): Use HandlerForProtocol after commands protocol
   // clean up.
-  self.headerController.dispatcher =
+  self.headerViewController.dispatcher =
       static_cast<id<ApplicationCommands, BrowserCoordinatorCommands,
                      OmniboxCommands, FakeboxFocuser, LensCommands>>(
           self.browser->GetCommandDispatcher());
-  self.headerController.commandHandler = self;
-  self.headerController.delegate = self.NTPViewController;
-  self.headerController.layoutGuideCenter =
+  self.headerViewController.commandHandler = self;
+  self.headerViewController.delegate = self.NTPViewController;
+  self.headerViewController.layoutGuideCenter =
       LayoutGuideCenterForBrowser(self.browser);
-  self.headerController.toolbarDelegate = self.toolbarDelegate;
-  self.headerController.baseViewController = self.baseViewController;
+  self.headerViewController.toolbarDelegate = self.toolbarDelegate;
+  self.headerViewController.baseViewController = self.baseViewController;
 }
 
 // Configures `self.contentSuggestionsCoordiantor`.
@@ -702,7 +702,7 @@
   DCHECK(NTPMediator);
   NTPMediator.browser = self.browser;
   NTPMediator.feedControlDelegate = self;
-  NTPMediator.contentSuggestionsHeaderConsumer = self.headerController;
+  NTPMediator.headerConsumer = self.headerViewController;
   NTPMediator.consumer = self.NTPViewController;
   NTPMediator.suggestionsMediator =
       self.contentSuggestionsCoordinator.contentSuggestionsMediator;
@@ -740,7 +740,7 @@
   self.NTPViewController.overscrollDelegate = self;
   self.NTPViewController.ntpContentDelegate = self;
 
-  self.NTPViewController.headerController = self.headerController;
+  self.NTPViewController.headerViewController = self.headerViewController;
 
   [self configureMainViewControllerUsing:self.NTPViewController];
   self.NTPViewController.feedMetricsRecorder = self.feedMetricsRecorder;
@@ -790,7 +790,7 @@
   [self handleFeedSelected:feedType];
 }
 
-#pragma mark - ContentSuggestionsHeaderCommands
+#pragma mark - NewTabPageHeaderCommands
 
 - (void)updateForHeaderSizeChange {
   [self.NTPViewController updateHeightAboveFeedAndScrollToTopIfNeeded];
@@ -1187,14 +1187,11 @@
 }
 
 - (BOOL)isStartSurface {
-  // TODO(crbug.com/1425382): This condition should be removed once the issue of
-  // having this coordinator started with no valid webstate (e.g. visible NTP in
-  // non-active tab) is resolved. At that point, we should just leave the
-  // `self.webState` DCHECK.
-  if (!self.webState) {
-    DCHECK(NO);
+  // If the NTP is in another tab, it is never a start surface.
+  if (!self.visible) {
     return NO;
   }
+  CHECK(self.webState);
   NewTabPageTabHelper* NTPHelper =
       NewTabPageTabHelper::FromWebState(self.webState);
   return NTPHelper && NTPHelper->ShouldShowStartSurface();
@@ -1235,7 +1232,7 @@
 #pragma mark - LogoAnimationControllerOwnerOwner
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
-  return [self.headerController logoAnimationControllerOwner];
+  return [self.headerViewController logoAnimationControllerOwner];
 }
 
 #pragma mark - OverscrollActionsControllerDelegate
@@ -1270,8 +1267,8 @@
 
 - (UIView*)toolbarSnapshotViewForOverscrollActionsController:
     (OverscrollActionsController*)controller {
-  return
-      [[self.headerController toolBarView] snapshotViewAfterScreenUpdates:NO];
+  return [[self.headerViewController toolBarView]
+      snapshotViewAfterScreenUpdates:NO];
 }
 
 - (UIView*)headerViewForOverscrollActionsController:
@@ -1286,7 +1283,7 @@
 
 - (CGFloat)headerHeightForOverscrollActionsController:
     (OverscrollActionsController*)controller {
-  CGFloat height = [self.headerController toolBarView].bounds.size.height;
+  CGFloat height = [self.headerViewController toolBarView].bounds.size.height;
   CGFloat topInset = self.feedWrapperViewController.view.safeAreaInsets.top;
   return height + topInset;
 }
@@ -1308,7 +1305,7 @@
     didTransitionFromInitStage:(InitStage)previousInitStage {
   if (previousInitStage == InitStageFirstRun) {
     self.NTPViewController.focusAccessibilityOmniboxWhenViewAppears = YES;
-    [self.headerController focusAccessibilityOnOmnibox];
+    [self.headerViewController focusAccessibilityOnOmnibox];
 
     [appState removeObserver:self];
   }

ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm
index a4ae15dc..f3bffc1c 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator_unittest.mm
@@ -21,7 +21,6 @@
 #import "ios/chrome/browser/signin/fake_authentication_service_delegate.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_coordinator.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.h"
@@ -30,6 +29,7 @@
 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller_delegate.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_coordinator+private.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h"
 #import "ios/chrome/browser/ui/start_surface/start_surface_recent_tab_browser_agent.h"
 #import "ios/chrome/browser/ui/toolbar/public/fakebox_focuser.h"
@@ -222,7 +222,7 @@
 }
 
 // Tests that if the NTPCoordinator properly configures
-// ContentSuggestionsHeaderViewController and NewTabPageTabHelper correctly for
+// NewTabPageHeaderViewController and NewTabPageTabHelper correctly for
 // Start depending on public lifecycle API calls.
 TEST_F(NewTabPageCoordinatorTest, StartIsStartShowing) {
   CreateCoordinator(/*off_the_record=*/false);

ios/chrome/browser/ui/ntp/new_tab_page_header_commands.h

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_header_commands.h b/ios/chrome/browser/ui/ntp/new_tab_page_header_commands.h
new file mode 100644
index 0000000..09518a3a
--- /dev/null
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_header_commands.h
@@ -0,0 +1,24 @@
+// Copyright 2023 The Chromium Authors
+// 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_NTP_NEW_TAB_PAGE_HEADER_COMMANDS_H_
+#define IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_COMMANDS_H_
+
+// Commands protocol allowing the NewTabPageHeaderViewController to
+// interact with the coordinator layer.
+@protocol NewTabPageHeaderCommands
+
+// Informs the receiver that the NewTabPageHeaderViewController's size
+// has changed.
+- (void)updateForHeaderSizeChange;
+
+// Informs the receiver that the fakebox was tapped.
+- (void)fakeboxTapped;
+
+// Informs the receiver that the identity disc was tapped.
+- (void)identityDiscWasTapped;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_COMMANDS_H_

ios/chrome/browser/ui/ntp/new_tab_page_header_consumer.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_consumer.h b/ios/chrome/browser/ui/ntp/new_tab_page_header_consumer.h
similarity index 61%
rename from ios/chrome/browser/ui/content_suggestions/content_suggestions_header_consumer.h
rename to ios/chrome/browser/ui/ntp/new_tab_page_header_consumer.h
index 804121d..e31823b8 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_consumer.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_header_consumer.h
@@ -2,15 +2,15 @@
 // 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_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_CONSUMER_H_
-#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_CONSUMER_H_
+#ifndef IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_CONSUMER_H_
+#define IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_CONSUMER_H_
 
 #import <Foundation/Foundation.h>
 
 @protocol LogoVendor;
 
-// Handles updates to the Content Suggestions header.
-@protocol ContentSuggestionsHeaderConsumer <NSObject>
+// Handles updates to the NTP header.
+@protocol NewTabPageHeaderConsumer <NSObject>
 
 // Whether the Google logo or doodle is being shown.
 - (void)setLogoIsShowing:(BOOL)logoIsShowing;
@@ -26,4 +26,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_CONSUMER_H_
+#endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_CONSUMER_H_

ios/chrome/browser/ui/ntp/new_tab_page_header_view.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.h b/ios/chrome/browser/ui/ntp/new_tab_page_header_view.h
similarity index 87%
rename from ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.h
rename to ios/chrome/browser/ui/ntp/new_tab_page_header_view.h
index 6054537..18c1baf 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_header_view.h
@@ -1,16 +1,16 @@
-// Copyright 2018 The Chromium Authors
+// Copyright 2023 The Chromium Authors
 // 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_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_H_
-#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_H_
+#ifndef IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_H_
+#define IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_H_
 
 #import <UIKit/UIKit.h>
 
 // Header view for the NTP. The header view contains all views that are
 // displayed above the list of most visited sites, which includes the
 // primary toolbar, doodle, and fake omnibox.
-@interface ContentSuggestionsHeaderView : UIView
+@interface NewTabPageHeaderView : UIView
 
 // Returns the toolbar view.
 @property(nonatomic, readonly) UIView* toolBarView;
@@ -54,7 +54,7 @@
 
 // Changes the constraints of searchField based on its initialFrame and the
 // scroll view's y `offset`. Also adjust the alpha values for `_searchBoxBorder`
-// and `_shadow` and the constant values for the `constraints`.|screenWidth` is
+// and `_shadow` and the constant values for the `constraints`. `screenWidth` is
 // the width of the screen, including the space outside the safe area. The
 // `safeAreaInsets` is relative to the view used to calculate the `width`.
 - (void)updateSearchFieldWidth:(NSLayoutConstraint*)widthConstraint
@@ -77,4 +77,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_H_
+#endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_H_

ios/chrome/browser/ui/ntp/new_tab_page_header_view.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.mm b/ios/chrome/browser/ui/ntp/new_tab_page_header_view.mm
similarity index 97%
rename from ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.mm
rename to ios/chrome/browser/ui/ntp/new_tab_page_header_view.mm
index 67df2f7f..c307b6f 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_header_view.mm
@@ -1,8 +1,8 @@
-// Copyright 2018 The Chromium Authors
+// Copyright 2023 The Chromium Authors
 // 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/content_suggestions/content_suggestions_header_view.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view.h"
 
 #import <UIKit/UIKit.h>
 
@@ -81,7 +81,7 @@
 
 }  // namespace
 
-@interface ContentSuggestionsHeaderView ()
+@interface NewTabPageHeaderView ()
 
 // The Lens button. May be null if Lens is not available.
 @property(nonatomic, strong, readwrite) ExtendedTouchTargetButton* lensButton;
@@ -123,7 +123,7 @@
 
 @end
 
-@implementation ContentSuggestionsHeaderView
+@implementation NewTabPageHeaderView
 
 #pragma mark - Public
 
@@ -397,14 +397,15 @@
                 safeAreaInsets:(UIEdgeInsets)safeAreaInsets {
   CGFloat contentWidth = std::max<CGFloat>(
       0, screenWidth - safeAreaInsets.left - safeAreaInsets.right);
-  if (screenWidth == 0 || contentWidth == 0)
+  if (screenWidth == 0 || contentWidth == 0) {
     return;
+  }
 
   CGFloat searchFieldNormalWidth =
       content_suggestions::SearchFieldWidth(contentWidth, self.traitCollection);
 
-  CGFloat percent =
-      [self searchFieldProgressForOffset:offset safeAreaInsets:safeAreaInsets];
+  CGFloat percent = [self searchFieldProgressForOffset:offset
+                                        safeAreaInsets:safeAreaInsets];
 
   // Offset the hint label constraints with half of the change in width
   // from the original scale, since constraints are calculated before

ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.h b/ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h
similarity index 80%
rename from ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.h
rename to ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h
index c58f9f4..53774307 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h
@@ -1,23 +1,23 @@
-// Copyright 2017 The Chromium Authors
+// Copyright 2023 The Chromium Authors
 // 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_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_consumer.h"
 #import "ios/chrome/browser/ui/content_suggestions/user_account_image_update_delegate.h"
 #import "ios/chrome/browser/ui/ntp/logo_animation_controller.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_consumer.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller_delegate.h"
 
 @protocol ApplicationCommands;
 @protocol BrowserCoordinatorCommands;
 @protocol ContentSuggestionsCommands;
-@protocol ContentSuggestionsHeaderCommands;
-@protocol ContentSuggestionsHeaderViewControllerDelegate;
 @protocol FakeboxFocuser;
 @protocol NewTabPageControllerDelegate;
+@protocol NewTabPageHeaderCommands;
 @protocol OmniboxCommands;
 @protocol LensCommands;
 @class LayoutGuideCenter;
@@ -26,9 +26,9 @@
 // Controller for the header containing the logo and the fake omnibox, handling
 // the interactions between the header and the collection, and the rest of the
 // application.
-@interface ContentSuggestionsHeaderViewController
-    : UIViewController <ContentSuggestionsHeaderConsumer,
-                        LogoAnimationControllerOwnerOwner,
+@interface NewTabPageHeaderViewController
+    : UIViewController <LogoAnimationControllerOwnerOwner,
+                        NewTabPageHeaderConsumer,
                         UserAccountImageUpdateDelegate>
 
 - (instancetype)init NS_DESIGNATED_INITIALIZER;
@@ -42,9 +42,8 @@
                               FakeboxFocuser,
                               LensCommands>
     dispatcher;
-@property(nonatomic, weak) id<ContentSuggestionsHeaderViewControllerDelegate>
-    delegate;
-@property(nonatomic, weak) id<ContentSuggestionsHeaderCommands> commandHandler;
+@property(nonatomic, weak) id<NewTabPageHeaderViewControllerDelegate> delegate;
+@property(nonatomic, weak) id<NewTabPageHeaderCommands> commandHandler;
 @property(nonatomic, weak) id<NewTabPageControllerDelegate> toolbarDelegate;
 
 // `YES` if Google is the default search engine.
@@ -109,4 +108,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_CONTENT_SUGGESTIONS_CONTENT_SUGGESTIONS_HEADER_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.mm

diff --git a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm b/ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.mm
similarity index 96%
rename from ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm
rename to ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.mm
index 0ebf1e5..088322a 100644
--- a/ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.mm
@@ -1,8 +1,8 @@
-// Copyright 2017 The Chromium Authors
+// Copyright 2023 The Chromium Authors
 // 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/content_suggestions/content_suggestions_header_view_controller.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h"
 
 #import "base/check.h"
 #import "base/ios/ios_util.h"
@@ -27,15 +27,15 @@
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_commands.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_commands.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.h"
 #import "ios/chrome/browser/ui/lens/lens_entrypoint.h"
 #import "ios/chrome/browser/ui/ntp/logo_vendor.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller_delegate.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_commands.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_header_constants.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/start_surface/start_surface_features.h"
 #import "ios/chrome/browser/ui/toolbar/public/fakebox_focuser.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_utils.h"
@@ -57,7 +57,7 @@
 
 }  // namespace
 
-@interface ContentSuggestionsHeaderViewController () <
+@interface NewTabPageHeaderViewController () <
     DoodleObserver,
     UIIndirectScribbleInteractionDelegate,
     UIPointerInteractionDelegate>
@@ -68,7 +68,7 @@
 // Exposes view and methods to drive the doodle.
 @property(nonatomic, weak, readonly) id<LogoVendor> logoVendor;
 
-@property(nonatomic, strong) ContentSuggestionsHeaderView* headerView;
+@property(nonatomic, strong) NewTabPageHeaderView* headerView;
 @property(nonatomic, strong) UIButton* fakeOmnibox;
 @property(nonatomic, strong) UIButton* accessibilityButton;
 @property(nonatomic, strong) NSString* identityDiscAccessibilityLabel;
@@ -88,7 +88,7 @@
 
 @end
 
-@implementation ContentSuggestionsHeaderViewController
+@implementation NewTabPageHeaderViewController
 
 - (instancetype)init {
   return [super initWithNibName:nil bundle:nil];
@@ -180,7 +180,7 @@
 }
 
 // TODO(crbug.com/1403613): Name animateScrollAnimation something more aligned
-// to its true state indication. Why update the constraints only somtimes?
+// to its true state indication. Why update the constraints only sometimes?
 - (void)updateFakeOmniboxForOffset:(CGFloat)offset
                        screenWidth:(CGFloat)screenWidth
                     safeAreaInsets:(UIEdgeInsets)safeAreaInsets
@@ -253,7 +253,7 @@
 
     CGFloat width = self.view.frame.size.width;
 
-    self.headerView = [[ContentSuggestionsHeaderView alloc] init];
+    self.headerView = [[NewTabPageHeaderView alloc] init];
     self.headerView.isGoogleDefaultSearchEngine =
         self.isGoogleDefaultSearchEngine;
     self.headerView.translatesAutoresizingMaskIntoConstraints = NO;
@@ -326,7 +326,7 @@
                                action:@selector(fakeboxTapped)
                      forControlEvents:UIControlEventTouchUpInside];
   // Because the visual fakebox background is implemented within
-  // ContentSuggestionsHeaderView, KVO the highlight events of
+  // NewTabPageHeaderView, KVO the highlight events of
   // `accessibilityButton` and pass them along.
   [self.accessibilityButton addObserver:self
                              forKeyPath:@"highlighted"
@@ -480,15 +480,16 @@
 }
 
 // TODO(crbug.com/807330) The fakebox is currently a collection of views spread
-// between ContentSuggestionsHeaderViewController and inside
-// ContentSuggestionsHeaderView.  Post refresh this can be coalesced into one
+// between NewTabPageHeaderViewController and inside
+// NewTabPageHeaderView.  Post refresh this can be coalesced into one
 // control, and the KVO highlight logic below can be removed.
 - (void)observeValueForKeyPath:(NSString*)keyPath
                       ofObject:(id)object
                         change:(NSDictionary*)change
                        context:(void*)context {
-  if ([@"highlighted" isEqualToString:keyPath])
+  if ([@"highlighted" isEqualToString:keyPath]) {
     [self.headerView setFakeboxHighlighted:[object isHighlighted]];
+  }
 }
 
 // If display is compact size, shows fakebox. If display is regular size,
@@ -646,7 +647,7 @@
   [self.commandHandler updateForHeaderSizeChange];
 }
 
-#pragma mark - ContentSuggestionsHeaderConsumer
+#pragma mark - NewTabPageHeaderConsumer
 
 - (void)setLogoIsShowing:(BOOL)logoIsShowing {
   _logoIsShowing = logoIsShowing;
@@ -659,15 +660,17 @@
 }
 
 - (void)locationBarBecomesFirstResponder {
-  if (!self.isShowing)
+  if (!self.isShowing) {
     return;
+  }
 
   [self.commandHandler fakeboxTapped];
 }
 
 - (void)setVoiceSearchIsEnabled:(BOOL)voiceSearchIsEnabled {
-  if (_voiceSearchIsEnabled == voiceSearchIsEnabled)
+  if (_voiceSearchIsEnabled == voiceSearchIsEnabled) {
     return;
+  }
   _voiceSearchIsEnabled = voiceSearchIsEnabled;
   [self updateVoiceSearchDisplay];
 }

ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller_delegate.h

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller_delegate.h b/ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller_delegate.h
new file mode 100644
index 0000000..fd94931
--- /dev/null
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller_delegate.h
@@ -0,0 +1,18 @@
+// Copyright 2023 The Chromium Authors
+// 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_NTP_NEW_TAB_PAGE_HEADER_VIEW_CONTROLLER_DELEGATE_H_
+#define IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_CONTROLLER_DELEGATE_H_
+
+#import <UIKit/UIKit.h>
+
+// Delegate for the NewTabPageHeaderViewController.
+@protocol NewTabPageHeaderViewControllerDelegate
+
+// Whether the scrollview is scrolled to the omnibox.
+@property(nonatomic, assign, readonly) BOOL scrolledToMinimumHeight;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_NTP_NEW_TAB_PAGE_HEADER_VIEW_CONTROLLER_DELEGATE_H_

ios/chrome/browser/ui/ntp/new_tab_page_mediator.h

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_mediator.h b/ios/chrome/browser/ui/ntp/new_tab_page_mediator.h
index 159043f..baffed30 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_mediator.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_mediator.h
@@ -18,13 +18,13 @@
 class AuthenticationService;
 class Browser;
 class ChromeAccountManagerService;
-@protocol ContentSuggestionsHeaderConsumer;
 @class ContentSuggestionsMediator;
 @protocol FeedControlDelegate;
 @class FeedMetricsRecorder;
 class GURL;
 @protocol LogoVendor;
 @protocol NewTabPageConsumer;
+@protocol NewTabPageHeaderConsumer;
 @class NTPHomeMetrics;
 class TemplateURLService;
 class UrlLoadingBrowserAgent;
@@ -56,9 +56,8 @@
 @property(nonatomic, strong) ContentSuggestionsMediator* suggestionsMediator;
 // Consumer for this mediator.
 @property(nonatomic, weak) id<NewTabPageConsumer> consumer;
-// Consumer for Content Suggestions header model updates.
-@property(nonatomic, weak) id<ContentSuggestionsHeaderConsumer>
-    contentSuggestionsHeaderConsumer;
+// Consumer for NTP header model updates.
+@property(nonatomic, weak) id<NewTabPageHeaderConsumer> headerConsumer;
 // Delegate for controlling the current feed.
 @property(nonatomic, weak) id<FeedControlDelegate> feedControlDelegate;
 // The browser.

ios/chrome/browser/ui/ntp/new_tab_page_mediator.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_mediator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_mediator.mm
index 790a32e..d4be9c46 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_mediator.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_mediator.mm
@@ -26,7 +26,6 @@
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_return_to_recent_tab_item.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_consumer.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller_audience.h"
 #import "ios/chrome/browser/ui/content_suggestions/user_account_image_update_delegate.h"
@@ -35,9 +34,9 @@
 #import "ios/chrome/browser/ui/ntp/logo_vendor.h"
 #import "ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.h"
 #import "ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h"
-#import "ios/chrome/browser/ui/ntp/metrics/metrics.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_consumer.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_header_constants.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_consumer.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h"
 #import "ios/chrome/browser/url/chrome_url_constants.h"
 #import "ios/chrome/browser/url_loading/url_loading_browser_agent.h"
@@ -149,8 +148,8 @@
     self.webState->AddObserver(_webStateObserver.get());
   }
 
-  [self.contentSuggestionsHeaderConsumer setLogoVendor:self.logoVendor];
-  [self.contentSuggestionsHeaderConsumer
+  [self.headerConsumer setLogoVendor:self.logoVendor];
+  [self.headerConsumer
       setVoiceSearchIsEnabled:ios::provider::IsVoiceSearchEnabled()];
 
   self.templateURLService->Load();
@@ -260,7 +259,7 @@
 
 - (void)webStateWasHidden:(web::WebState*)webState {
   DCHECK_EQ(_webState, webState);
-  DCHECK(self.contentSuggestionsHeaderConsumer);
+  DCHECK(self.headerConsumer);
   [self.consumer omniboxDidResignFirstResponder];
 }
 
@@ -286,7 +285,7 @@
                    self.templateURLService->search_terms_data()) ==
                SEARCH_ENGINE_GOOGLE;
   }
-  [self.contentSuggestionsHeaderConsumer setLogoIsShowing:showLogo];
+  [self.headerConsumer setLogoIsShowing:showLogo];
 }
 
 #pragma mark - IdentityManagerObserverBridgeDelegate

ios/chrome/browser/ui/ntp/new_tab_page_mediator_unittest.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_mediator_unittest.mm b/ios/chrome/browser/ui/ntp/new_tab_page_mediator_unittest.mm
index ab9ee5bf..5b7c0e9 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_mediator_unittest.mm
@@ -18,12 +18,12 @@
 #import "ios/chrome/browser/signin/fake_authentication_service_delegate.h"
 #import "ios/chrome/browser/signin/identity_manager_factory.h"
 #import "ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_most_visited_item.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_consumer.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_mediator.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_metrics.h"
 #import "ios/chrome/browser/ui/content_suggestions/user_account_image_update_delegate.h"
 #import "ios/chrome/browser/ui/ntp/logo_vendor.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_consumer.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_consumer.h"
 #import "ios/chrome/browser/ui/toolbar/test/toolbar_test_navigation_manager.h"
 #import "ios/chrome/browser/url/chrome_url_constants.h"
 #import "ios/chrome/browser/url_loading/fake_url_loading_browser_agent.h"
@@ -93,10 +93,8 @@
                       logoVendor:logo_vendor_
         identityDiscImageUpdater:imageUpdater_];
     mediator_.browser = browser_.get();
-    contentSuggestionsHeaderConsumer_ =
-        OCMProtocolMock(@protocol(ContentSuggestionsHeaderConsumer));
-    mediator_.contentSuggestionsHeaderConsumer =
-        contentSuggestionsHeaderConsumer_;
+    headerConsumer_ = OCMProtocolMock(@protocol(NewTabPageHeaderConsumer));
+    mediator_.headerConsumer = headerConsumer_;
     histogram_tester_.reset(new base::HistogramTester());
   }
 
@@ -132,7 +130,7 @@
   std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
   std::unique_ptr<Browser> browser_;
   std::unique_ptr<web::WebState> initial_web_state_;
-  id contentSuggestionsHeaderConsumer_;
+  id headerConsumer_;
   id imageUpdater_;
   id logo_vendor_;
   NewTabPageMediator* mediator_;
@@ -146,14 +144,14 @@
 // Tests that the consumer has the right value set up.
 TEST_F(NewTabPageMediatorTest, TestConsumerSetup) {
   // Setup.
-  OCMExpect([contentSuggestionsHeaderConsumer_ setLogoVendor:logo_vendor_]);
-  OCMExpect([contentSuggestionsHeaderConsumer_ setLogoIsShowing:YES]);
+  OCMExpect([headerConsumer_ setLogoVendor:logo_vendor_]);
+  OCMExpect([headerConsumer_ setLogoIsShowing:YES]);
 
   // Action.
   [mediator_ setUp];
 
   // Tests.
-  EXPECT_OCMOCK_VERIFY(contentSuggestionsHeaderConsumer_);
+  EXPECT_OCMOCK_VERIFY(headerConsumer_);
 }
 
 // Tests that the the mediator calls the consumer to set the content offset,

ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h
index 25a0b18..b8ad386 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.h
@@ -7,17 +7,17 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_consumer.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/thumb_strip/thumb_strip_supporting.h"
 
 @class BubblePresenter;
-@class ContentSuggestionsHeaderViewController;
 @class ContentSuggestionsViewController;
 @class FeedHeaderViewController;
 @class FeedMetricsRecorder;
 @class FeedWrapperViewController;
 @protocol NewTabPageContentDelegate;
+@class NewTabPageHeaderViewController;
 @protocol OverscrollActionsControllerDelegate;
 @class ViewRevealingVerticalPanHandler;
 
@@ -25,8 +25,8 @@
 // non-incognito new tab page.
 @interface NewTabPageViewController
     : UIViewController <ThumbStripSupporting,
-                        ContentSuggestionsHeaderViewControllerDelegate,
                         NewTabPageConsumer,
+                        NewTabPageHeaderViewControllerDelegate,
                         UIScrollViewDelegate>
 
 // View controller wrapping the feed.
@@ -37,9 +37,8 @@
 @property(nonatomic, weak) id<OverscrollActionsControllerDelegate>
     overscrollDelegate;
 
-// The content suggestions header, containing the fake omnibox and the doodle.
-@property(nonatomic, weak)
-    ContentSuggestionsHeaderViewController* headerController;
+// The NTP header, containing the fake omnibox and the doodle.
+@property(nonatomic, weak) NewTabPageHeaderViewController* headerViewController;
 
 // Delegate for actions relating to the NTP content.
 @property(nonatomic, weak) id<NewTabPageContentDelegate> ntpContentDelegate;

ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm

diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm
index 71286a2..30841789 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_view_controller.mm
@@ -14,7 +14,6 @@
 #import "ios/chrome/browser/ui/bubble/bubble_presenter.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_collection_utils.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_feature.h"
-#import "ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_view_controller.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/gestures/view_revealing_vertical_pan_handler.h"
@@ -27,6 +26,7 @@
 #import "ios/chrome/browser/ui/ntp/new_tab_page_content_delegate.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_header_constants.h"
+#import "ios/chrome/browser/ui/ntp/new_tab_page_header_view_controller.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_omnibox_positioning.h"
 #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_utils.h"
@@ -192,7 +192,7 @@
 
   [self layoutContentInParentCollectionView];
 
-  self.identityDiscButton = [self.headerController identityDiscButton];
+  self.identityDiscButton = [self.headerViewController identityDiscButton];
   DCHECK(self.identityDiscButton);
 
   self.viewDidFinishLoading = YES;
@@ -201,7 +201,7 @@
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
 
-  self.headerController.showing = YES;
+  self.headerViewController.showing = YES;
 
   [self updateNTPLayout];
 
@@ -212,7 +212,7 @@
   }
 
   if (self.focusAccessibilityOmniboxWhenViewAppears && !self.omniboxFocused) {
-    [self.headerController focusAccessibilityOnOmnibox];
+    [self.headerViewController focusAccessibilityOnOmnibox];
   }
 }
 
@@ -273,7 +273,7 @@
 
 - (void)viewDidDisappear:(BOOL)animated {
   [super viewDidDisappear:animated];
-  self.headerController.showing = NO;
+  self.headerViewController.showing = NO;
 }
 
 - (void)viewSafeAreaInsetsDidChange {
@@ -288,7 +288,7 @@
     [self updateHeightAboveFeedAndScrollToTopIfNeeded];
   }
 
-  [self.headerController updateConstraints];
+  [self.headerViewController updateConstraints];
 }
 
 - (void)viewWillTransitionToSize:(CGSize)size
@@ -369,7 +369,7 @@
     [self updateFakeOmniboxForScrollPosition];
   }
 
-  [self.headerController updateConstraints];
+  [self.headerViewController updateConstraints];
   [self updateOverscrollActionsState];
 }
 
@@ -425,16 +425,17 @@
   }
 
   // Configures the feed header in the view hierarchy if it is visible. Add it
-  // in the order that guarantees it is behind `headerController` and in front
-  // of all other views.
+  // in the order that guarantees it is behind `headerViewController` and in
+  // front of all other views.
   if (self.feedHeaderViewController) {
     [self addViewControllerAboveFeed:self.feedHeaderViewController];
   }
 
-  [self addViewControllerAboveFeed:self.headerController];
+  [self addViewControllerAboveFeed:self.headerViewController];
 
-  DCHECK([self.headerController.view isDescendantOfView:self.containerView]);
-  self.headerController.view.translatesAutoresizingMaskIntoConstraints = NO;
+  DCHECK(
+      [self.headerViewController.view isDescendantOfView:self.containerView]);
+  self.headerViewController.view.translatesAutoresizingMaskIntoConstraints = NO;
 
   // TODO(crbug.com/1170995): The contentCollectionView width might be
   // narrower than the ContentSuggestions view. This causes elements to be
@@ -530,7 +531,7 @@
       self.feedWrapperViewController.view.safeAreaInsets.top;
   minimumNTPHeight -= [self feedHeaderHeight];
   if ([self shouldPinFakeOmnibox]) {
-    minimumNTPHeight -= ([self.headerController headerHeight] +
+    minimumNTPHeight -= ([self.headerViewController headerHeight] +
                          ntp_header::kScrolledToTopOmniboxBottomMargin);
   }
 
@@ -618,11 +619,11 @@
 }
 
 - (CGFloat)pinnedOffsetY {
-  return [self.headerController pinnedOffsetY] - self.additionalOffset;
+  return [self.headerViewController pinnedOffsetY] - self.additionalOffset;
 }
 
 - (void)omniboxDidResignFirstResponder {
-  if (![self.headerController isShowing] && !self.scrolledToMinimumHeight) {
+  if (![self.headerViewController isShowing] && !self.scrolledToMinimumHeight) {
     return;
   }
 
@@ -630,46 +631,6 @@
   [self shiftTilesDownForOmniboxDefocus];
 }
 
-#pragma mark - ContentSuggestionsHeaderViewControllerDelegate
-
-- (void)shiftTilesDownForOmniboxDefocus {
-  if (IsSplitToolbarMode(self)) {
-    [self.ntpContentDelegate onFakeboxBlur];
-  }
-
-  [self.view removeGestureRecognizer:self.tapGestureRecognizer];
-
-  self.shouldAnimateHeader = YES;
-
-  if (self.animator.running) {
-    [self.animator stopAnimation:NO];
-    [self.animator finishAnimationAtPosition:UIViewAnimatingPositionStart];
-    self.animator = nil;
-  }
-
-  if (self.collectionShiftingOffset == 0 || self.collectionView.dragging) {
-    self.collectionShiftingOffset = 0;
-    [self updateFakeOmniboxForScrollPosition];
-    return;
-  }
-
-  self.scrolledToMinimumHeight = NO;
-
-  // CADisplayLink is used for this animation instead of the standard UIView
-  // animation because the standard animation did not properly convert the
-  // fakebox from its scrolled up mode to its scrolled down mode. Specifically,
-  // calling `UICollectionView reloadData` adjacent to the standard animation
-  // caused the fakebox's views to jump incorrectly. CADisplayLink avoids this
-  // problem because it allows `shiftTilesDownAnimationDidFire` to directly
-  // control each frame.
-  // TODO(crbug.com/1403613): Remove the use of this, listen to the UIScrollView
-  // delegate.
-  CADisplayLink* link = [CADisplayLink
-      displayLinkWithTarget:self
-                   selector:@selector(shiftTilesDownAnimationDidFire:)];
-  [link addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
-}
-
 #pragma mark - UIScrollViewDelegate
 
 - (void)scrollViewDidScroll:(UIScrollView*)scrollView {
@@ -764,7 +725,7 @@
   // Takes the height of the entire header and subtracts the margin to stick the
   // fake omnibox. Adjusts this for the device by further subtracting the
   // toolbar height and safe area insets.
-  return [self.headerController headerHeight] -
+  return [self.headerViewController headerHeight] -
          ntp_header::kFakeOmniboxScrolledToTopMargin -
          ToolbarExpandedHeight(
              [UIApplication sharedApplication].preferredContentSizeCategory) -
@@ -853,7 +814,7 @@
     self.shouldAnimateHeader = NO;
     self.disableScrollAnimation = NO;
     [self.ntpContentDelegate focusOmnibox];
-    [self.headerController
+    [self.headerViewController
         completeHeaderFakeOmniboxFocusAnimationWithFinalPosition:
             UIViewAnimatingPositionEnd];
     return;
@@ -863,7 +824,7 @@
     [self.collectionView layoutIfNeeded];
   }
 
-  CGFloat headerPinnedOffsetY = [self.headerController pinnedOffsetY];
+  CGFloat headerPinnedOffsetY = [self.headerViewController pinnedOffsetY];
   self.collectionShiftingOffset = MAX(
       -self.additionalOffset, headerPinnedOffsetY - [self adjustedOffset].y);
   self.shouldAnimateHeader = YES;
@@ -878,7 +839,7 @@
     strongSelf.collectionView.contentOffset =
         CGPointMake(0, [strongSelf pinnedOffsetY]);
     // Layout the header for the constraints to be animated.
-    [strongSelf.headerController layoutHeader];
+    [strongSelf.headerViewController layoutHeader];
     //    [strongSelf.collectionView.collectionViewLayout invalidateLayout];
   };
 
@@ -894,7 +855,7 @@
               if (strongSelf.collectionView.contentOffset.y <
                   [strongSelf pinnedOffsetY]) {
                 self.disableScrollAnimation = YES;
-                [strongSelf.headerController expandHeaderForFocus];
+                [strongSelf.headerViewController expandHeaderForFocus];
                 shiftOmniboxToTop();
                 [strongSelf.ntpContentDelegate focusOmnibox];
               }
@@ -925,7 +886,7 @@
 
     strongSelf.scrolledToMinimumHeight = YES;
     strongSelf.disableScrollAnimation = NO;
-    [strongSelf.headerController
+    [strongSelf.headerViewController
         completeHeaderFakeOmniboxFocusAnimationWithFinalPosition:finalPosition];
   }];
 
@@ -978,6 +939,45 @@
   }
 }
 
+// Shifts tiles down when defocusing the omnibox.
+- (void)shiftTilesDownForOmniboxDefocus {
+  if (IsSplitToolbarMode(self)) {
+    [self.ntpContentDelegate onFakeboxBlur];
+  }
+
+  [self.view removeGestureRecognizer:self.tapGestureRecognizer];
+
+  self.shouldAnimateHeader = YES;
+
+  if (self.animator.running) {
+    [self.animator stopAnimation:NO];
+    [self.animator finishAnimationAtPosition:UIViewAnimatingPositionStart];
+    self.animator = nil;
+  }
+
+  if (self.collectionShiftingOffset == 0 || self.collectionView.dragging) {
+    self.collectionShiftingOffset = 0;
+    [self updateFakeOmniboxForScrollPosition];
+    return;
+  }
+
+  self.scrolledToMinimumHeight = NO;
+
+  // CADisplayLink is used for this animation instead of the standard UIView
+  // animation because the standard animation did not properly convert the
+  // fakebox from its scrolled up mode to its scrolled down mode. Specifically,
+  // calling `UICollectionView reloadData` adjacent to the standard animation
+  // caused the fakebox's views to jump incorrectly. CADisplayLink avoids this
+  // problem because it allows `shiftTilesDownAnimationDidFire` to directly
+  // control each frame.
+  // TODO(crbug.com/1403613): Remove the use of this, listen to the UIScrollView
+  // delegate.
+  CADisplayLink* link = [CADisplayLink
+      displayLinkWithTarget:self
+                   selector:@selector(shiftTilesDownAnimationDidFire:)];
+  [link addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
+}
+
 // Pins the fake omnibox to the top of the NTP.
 - (void)pinFakeOmniboxToTop {
   self.fakeOmniboxPinnedToTop = YES;
@@ -992,16 +992,16 @@
 
 // Lets this view own the fake omnibox and sticks it to the top of the NTP.
 - (void)stickFakeOmniboxToTop {
-  // If `self.headerController` is nil after removing it from the view hierarchy
-  // it means its no longer owned by anyone (e.g. The coordinator might have
-  // been stopped.) and we shouldn't try to add it again.
-  if (!self.headerController) {
+  // If `self.headerViewController` is nil after removing it from the view
+  // hierarchy it means its no longer owned by anyone (e.g. The coordinator
+  // might have been stopped.) and we shouldn't try to add it again.
+  if (!self.headerViewController) {
     return;
   }
 
   [NSLayoutConstraint deactivateConstraints:self.fakeOmniboxConstraints];
 
-  self.headerTopAnchor = [self.headerController.view.topAnchor
+  self.headerTopAnchor = [self.headerViewController.view.topAnchor
       constraintEqualToAnchor:self.feedWrapperViewController.view.topAnchor
                      constant:-([self stickyOmniboxHeight] +
                                 [self feedHeaderHeight])];
@@ -1010,10 +1010,10 @@
   // And landscape is when it doesn't matter.
   self.fakeOmniboxConstraints = @[
     self.headerTopAnchor,
-    [self.headerController.view.leadingAnchor
+    [self.headerViewController.view.leadingAnchor
         constraintEqualToAnchor:self.feedWrapperViewController.view
                                     .leadingAnchor],
-    [self.headerController.view.trailingAnchor
+    [self.headerViewController.view.trailingAnchor
         constraintEqualToAnchor:self.feedWrapperViewController.view
                                     .trailingAnchor],
   ];
@@ -1026,7 +1026,7 @@
   [NSLayoutConstraint deactivateConstraints:self.fakeOmniboxConstraints];
   self.fakeOmniboxConstraints = @[
     [self.contentSuggestionsViewController.view.topAnchor
-        constraintEqualToAnchor:self.headerController.view.bottomAnchor],
+        constraintEqualToAnchor:self.headerViewController.view.bottomAnchor],
   ];
   [NSLayoutConstraint activateConstraints:self.fakeOmniboxConstraints];
 }
@@ -1042,13 +1042,13 @@
     // -viewDidLayoutSubviews.  Since self.collectionView and it's superview
     // should always have the same safeArea, this should be safe.
     UIEdgeInsets insets = self.collectionView.superview.safeAreaInsets;
-    [self.headerController
+    [self.headerViewController
         updateFakeOmniboxForOffset:[self adjustedOffset].y
                        screenWidth:width
                     safeAreaInsets:insets
             animateScrollAnimation:!self.disableScrollAnimation];
   } else {
-    [self.headerController updateFakeOmniboxForWidth:width];
+    [self.headerViewController updateFakeOmniboxForWidth:width];
   }
 }
 
@@ -1065,7 +1065,7 @@
 
   if (self.shouldAnimateHeader) {
     UIEdgeInsets insets = self.collectionView.safeAreaInsets;
-    [self.headerController
+    [self.headerViewController
         updateFakeOmniboxForOffset:[self adjustedOffset].y
                        screenWidth:self.collectionView.frame.size.width
                     safeAreaInsets:insets
@@ -1086,7 +1086,7 @@
   if ([self shouldPinFakeOmnibox]) {
     self.feedHeaderConstraints = @[
       [self.feedHeaderViewController.view.topAnchor
-          constraintEqualToAnchor:self.headerController.view.bottomAnchor
+          constraintEqualToAnchor:self.headerViewController.view.bottomAnchor
                          constant:-(content_suggestions::HeaderBottomPadding() +
                                     [self.feedHeaderViewController
                                             customSearchEngineViewHeight])],
@@ -1311,20 +1311,20 @@
     ]];
   }
 
-    [NSLayoutConstraint activateConstraints:@[
-      [[self containerView].safeAreaLayoutGuide.leadingAnchor
-          constraintEqualToAnchor:self.headerController.view.leadingAnchor],
-      [[self containerView].safeAreaLayoutGuide.trailingAnchor
-          constraintEqualToAnchor:self.headerController.view.trailingAnchor],
-    ]];
-    [self setInitialFakeOmniboxConstraints];
+  [NSLayoutConstraint activateConstraints:@[
+    [[self containerView].safeAreaLayoutGuide.leadingAnchor
+        constraintEqualToAnchor:self.headerViewController.view.leadingAnchor],
+    [[self containerView].safeAreaLayoutGuide.trailingAnchor
+        constraintEqualToAnchor:self.headerViewController.view.trailingAnchor],
+  ]];
+  [self setInitialFakeOmniboxConstraints];
 
-    [NSLayoutConstraint activateConstraints:@[
-      [[self containerView].safeAreaLayoutGuide.leadingAnchor
-          constraintEqualToAnchor:contentSuggestionsView.leadingAnchor],
-      [[self containerView].safeAreaLayoutGuide.trailingAnchor
-          constraintEqualToAnchor:contentSuggestionsView.trailingAnchor],
-    ]];
+  [NSLayoutConstraint activateConstraints:@[
+    [[self containerView].safeAreaLayoutGuide.leadingAnchor
+        constraintEqualToAnchor:contentSuggestionsView.leadingAnchor],
+    [[self containerView].safeAreaLayoutGuide.trailingAnchor
+        constraintEqualToAnchor:contentSuggestionsView.trailingAnchor],
+  ]];
 }
 
 // Sets minimum height for the NTP collection view, allowing it to scroll enough
@@ -1364,7 +1364,7 @@
 
 - (CGFloat)minimumNTPHeight {
   CGFloat collectionViewHeight = self.collectionView.bounds.size.height;
-  CGFloat headerHeight = [self.headerController headerHeight];
+  CGFloat headerHeight = [self.headerViewController headerHeight];
 
   // The minimum height for the collection view content should be the height
   // of the header plus the height of the collection view minus the height of
@@ -1419,7 +1419,7 @@
 - (CGFloat)offsetWhenScrolledIntoFeed {
   CGFloat offset;
   if ([self shouldPinFakeOmnibox]) {
-    offset = -(self.headerController.view.frame.size.height -
+    offset = -(self.headerViewController.view.frame.size.height -
                [self stickyOmniboxHeight] -
                [self.feedHeaderViewController customSearchEngineViewHeight] -
                content_suggestions::HeaderBottomPadding());
@@ -1438,7 +1438,7 @@
 // should stick to the top of the NTP.
 - (CGFloat)offsetToStickOmnibox {
   CGFloat offset =
-      -(self.headerController.view.frame.size.height -
+      -(self.headerViewController.view.frame.size.height -
         [self stickyOmniboxHeight] -
         [self.feedHeaderViewController customSearchEngineViewHeight]);
   if (IsSplitToolbarMode(self)) {
@@ -1491,7 +1491,7 @@
                                      kContentSuggestionsParent];
   }
 
-  [self ensureView:self.headerController.view
+  [self ensureView:self.headerViewController.view
              isSubviewOf:self.collectionView
       withRelationshipID:BrokenNTPHierarchyRelationship::
                              kContentSuggestionsHeaderParent];

ios/chrome/browser/ui/omnibox/BUILD.gn

diff --git a/ios/chrome/browser/ui/omnibox/BUILD.gn b/ios/chrome/browser/ui/omnibox/BUILD.gn
index 59a2a78..01b3e70 100644
--- a/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -230,14 +230,23 @@
   sources = [
     "omnibox_app_interface.h",
     "omnibox_app_interface.mm",
+    "test_fake_suggestions_service.cc",
+    "test_fake_suggestions_service.h",
   ]
   deps = [
+    ":omnibox_internal",
+    ":resources_fake_suggestions_tests",
     "//base",
     "//components/google/core/common",
     "//components/history/core/browser",
+    "//components/omnibox/browser",
+    "//components/search_engines",
     "//components/variations:variations",
+    "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/search_engines:template_url_service_factory",
     "//ios/chrome/browser/ui/omnibox/popup:popup_ui",
     "//ios/chrome/test/app:test_support",
     "//ios/testing/earl_grey:eg_app_support+eg2",
@@ -245,6 +254,7 @@
     "//ios/web/public",
     "//ios/web/public/navigation",
     "//net:test_support",
+    "//services/network:test_support",
     "//ui/base",
     "//ui/base:test_support",
   ]
@@ -329,6 +339,14 @@
               "ios/chrome/test/data/omnibox/{{source_file_part}}" ]
 }
 
+bundle_data("resources_fake_suggestions_tests") {
+  visibility = [ ":eg_app_support+eg2" ]
+  testonly = true
+  sources = [ "//ios/chrome/test/data/omnibox/fake_suggestions_pedal.json" ]
+  outputs = [ "{{bundle_resources_dir}}/" +
+              "{{source_root_relative_dir}}/{{source_file_part}}" ]
+}
+
 source_set("features") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [

ios/chrome/browser/ui/omnibox/omnibox_app_interface.h

diff --git a/ios/chrome/browser/ui/omnibox/omnibox_app_interface.h b/ios/chrome/browser/ui/omnibox/omnibox_app_interface.h
index 1f69bb04..8863f20 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_app_interface.h
+++ b/ios/chrome/browser/ui/omnibox/omnibox_app_interface.h
@@ -20,6 +20,17 @@
 // Blocks `URL` from most visited sites.
 + (void)blockURLFromTopSites:(NSString*)URL;
 
+// Set up a service that serves custom search suggestions in the omnibox. These
+// replace suggestions provided by the suggest server. Fake suggestions are
+// loaded from `filename` (json) and the file must be in
+// ios/test/chrome/data/omnibox/. Fake suggestions can be generated with
+// chrome://suggest-internals available on Desktop. The service must be teared
+// down with `tearDownFakeSuggestionsService`.
++ (void)setUpFakeSuggestionsService:(NSString*)filename;
+
+// Tear down test fake suggestions service.
++ (void)tearDownFakeSuggestionsService;
+
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_APP_INTERFACE_H_

ios/chrome/browser/ui/omnibox/omnibox_app_interface.mm

diff --git a/ios/chrome/browser/ui/omnibox/omnibox_app_interface.mm b/ios/chrome/browser/ui/omnibox/omnibox_app_interface.mm
index 37e3f817..967809b 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_app_interface.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_app_interface.mm
@@ -4,13 +4,20 @@
 
 #import "ios/chrome/browser/ui/omnibox/omnibox_app_interface.h"
 
+#import "base/files/file_util.h"
+#import "base/no_destructor.h"
+#import "base/path_service.h"
 #import "base/strings/string_number_conversions.h"
 #import "base/strings/sys_string_conversions.h"
 #import "components/google/core/common/google_util.h"
 #import "components/history/core/browser/top_sites.h"
+#import "components/search_engines/template_url_service.h"
 #import "components/variations/variations_ids_provider.h"
+#import "ios/chrome/browser/autocomplete/remote_suggestions_service_factory.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/history/top_sites_factory.h"
+#import "ios/chrome/browser/search_engines/template_url_service_factory.h"
+#import "ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/app/tab_test_util.h"
 #import "ios/web/public/navigation/navigation_manager.h"
@@ -38,6 +45,20 @@
   return true;
 }
 
+// Returns the directory containing fake suggestions files.
+const base::FilePath& GetTestDataDir() {
+  static base::NoDestructor<base::FilePath> dir([]() {
+    base::FilePath dir;
+    base::PathService::Get(base::DIR_SOURCE_ROOT, &dir);
+    return dir.AppendASCII("ios")
+        .AppendASCII("chrome")
+        .AppendASCII("test")
+        .AppendASCII("data")
+        .AppendASCII("omnibox");
+  }());
+  return *dir;
+}
+
 }  // namespace
 
 @implementation OmniboxAppInterface
@@ -64,4 +85,31 @@
   }
 }
 
++ (void)setUpFakeSuggestionsService:(NSString*)filename {
+  RemoteSuggestionsService* remoteSuggestionsService =
+      RemoteSuggestionsServiceFactory::GetForBrowserState(
+          chrome_test_util::GetOriginalBrowserState(), YES);
+
+  TemplateURLService* templateURLService =
+      ios::TemplateURLServiceFactory::GetForBrowserState(
+          chrome_test_util::GetOriginalBrowserState());
+
+  base::FilePath filePath =
+      GetTestDataDir().AppendASCII(base::SysNSStringToUTF8(filename));
+  TestFakeSuggestionsService::GetInstance()->SetUp(
+      remoteSuggestionsService, templateURLService, filePath);
+}
+
++ (void)tearDownFakeSuggestionsService {
+  RemoteSuggestionsService* remoteSuggestionsService =
+      RemoteSuggestionsServiceFactory::GetForBrowserState(
+          chrome_test_util::GetOriginalBrowserState(), YES);
+
+  network::mojom::URLLoaderFactory* urlLoaderFactory =
+      chrome_test_util::GetOriginalBrowserState()->GetURLLoaderFactory();
+
+  TestFakeSuggestionsService::GetInstance()->TearDown(remoteSuggestionsService,
+                                                      urlLoaderFactory);
+}
+
 @end

ios/chrome/browser/ui/omnibox/omnibox_egtest.mm

diff --git a/ios/chrome/browser/ui/omnibox/omnibox_egtest.mm b/ios/chrome/browser/ui/omnibox/omnibox_egtest.mm
index dd8d09fd..474aee4 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_egtest.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_egtest.mm
@@ -731,6 +731,153 @@
 
 @end
 
+#pragma mark - Pre-edit state tests
+
+@interface LocationBarPreEditStateTestCase : ChromeTestCase
+@end
+
+@implementation LocationBarPreEditStateTestCase {
+  GURL _URL;
+}
+
+- (void)setUp {
+  [super setUp];
+
+  [ChromeEarlGrey clearBrowsingHistory];
+
+  // Start a server to be able to navigate to a web page.
+  self.testServer->RegisterRequestHandler(
+      base::BindRepeating(&StandardResponse));
+  GREYAssertTrue(self.testServer->Start(), @"Test server failed to start.");
+
+  _URL = self.testServer->GetURL(kPage1URL);
+
+  // Clear the pasteboard in case there is a URL copied.
+  [ChromeEarlGrey clearPasteboard];
+}
+
+- (void)tearDown {
+  // Clear the pasteboard after every test.
+  [ChromeEarlGrey clearPasteboard];
+}
+
+// Tests that tapping on steady view on webpage and starting typing a query
+// would clear the page url and have instead the typed query in the omnibox text
+// field.
+- (void)testTypingOnPreEditState {
+  // Load a web page.
+  [ChromeEarlGrey loadURL:_URL];
+  [ChromeEarlGrey waitForWebStateContainingText:kPage1];
+
+  [ChromeEarlGreyUI focusOmnibox];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:chrome_test_util::OmniboxText(_URL.GetContent())];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      performAction:grey_typeText(@"hello")];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:chrome_test_util::OmniboxText("hello")];
+}
+
+// Tests that tapping on omnibox in pre-edit state in SRP or webpage would
+// display a callout menu with cut,copy and paste (if there is a text on the
+// pasteboard).
+- (void)testTapOmniboxOnPreEditState {
+  // Load a web page.
+  [ChromeEarlGrey loadURL:_URL];
+  [ChromeEarlGrey waitForWebStateContainingText:kPage1];
+
+  // Focus Omnibox.
+  [ChromeEarlGreyUI focusOmnibox];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:grey_sufficientlyVisible()];
+
+  // Add a text to the pasteBoard (So that we have the paste button displayed).
+  [ChromeEarlGrey copyTextToPasteboard:@"hello"];
+
+  // Tap on Omnibox on pre edit state.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      performAction:grey_tap()];
+
+  // Wait for callout copy button to be displayed.
+  [ChromeEarlGrey waitForUIElementToAppearWithMatcher:
+                      chrome_test_util::SystemSelectionCalloutCopyButton()];
+
+  // Verify that system text cut callout is displayed.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::
+                                          SystemSelectionCalloutCutButton()]
+      assertWithMatcher:grey_notNil()];
+
+  // Verify that system text paste callout is displayed.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::
+                                          SystemSelectionCalloutPasteButton()]
+      assertWithMatcher:grey_notNil()];
+}
+
+// Tests that Cut callout button would erase the current url and copy it on the
+// pasteboard.
+- (void)testCutCalloutButton {
+  // Load a web page.
+  [ChromeEarlGrey loadURL:_URL];
+  [ChromeEarlGrey waitForWebStateContainingText:kPage1];
+
+  // Focus Omnibox.
+  [ChromeEarlGreyUI focusOmnibox];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:grey_sufficientlyVisible()];
+
+  // Tap on Omnibox on pre edit state.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      performAction:grey_tap()];
+
+  // Wait for callout cut button to be displayed.
+  [ChromeEarlGrey waitForUIElementToAppearWithMatcher:
+                      chrome_test_util::SystemSelectionCalloutCutButton()];
+
+  // Tapping on Cut.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::
+                                          SystemSelectionCalloutCutButton()]
+      performAction:grey_tap()];
+
+  // Omnibox now should be empty.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:chrome_test_util::OmniboxText("")];
+}
+
+// Tests that Paste callout button would erase the current url and replace it
+// with text on pasteboard.
+- (void)testPasteCalloutButton {
+  // Load a web page.
+  [ChromeEarlGrey loadURL:_URL];
+  [ChromeEarlGrey waitForWebStateContainingText:kPage1];
+
+  // Focus Omnibox.
+  [ChromeEarlGreyUI focusOmnibox];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:grey_sufficientlyVisible()];
+
+  // Add a text to the pasteBoard (So that we have the paste button displayed).
+  [ChromeEarlGrey copyTextToPasteboard:@"hello"];
+
+  // Tap on Omnibox on pre edit state.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      performAction:grey_tap()];
+
+  // Wait for callout paste button to be displayed.
+  [ChromeEarlGrey waitForUIElementToAppearWithMatcher:
+                      chrome_test_util::SystemSelectionCalloutPasteButton()];
+
+  // Tapping on Paste.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::
+                                          SystemSelectionCalloutPasteButton()]
+      performAction:grey_tap()];
+
+  // Omnibox now should be empty.
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:chrome_test_util::OmniboxText("hello")];
+}
+
+@end
+
 #pragma mark - Edit state tests
 
 @interface LocationBarEditStateTestCase : ChromeTestCase

ios/chrome/browser/ui/omnibox/popup/BUILD.gn

diff --git a/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 5ae113b..5ab222ce 100644
--- a/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -281,6 +281,7 @@
   sources = [
     "omnibox_popup_carousel_egtest.mm",
     "omnibox_popup_egtest.mm",
+    "omnibox_popup_pedal_egtest.mm",
   ]
   deps = [
     ":popup_accessibility_identifier_constants",

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_egtest.mm

diff --git a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_egtest.mm b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_egtest.mm
index 1ff12dbdd..c3fe4d2b 100644
--- a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_egtest.mm
+++ b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_egtest.mm
@@ -108,10 +108,13 @@
 }  //  namespace
 
 @interface OmniboxPopupTestCase : ChromeTestCase
-
 @end
 
-@implementation OmniboxPopupTestCase
+@implementation OmniboxPopupTestCase {
+  GURL _URL1;
+  GURL _URL2;
+  GURL _URL3;
+}
 
 - (AppLaunchConfiguration)appConfigurationForTestCase {
   AppLaunchConfiguration config = [super appConfigurationForTestCase];
@@ -137,6 +140,10 @@
       base::BindRepeating(&StandardResponse));
   GREYAssertTrue(self.testServer->Start(), @"Test server failed to start.");
 
+  _URL1 = self.testServer->GetURL(kPage1URL);
+  _URL2 = self.testServer->GetURL(kPage2URL);
+  _URL3 = self.testServer->GetURL(kPage3URL);
+
   [ChromeEarlGrey clearBrowsingHistory];
 }
 
@@ -175,15 +182,13 @@
 
 // Tests that the switch to open tab button isn't displayed for the current tab.
 - (void)testNotSwitchButtonOnCurrentTab {
-  GURL URL2 = self.testServer->GetURL(kPage2URL);
-
   // Open the first page.
   [ChromeEarlGrey loadURL:self.testServer->GetURL(kPage1URL)];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
   // Open the second page in another tab.
   [ChromeEarlGreyUI openNewTab];
-  [ChromeEarlGrey loadURL:URL2];
+  [ChromeEarlGrey loadURL:_URL2];
   [ChromeEarlGrey waitForWebStateContainingText:kPage2];
 
   // Type the URL of the first page in the omnibox to trigger it as suggestion.
@@ -192,94 +197,112 @@
   // Check that we have the suggestion for the second page, but not the switch
   // as it is the current page.
 
-  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(URL2)]
+  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(_URL2)]
       assertWithMatcher:grey_sufficientlyVisible()];
-  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(URL2)]
+  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(_URL2)]
       assertWithMatcher:grey_not(grey_interactable())];
 }
 
+// Test that swiping left on a historical suggestion and tapping
+// the delete button , removes the suggestions.
+- (void)testDeleteHistoricalSuggestion {
+  [self populateHistory];
+  NSString* omniboxInput = [NSString
+      stringWithFormat:@"%@:%@", base::SysUTF8ToNSString(_URL3.host()),
+                       base::SysUTF8ToNSString(_URL3.port())];
+
+  [ChromeEarlGreyUI focusOmniboxAndType:omniboxInput];
+
+  // Swipe one of the historical suggestions, to the left.
+  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(_URL1)]
+      performAction:grey_swipeSlowInDirection(kGREYDirectionLeft)];
+
+  // Delete button is displayed.
+  [[EarlGrey selectElementWithMatcher:grey_kindOfClassName(
+                                          @"UISwipeActionStandardButton")]
+      assertWithMatcher:grey_sufficientlyVisible()];
+
+  // Tap on the delete button.
+  [[EarlGrey selectElementWithMatcher:grey_kindOfClassName(
+                                          @"UISwipeActionStandardButton")]
+      performAction:grey_tap()];
+
+  // Historical suggestion with URL1 is now deleted.
+  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(_URL1)]
+      assertWithMatcher:grey_nil()];
+}
+
 // Tests that the incognito tabs aren't displayed as "opened" tab in the
 // non-incognito suggestions and vice-versa.
 - (void)testIncognitoSeparation {
-  GURL URL1 = self.testServer->GetURL(kPage1URL);
-  GURL URL2 = self.testServer->GetURL(kPage2URL);
-  GURL URL3 = self.testServer->GetURL(kPage3URL);
-
-  // Add all the pages to the history.
-  [ChromeEarlGrey loadURL:URL1];
-  [ChromeEarlGrey waitForWebStateContainingText:kPage1];
-  [ChromeEarlGrey loadURL:URL2];
-  [ChromeEarlGrey waitForWebStateContainingText:kPage2];
-  [ChromeEarlGrey loadURL:URL3];
-  [ChromeEarlGrey waitForWebStateContainingText:kPage3];
+  [self populateHistory];
   [[self class] closeAllTabs];
 
   // Load page 1 in non-incognito and page 2 in incognito.
   [ChromeEarlGrey openNewTab];
-  [ChromeEarlGrey loadURL:URL1];
+  [ChromeEarlGrey loadURL:_URL1];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
   [ChromeEarlGrey openNewIncognitoTab];
-  [ChromeEarlGrey loadURL:URL2];
+  [ChromeEarlGrey loadURL:_URL2];
   [ChromeEarlGrey waitForWebStateContainingText:kPage2];
 
   // Open page 3 in non-incognito.
   [ChromeEarlGrey openNewTab];
-  [ChromeEarlGrey loadURL:URL3];
+  [ChromeEarlGrey loadURL:_URL3];
   [ChromeEarlGrey waitForWebStateContainingText:kPage3];
 
-  NSString* omniboxInput =
-      [NSString stringWithFormat:@"%@:%@", base::SysUTF8ToNSString(URL3.host()),
-                                 base::SysUTF8ToNSString(URL3.port())];
+  NSString* omniboxInput = [NSString
+      stringWithFormat:@"%@:%@", base::SysUTF8ToNSString(_URL3.host()),
+                       base::SysUTF8ToNSString(_URL3.port())];
   [ChromeEarlGreyUI focusOmniboxAndType:omniboxInput];
 
   // Check that we have the switch button for the first page.
   [[EarlGrey
       selectElementWithMatcher:
-          grey_allOf(grey_ancestor(PopupRowWithUrl(URL1)),
+          grey_allOf(grey_ancestor(PopupRowWithUrl(_URL1)),
                      grey_accessibilityID(
                          kOmniboxPopupRowSwitchTabAccessibilityIdentifier),
                      nil)] assertWithMatcher:grey_sufficientlyVisible()];
 
   // Check that we have the suggestion for the second page, but not the switch.
-  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(URL2)]
+  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(_URL2)]
       assertWithMatcher:grey_sufficientlyVisible()];
-  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(URL2)]
+  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(_URL2)]
       assertWithMatcher:grey_nil()];
 
   // Open page 3 in incognito.
   [ChromeEarlGrey openNewIncognitoTab];
-  [ChromeEarlGrey loadURL:URL3];
+  [ChromeEarlGrey loadURL:_URL3];
   [ChromeEarlGrey waitForWebStateContainingText:kPage3];
 
-  [ChromeEarlGreyUI focusOmniboxAndType:base::SysUTF8ToNSString(URL3.host())];
+  [ChromeEarlGreyUI focusOmniboxAndType:base::SysUTF8ToNSString(_URL3.host())];
 
   // Check that we have the switch button for the second page.
   [[EarlGrey
       selectElementWithMatcher:
-          grey_allOf(grey_ancestor(PopupRowWithUrl(URL2)),
+          grey_allOf(grey_ancestor(PopupRowWithUrl(_URL2)),
                      grey_accessibilityID(
                          kOmniboxPopupRowSwitchTabAccessibilityIdentifier),
                      nil)] assertWithMatcher:grey_sufficientlyVisible()];
 
   // Check that we have the suggestion for the first page, but not the switch.
-  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(URL1)]
+  [[EarlGrey selectElementWithMatcher:PopupRowWithUrl(_URL1)]
       assertWithMatcher:grey_sufficientlyVisible()];
-  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(URL1)]
+  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(_URL1)]
       assertWithMatcher:grey_nil()];
 }
 
 - (void)testCloseNTPWhenSwitching {
   // Open the first page.
-  GURL URL1 = self.testServer->GetURL(kPage1URL);
-  [ChromeEarlGrey loadURL:URL1];
+  [ChromeEarlGrey loadURL:_URL1];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
   // Open a new tab and switch to the first tab.
   [ChromeEarlGrey openNewTab];
-  NSString* omniboxInput =
-      [NSString stringWithFormat:@"%@:%@", base::SysUTF8ToNSString(URL1.host()),
-                                 base::SysUTF8ToNSString(URL1.port())];
+  NSString* omniboxInput = [NSString
+      stringWithFormat:@"%@:%@", base::SysUTF8ToNSString(_URL1.host()),
+                       base::SysUTF8ToNSString(_URL1.port())];
   [[EarlGrey selectElementWithMatcher:chrome_test_util::FakeOmnibox()]
       performAction:grey_tap()];
   [ChromeEarlGrey
@@ -287,7 +310,7 @@
   [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
       performAction:grey_typeText(omniboxInput)];
 
-  TapSwitchToTabButton(URL1);
+  TapSwitchToTabButton(_URL1);
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
   // Check that the other tab is closed.
@@ -296,13 +319,12 @@
 
 - (void)testDontCloseNTPWhenSwitchingWithForwardHistory {
   // Open the first page.
-  GURL URL1 = self.testServer->GetURL(kPage1URL);
-  [ChromeEarlGrey loadURL:URL1];
+  [ChromeEarlGrey loadURL:_URL1];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
   // Open a new tab, navigate to a page and go back to have forward history.
   [ChromeEarlGrey openNewTab];
-  [ChromeEarlGrey loadURL:URL1];
+  [ChromeEarlGrey loadURL:_URL1];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
   [ChromeEarlGrey goBack];
 
@@ -312,14 +334,14 @@
   [ChromeEarlGrey
       waitForSufficientlyVisibleElementWithMatcher:chrome_test_util::Omnibox()];
   [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
-      performAction:grey_typeText(base::SysUTF8ToNSString(URL1.host()))];
+      performAction:grey_typeText(base::SysUTF8ToNSString(_URL1.host()))];
 
   // Omnibox can reorder itself in multiple animations, so add an extra wait
   // here.
   [ChromeEarlGrey
       waitForSufficientlyVisibleElementWithMatcher:SwitchTabElementForUrl(
-                                                       URL1)];
-  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(URL1)]
+                                                       _URL1)];
+  [[EarlGrey selectElementWithMatcher:SwitchTabElementForUrl(_URL1)]
       performAction:grey_tap()];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
@@ -330,10 +352,8 @@
 // Tests that switching to closed tab opens the tab in foreground, except if it
 // is from NTP without history.
 - (void)testSwitchToClosedTab {
-  GURL URL1 = self.testServer->GetURL(kPage1URL);
-
   // Open the first page.
-  [ChromeEarlGrey loadURL:URL1];
+  [ChromeEarlGrey loadURL:_URL1];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
   // Open a new tab and load another URL.
@@ -346,14 +366,14 @@
 
   // Make sure that the "Switch to Open Tab" element is visible, scrolling the
   // popup if necessary.
-  ScrollToSwitchToTabElement(URL1);
+  ScrollToSwitchToTabElement(_URL1);
 
   // Close the first page.
   [ChromeEarlGrey closeTabAtIndex:0];
   [ChromeEarlGrey waitForMainTabCount:1];
 
   // Try to switch to the first tab.
-  TapSwitchToTabButton(URL1);
+  TapSwitchToTabButton(_URL1);
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
   [ChromeEarlGreyUI waitForAppToIdle];
 
@@ -366,21 +386,19 @@
 // multiple buttons.
 - (void)testMultiplePageOpened {
   // Open the first page.
-  GURL URL1 = self.testServer->GetURL(kPage1URL);
-  [ChromeEarlGrey loadURL:URL1];
+  [ChromeEarlGrey loadURL:_URL1];
   [ChromeEarlGrey waitForWebStateContainingText:kPage1];
 
   // Open the second page in a new tab.
   [ChromeEarlGrey openNewTab];
-  GURL URL2 = self.testServer->GetURL(kPage2URL);
-  [ChromeEarlGrey loadURL:URL2];
+  [ChromeEarlGrey loadURL:_URL2];
   [ChromeEarlGrey waitForWebStateContainingText:kPage2];
 
   // Start typing url of the two opened pages in a new tab.
   [ChromeEarlGrey openNewTab];
-  NSString* omniboxInput =
-      [NSString stringWithFormat:@"%@:%@", base::SysUTF8ToNSString(URL1.host()),
-                                 base::SysUTF8ToNSString(URL1.port())];
+  NSString* omniboxInput = [NSString
+      stringWithFormat:@"%@:%@", base::SysUTF8ToNSString(_URL1.host()),
+                       base::SysUTF8ToNSString(_URL1.port())];
   [[EarlGrey selectElementWithMatcher:chrome_test_util::FakeOmnibox()]
       performAction:grey_tap()];
   [ChromeEarlGrey
@@ -393,10 +411,10 @@
   // here.
   [ChromeEarlGrey
       waitForSufficientlyVisibleElementWithMatcher:SwitchTabElementForUrl(
-                                                       URL1)];
+                                                       _URL1)];
   [ChromeEarlGrey
       waitForSufficientlyVisibleElementWithMatcher:SwitchTabElementForUrl(
-                                                       URL2)];
+                                                       _URL2)];
 }
 
 // Test that on iPhones, when the popup is scrolled, the keyboard is dismissed
@@ -492,4 +510,17 @@
                   @"Keyboard Should not be Shown");
 }
 
+#pragma mark - Helpers
+
+// Populate history by visiting the 3 different pages.
+- (void)populateHistory {
+  // Add all the pages to the history.
+  [ChromeEarlGrey loadURL:_URL1];
+  [ChromeEarlGrey waitForWebStateContainingText:kPage1];
+  [ChromeEarlGrey loadURL:_URL2];
+  [ChromeEarlGrey waitForWebStateContainingText:kPage2];
+  [ChromeEarlGrey loadURL:_URL3];
+  [ChromeEarlGrey waitForWebStateContainingText:kPage3];
+}
+
 @end

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_pedal_egtest.mm

diff --git a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_pedal_egtest.mm b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_pedal_egtest.mm
new file mode 100644
index 0000000..42a4351
--- /dev/null
+++ b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_pedal_egtest.mm
@@ -0,0 +1,100 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "base/ios/ios_util.h"
+#import "base/strings/sys_string_conversions.h"
+#import "ios/chrome/browser/shared/public/features/features.h"
+#import "ios/chrome/browser/ui/omnibox/omnibox_app_interface.h"
+#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_accessibility_identifier_constants.h"
+#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
+#import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
+#import "ios/chrome/test/earl_grey/chrome_matchers.h"
+#import "ios/chrome/test/earl_grey/chrome_test_case.h"
+#import "ios/testing/earl_grey/app_launch_manager.h"
+#import "ios/testing/earl_grey/earl_grey_test.h"
+#import "url/gurl.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace {
+NSString* kDinoPedalString = @"chrome://dino";
+NSString* kDinoSearchString = @"dino game";
+
+// Returns a matcher for a popup row containing `string` as accessibility label.
+id<GREYMatcher> popupRowWithString(NSString* string) {
+  id<GREYMatcher> textMatcher = grey_descendant(
+      chrome_test_util::StaticTextWithAccessibilityLabel(string));
+  id<GREYMatcher> popupRow =
+      grey_allOf(chrome_test_util::OmniboxPopupRow(), textMatcher,
+                 grey_sufficientlyVisible(), nil);
+  return popupRow;
+}
+
+}  // namespace
+
+@interface OmniboxPedalsTestCase : ChromeTestCase
+@end
+@implementation OmniboxPedalsTestCase
+
+- (void)setUp {
+  [super setUp];
+  [ChromeEarlGrey clearBrowsingHistory];
+
+  [OmniboxAppInterface
+      setUpFakeSuggestionsService:@"fake_suggestions_pedal.json"];
+}
+
+- (void)tearDown {
+  [OmniboxAppInterface tearDownFakeSuggestionsService];
+}
+
+// Tests that the dino pedal is present and that it opens the dino game.
+- (void)testDinoPedal {
+  // Focus omnibox from Web.
+  [ChromeEarlGrey loadURL:GURL("about:blank")];
+  [ChromeEarlGreyUI focusOmniboxAndType:@"pedaldino"];
+
+  // Matcher for the dino pedal and search suggestions.
+  id<GREYMatcher> dinoPedal = popupRowWithString(kDinoPedalString);
+  id<GREYMatcher> dinoSearch = popupRowWithString(kDinoSearchString);
+
+  // Dino pedal and search suggestions should be visible.
+  [ChromeEarlGrey waitForUIElementToAppearWithMatcher:dinoPedal];
+  [[EarlGrey selectElementWithMatcher:dinoSearch]
+      assertWithMatcher:grey_sufficientlyVisible()];
+
+  // Tap on dino pedal.
+  [[EarlGrey selectElementWithMatcher:dinoPedal] performAction:grey_tap()];
+
+  // The dino game should be loaded.
+  [ChromeEarlGrey waitForPageToFinishLoading];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::Omnibox()]
+      assertWithMatcher:chrome_test_util::OmniboxContainingText(
+                            base::SysNSStringToUTF8(kDinoPedalString))];
+
+  [ChromeEarlGrey closeCurrentTab];
+}
+
+// Tests that the dino pedal does not appear when the search suggestion is below
+// the top 3.
+- (void)testNoPedal {
+  // Focus omnibox from Web.
+  [ChromeEarlGrey loadURL:GURL("about:blank")];
+  [ChromeEarlGreyUI focusOmniboxAndType:@"nopedal"];
+
+  // Matcher for the dino pedal and search suggestions.
+  id<GREYMatcher> dinoPedal = popupRowWithString(kDinoPedalString);
+  id<GREYMatcher> dinoSearch = popupRowWithString(kDinoSearchString);
+
+  // The dino search suggestion should be present.
+  [ChromeEarlGrey waitForUIElementToAppearWithMatcher:dinoSearch];
+
+  // The dino pedal should not appear.
+  [[EarlGrey selectElementWithMatcher:dinoPedal] assertWithMatcher:grey_nil()];
+
+  [ChromeEarlGrey closeCurrentTab];
+}
+@end

ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.cc

diff --git a/ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.cc b/ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.cc
new file mode 100644
index 0000000..8d54e7a
--- /dev/null
+++ b/ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.cc
@@ -0,0 +1,70 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.h"
+
+#import "components/search_engines/template_url_service.h"
+#import "ios/chrome/browser/autocomplete/remote_suggestions_service_factory.h"
+#import "ios/chrome/browser/search_engines/template_url_service_factory.h"
+#import "ios/chrome/browser/ui/omnibox/fake_suggestions_database.h"
+#import "services/network/public/cpp/resource_request.h"
+#import "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
+#import "services/network/test/test_url_loader_factory.h"
+
+TestFakeSuggestionsService::TestFakeSuggestionsService() = default;
+
+TestFakeSuggestionsService::~TestFakeSuggestionsService() = default;
+
+// static
+TestFakeSuggestionsService* TestFakeSuggestionsService::GetInstance() {
+  static base::NoDestructor<TestFakeSuggestionsService> instance;
+  return instance.get();
+}
+
+void TestFakeSuggestionsService::SetUp(
+    RemoteSuggestionsService* remote_suggestions_service,
+    TemplateURLService* template_url_service,
+    const base::FilePath& file_path) {
+  remote_suggestions_service_observation_.Observe(remote_suggestions_service);
+
+  test_url_loader_factory_ = std::make_unique<network::TestURLLoaderFactory>();
+  scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory =
+      base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
+          test_url_loader_factory_.get());
+  remote_suggestions_service->set_url_loader_factory_for_testing(
+      shared_url_loader_factory);
+
+  fake_suggestions_database_ =
+      std::make_unique<FakeSuggestionsDatabase>(template_url_service);
+  fake_suggestions_database_->LoadSuggestionsFromFile(file_path);
+}
+
+void TestFakeSuggestionsService::TearDown(
+    RemoteSuggestionsService* remote_suggestions_service,
+    network::mojom::URLLoaderFactory* url_loader_factory) {
+  scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory =
+      base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
+          url_loader_factory);
+
+  remote_suggestions_service->set_url_loader_factory_for_testing(
+      shared_url_loader_factory);
+
+  remote_suggestions_service_observation_.Reset();
+  test_url_loader_factory_.reset();
+  fake_suggestions_database_.reset();
+}
+
+void TestFakeSuggestionsService::OnSuggestRequestStarting(
+    const base::UnguessableToken& request_id,
+    const network::ResourceRequest* request) {
+  DCHECK(fake_suggestions_database_);
+  DCHECK(test_url_loader_factory_);
+
+  if (fake_suggestions_database_->HasFakeSuggestions(request->url)) {
+    std::string fake_suggestions =
+        fake_suggestions_database_->GetFakeSuggestions(request->url);
+    test_url_loader_factory_->AddResponse(request->url.spec(), fake_suggestions,
+                                          net::HTTP_OK);
+  }
+}

ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.h

diff --git a/ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.h b/ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.h
new file mode 100644
index 0000000..648205419
--- /dev/null
+++ b/ios/chrome/browser/ui/omnibox/test_fake_suggestions_service.h
@@ -0,0 +1,57 @@
+// Copyright 2023 The Chromium Authors
+// 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_OMNIBOX_TEST_FAKE_SUGGESTIONS_SERVICE_H_
+#define IOS_CHROME_BROWSER_UI_OMNIBOX_TEST_FAKE_SUGGESTIONS_SERVICE_H_
+
+#import "base/files/file_path.h"
+#import "base/memory/weak_ptr.h"
+#import "base/no_destructor.h"
+#import "base/scoped_observation.h"
+#import "components/omnibox/browser/remote_suggestions_service.h"
+#import "services/network/public/mojom/url_loader_factory.mojom.h"
+
+namespace network {
+class TestURLLoaderFactory;
+}  // namespace network
+
+class TemplateURLService;
+class FakeSuggestionsDatabase;
+
+class TestFakeSuggestionsService : public RemoteSuggestionsService::Observer {
+ public:
+  static TestFakeSuggestionsService* GetInstance();
+
+  TestFakeSuggestionsService(const TestFakeSuggestionsService&) = delete;
+  TestFakeSuggestionsService& operator=(const TestFakeSuggestionsService&) =
+      delete;
+  ~TestFakeSuggestionsService() override;
+
+  void SetUp(RemoteSuggestionsService* remote_suggestions_service,
+             TemplateURLService* template_url_service,
+             const base::FilePath& file_path);
+
+  void TearDown(RemoteSuggestionsService* remote_suggestions_service,
+                network::mojom::URLLoaderFactory* url_loader_factory);
+
+  void OnSuggestRequestStarting(
+      const base::UnguessableToken& request_id,
+      const network::ResourceRequest* request) override;
+
+ private:
+  friend class base::NoDestructor<TestFakeSuggestionsService>;
+
+  TestFakeSuggestionsService();
+
+  std::unique_ptr<network::TestURLLoaderFactory> test_url_loader_factory_;
+  std::unique_ptr<FakeSuggestionsDatabase> fake_suggestions_database_;
+
+  base::ScopedObservation<RemoteSuggestionsService,
+                          RemoteSuggestionsService::Observer>
+      remote_suggestions_service_observation_{this};
+
+  base::WeakPtrFactory<TestFakeSuggestionsService> weak_ptr_factory_{this};
+};
+
+#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_TEST_FAKE_SUGGESTIONS_SERVICE_H_

ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm b/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm
index 7999a6d7..b0fa179 100644
--- a/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/password/password_details/password_details_table_view_controller.mm
@@ -710,17 +710,18 @@
   _passwords = passwords;
   _pageTitle = title;
 
+  [self updateNavigationTitle];
+  // Update the model even if all passwords are deleted and the view controller
+  // will be dismissed. UIKit could still trigger events that execute CHECK in
+  // this file that would fail if `_passwords` and the model are not in sync.
+  [self reloadData];
+
   if (![passwords count]) {
     // onAllPasswordsDeleted() mustn't be called twice.
     if (hadPasswords) {
       [self.handler onAllPasswordsDeleted];
     }
-    return;
   }
-
-  [self updateNavigationTitle];
-
-  [self reloadData];
 }
 
 - (void)setIsBlockedSite:(BOOL)isBlockedSite {
@@ -1093,8 +1094,10 @@
 
 // Updates the title displayed in the navigation bar.
 - (void)updateNavigationTitle {
-  if (!self.pageTitle || self.pageTitle.length == 0) {
-    self.pageTitle = self.passwords[0].origins[0];
+  if (self.pageTitle.length == 0) {
+    // When no pageTitle is supplied, use origin of first password.
+    PasswordDetails* firstPassword = self.passwords.firstObject;
+    self.pageTitle = firstPassword.origins.firstObject;
   }
   _titleLabel.text = self.pageTitle;
 }

ios/chrome/browser/ui/settings/password/password_manager_egtest.mm

diff --git a/ios/chrome/browser/ui/settings/password/password_manager_egtest.mm b/ios/chrome/browser/ui/settings/password/password_manager_egtest.mm
index fb6c86ef..0940dcf 100644
--- a/ios/chrome/browser/ui/settings/password/password_manager_egtest.mm
+++ b/ios/chrome/browser/ui/settings/password/password_manager_egtest.mm
@@ -816,6 +816,75 @@
       performAction:grey_tap()];
 }
 
+// Tests that the detail view is dismissed when the last password is deleted
+// after the user had edited the password.
+- (void)testSavedFormDeletionInDetailViewAfterEditingFields {
+  // Save form to be deleted later.
+  SaveExamplePasswordForm();
+
+  OpenPasswordManager();
+
+  [[self interactionForSinglePasswordEntryWithDomain:@"example.com"
+                                            username:@"concrete username"]
+      performAction:grey_tap()];
+
+  [PasswordSettingsAppInterface setUpMockReauthenticationModule];
+  [PasswordSettingsAppInterface mockReauthenticationModuleExpectedResult:
+                                    ReauthenticationResult::kSuccess];
+
+  TapEdit();
+
+  // Edit password field.
+  [[EarlGrey selectElementWithMatcher:PasswordDetailPassword()]
+      assertWithMatcher:grey_textFieldValue(@"concrete password")];
+
+  [[EarlGrey selectElementWithMatcher:PasswordDetailPassword()]
+      performAction:grey_replaceText(@"")];
+
+  // Delete password.
+  [[EarlGrey selectElementWithMatcher:[self groupingEnabled]
+                                          ? DeleteButtonForUsernameAndPassword(
+                                                @"concrete username",
+                                                @"concrete password")
+                                          : DeleteButton()]
+      performAction:grey_tap()];
+
+  [[EarlGrey
+      selectElementWithMatcher:[self groupingEnabled]
+                                   ? DeleteConfirmationButtonForGrouping()
+                                   : DeleteConfirmationButton()]
+      performAction:grey_tap()];
+
+  // Wait until the alert and the detail view are dismissed.
+  [ChromeEarlGreyUI waitForAppToIdle];
+
+  // Check that the current view is now the list view, by locating
+  // PasswordTableViewController.
+  [[EarlGrey
+      selectElementWithMatcher:grey_accessibilityID(kPasswordsTableViewId)]
+      assertWithMatcher:grey_notNil()];
+
+  // Verify that the deletion was propagated to the PasswordStore.
+  GREYAssertEqual(0, [PasswordSettingsAppInterface passwordStoreResultsCount],
+                  @"Stored password was not removed from PasswordStore.");
+
+  // Also verify that the removed password is no longer in the list.
+  [[self interactionForSinglePasswordEntryWithDomain:@"example.com"
+                                            username:@"concrete username"]
+      assertWithMatcher:grey_not(grey_sufficientlyVisible())];
+
+  // Finally, verify that the Add button is visible and enabled, because there
+  // are no other password entries left for deletion via the "Edit" mode.
+  [[EarlGrey selectElementWithMatcher:AddPasswordToolbarButton()]
+      assertWithMatcher:grey_allOf(grey_enabled(), grey_sufficientlyVisible(),
+                                   nil)];
+
+  [[EarlGrey selectElementWithMatcher:SettingsMenuBackButton()]
+      performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:SettingsDoneButton()]
+      performAction:grey_tap()];
+}
+
 // Checks that deleting a saved password from password details view goes back
 // to the list-of-passwords showing only previously saved blocked sites.
 - (void)testSavedFormDeletionInDetailViewWithBlockedSites {

ios/chrome/test/data/omnibox/fake_suggestions_pedal.json

diff --git a/ios/chrome/test/data/omnibox/fake_suggestions_pedal.json b/ios/chrome/test/data/omnibox/fake_suggestions_pedal.json
new file mode 100644
index 0000000..28b3843a
--- /dev/null
+++ b/ios/chrome/test/data/omnibox/fake_suggestions_pedal.json
@@ -0,0 +1,91 @@
+[
+  [
+  "nopedal",
+  [
+    "nopedal",
+    "nopedal 2",
+    "nopedal 3",
+    "dino game",
+  ],
+  [
+    "",
+    "",
+    "",
+    "",
+  ],
+  [],
+  {
+    "google:clientdata": {
+      "bpc": false,
+      "tlw": false
+    },
+    "google:suggestdetail": [
+      {},
+      {},
+      {},
+      {},
+    ],
+    "google:suggestrelevance": [
+      1253,
+      1252,
+      1251,
+      1250,
+    ],
+    "google:suggestsubtypes": [
+      [],
+      [],
+      [],
+      [],
+    ],
+    "google:suggesttype": [
+      "QUERY",
+      "QUERY",
+      "QUERY",
+      "QUERY",
+    ],
+    "google:verbatimrelevance": 1300
+  }
+  ],
+  [
+  "pedaldino",
+  [
+    "nopedal",
+    "dino game",
+    "nopedal 3"
+  ],
+  [
+    "",
+    "",
+    "",
+  ],
+  [],
+  {
+    "google:clientdata": {
+      "bpc": false,
+      "tlw": false
+    },
+    "google:suggestdetail": [
+      {},
+      {},
+      {},
+    ],
+    "google:suggestrelevance": [
+      1253,
+      1252,
+      1251,
+    ],
+    "google:suggestsubtypes": [
+      [],
+      [],
+      [],
+    ],
+    "google:suggesttype": [
+      "QUERY",
+      "QUERY",
+      "QUERY",
+    ],
+    "google:verbatimrelevance": 1300
+  }
+  ],
+]
+

ios/chrome/test/earl_grey/chrome_matchers.h

diff --git a/ios/chrome/test/earl_grey/chrome_matchers.h b/ios/chrome/test/earl_grey/chrome_matchers.h
index 0b87ed2c..065cd2a2 100644
--- a/ios/chrome/test/earl_grey/chrome_matchers.h
+++ b/ios/chrome/test/earl_grey/chrome_matchers.h
@@ -397,6 +397,12 @@
 // Returns a matcher for the copy button on the system selection callout.
 id<GREYMatcher> SystemSelectionCalloutCopyButton();
 
+// Returns a matcher for the cut button on the system selection callout.
+id<GREYMatcher> SystemSelectionCalloutCutButton();
+
+// Returns a matcher for the paste button on the system selection callout.
+id<GREYMatcher> SystemSelectionCalloutPasteButton();
+
 // Returns a matcher for the system selection callout overflow button to show
 // more menu items.
 id<GREYMatcher> SystemSelectionCalloutOverflowButton();

ios/chrome/test/earl_grey/chrome_matchers.mm

diff --git a/ios/chrome/test/earl_grey/chrome_matchers.mm b/ios/chrome/test/earl_grey/chrome_matchers.mm
index 818636c..027c935 100644
--- a/ios/chrome/test/earl_grey/chrome_matchers.mm
+++ b/ios/chrome/test/earl_grey/chrome_matchers.mm
@@ -498,6 +498,14 @@
   return [EditMenuAppInterface editMenuCopyButtonMatcher];
 }
 
+id<GREYMatcher> SystemSelectionCalloutCutButton() {
+  return [EditMenuAppInterface editMenuCutButtonMatcher];
+}
+
+id<GREYMatcher> SystemSelectionCalloutPasteButton() {
+  return [EditMenuAppInterface editMenuPasteButtonMatcher];
+}
+
 id<GREYMatcher> SystemSelectionCalloutOverflowButton() {
   return [EditMenuAppInterface editMenuNextButtonMatcher];
 }

media/audio/cras/cras_unified.cc

diff --git a/media/audio/cras/cras_unified.cc b/media/audio/cras/cras_unified.cc
index ad516eb..538bf6e 100644
--- a/media/audio/cras/cras_unified.cc
+++ b/media/audio/cras/cras_unified.cc
@@ -114,10 +114,7 @@
       output_bus_(AudioBus::Create(params)),
       pin_device_(GetDevicePin(manager, device_id)),
       glitch_reporter_(SystemGlitchReporter::StreamType::kRender),
-      log_callback_(std::move(log_callback)),
-      peak_detector_(base::BindRepeating(&AudioManager::TraceAmplitudePeak,
-                                         base::Unretained(manager_),
-                                         /*trace_start=*/false)) {
+      log_callback_(std::move(log_callback)) {
   DCHECK(manager_);
   DCHECK_GT(params_.channels(), 0);
 }
@@ -263,6 +260,10 @@
   // Done with config params.
   libcras_stream_params_destroy(stream_params);
 
+  peak_detector_ = std::make_unique<AmplitudePeakDetector>(base::BindRepeating(
+      &AudioManager::TraceAmplitudePeak, base::Unretained(manager_),
+      /*trace_start=*/false));
+
   is_playing_ = true;
 
   ReportStreamStartResult(StreamStartResult::kCallbackStartSuccess);
@@ -276,6 +277,8 @@
   // Removing the stream from the client stops audio.
   libcras_client_rm_stream(client_, stream_id_);
 
+  peak_detector_.reset();
+
   ReportAndResetStats();
 
   is_playing_ = false;
@@ -335,7 +338,7 @@
       delay, base::TimeTicks::Now(), glitch_info_accumulator_.GetAndReset(),
       output_bus_.get());
 
-  peak_detector_.FindPeak(output_bus_.get());
+  peak_detector_->FindPeak(output_bus_.get());
 
   // Note: If this ever changes to output raw float the data must be clipped and
   // sanitized since it may come from an untrusted source such as NaCl.

media/audio/cras/cras_unified.h

diff --git a/media/audio/cras/cras_unified.h b/media/audio/cras/cras_unified.h
index 3bde56fa..50c0da2 100644
--- a/media/audio/cras/cras_unified.h
+++ b/media/audio/cras/cras_unified.h
@@ -133,7 +133,7 @@
   // Used to accumulate glitch info to report to |source_callback_|
   AudioGlitchInfo::Accumulator glitch_info_accumulator_;
 
-  AmplitudePeakDetector peak_detector_;
+  std::unique_ptr<AmplitudePeakDetector> peak_detector_;
 };
 
 }  // namespace media

media/gpu/test/video_encoder/decoder_buffer_validator.cc

diff --git a/media/gpu/test/video_encoder/decoder_buffer_validator.cc b/media/gpu/test/video_encoder/decoder_buffer_validator.cc
index 2920e5b7..dcd6247 100644
--- a/media/gpu/test/video_encoder/decoder_buffer_validator.cc
+++ b/media/gpu/test/video_encoder/decoder_buffer_validator.cc
@@ -292,8 +292,18 @@
     return false;
   }
 
-  if (num_temporal_layers_ == 1)
+  if (num_temporal_layers_ == 1) {
+    if (!header.refresh_entropy_probs) {
+      LOG(ERROR) << "refereh_entropy_probs should be true in non temporal "
+                    "layer encoding";
+      return false;
+    }
     return true;
+  } else if (header.refresh_entropy_probs) {
+    LOG(ERROR)
+        << "refereh_entropy_probs must be false in temporal layer encoding";
+    return false;
+  }
 
   if (!metadata.vp8) {
     LOG(ERROR) << "Metadata must be populated if temporal scalability is used.";
@@ -409,7 +419,9 @@
   }
 
   BufferState new_buffer_state{};
-  if (max_num_spatial_layers_ > 1 || num_temporal_layers_ > 1) {
+  const bool svc_encoding =
+      max_num_spatial_layers_ > 1 || num_temporal_layers_ > 1;
+  if (svc_encoding) {
     if (!metadata.vp9) {
       LOG(ERROR) << "Metadata must be populated if spatial/temporal "
                     "scalability is used.";
@@ -420,6 +432,11 @@
                     "scaliblity is enabled.";
       return false;
     }
+    if (header.refresh_frame_context) {
+      LOG(ERROR) << "Frame context must not be refreshed in spatial or temporal"
+                    " scaliblity is enabled";
+      return false;
+    }
     new_buffer_state.spatial_id = metadata.vp9->spatial_idx;
     new_buffer_state.temporal_id = metadata.vp9->temporal_idx;
 
@@ -436,6 +453,16 @@
     if (metadata.vp9->spatial_idx == cur_num_spatial_layers_ - 1)
       next_picture_id_++;
   } else {
+    if (header.error_resilient_mode) {
+      LOG(ERROR) << "Error resilient mode should not be used if neither spatial"
+                    "nor temporal scalablity is enabled";
+      return false;
+    }
+    if (!header.refresh_frame_context) {
+      LOG(ERROR) << "Frame context should be refreshed if neither spatial nor "
+                    "nor temporal scalablity is enabled";
+      return false;
+    }
     new_buffer_state.picture_id = next_picture_id_++;
   }
 

mojo/core/ipcz_driver/invitation.cc

diff --git a/mojo/core/ipcz_driver/invitation.cc b/mojo/core/ipcz_driver/invitation.cc
index 550f049..e4ff56b 100644
--- a/mojo/core/ipcz_driver/invitation.cc
+++ b/mojo/core/ipcz_driver/invitation.cc
@@ -100,20 +100,22 @@
 }
 
 #if BUILDFLAG(IS_WIN)
-// Helper function on Windows platform to open the remote client process given a
-// handle to a connected named pipe. It may return an invalid process object if
-// either the handle does not refer to a named pipe or the handle refers to a
-// named pipe that is not connected.
-base::Process OpenRemoteProcess(
-    const MojoInvitationTransportEndpoint& endpoint) {
+// Helper function on Windows platform to open the remote server/client process
+// given a handle to a connected named pipe. It may return an invalid process
+// object if either the handle does not refer to a named pipe or the handle
+// refers to a named pipe that is not connected.
+base::Process OpenRemoteProcess(const MojoInvitationTransportEndpoint& endpoint,
+                                bool remote_is_server) {
   base::ProcessId remote_process_id = 0;
   // Extract the handle to the connected named pipe from mojo invitation
   // transport endpoint.
   HANDLE handle =
       LongToHandle(static_cast<long>(endpoint.platform_handles[0].value));
+  auto get_remote_pid = remote_is_server ? &GetNamedPipeServerProcessId
+                                         : &GetNamedPipeClientProcessId;
   // Try to get the remote client process id given the extracted handle via
-  // GetNamedPipeClientProcessId API.
-  if ((!GetNamedPipeClientProcessId(handle, &remote_process_id) ||
+  // GetNamedPipe(Server|Client)ProcessId API.
+  if ((!get_remote_pid(handle, &remote_process_id) ||
        remote_process_id == base::Process::Current().Pid())) {
     DVLOG(2) << "Failed to get remote process id via the connected named pipe";
     return base::Process();
@@ -266,7 +268,8 @@
   // in such case, rely on the connected named pipe to get the remote process
   // id, then open and set the remote process.
   if (!remote_process.IsValid()) {
-    remote_process = OpenRemoteProcess(*transport_endpoint);
+    remote_process =
+        OpenRemoteProcess(*transport_endpoint, /* remote_is_server= */ false);
   }
 #endif
 
@@ -383,18 +386,18 @@
   }
 
   // In an elevated Windows process our transport needs a handle to the broker's
-  // own process (assumed to be our parent process). This is required to support
-  // transmission of arbitrary Windows handles to and from the elevated process.
-  base::Process launcher;
+  // own process. This is required to support transmission of arbitrary Windows
+  // handles to and from the elevated process.
+  base::Process remote_process;
 #if BUILDFLAG(IS_WIN)
-  if (base::IsCurrentProcessElevated()) {
-    launcher = base::Process(::OpenProcess(
-        PROCESS_DUP_HANDLE, FALSE,
-        base::GetParentProcessId(base::GetCurrentProcessHandle())));
+  if (is_elevated) {
+    remote_process =
+        OpenRemoteProcess(*transport_endpoint, /* remote_is_server= */ true);
   }
 #endif
-  if (launcher.IsValid()) {
-    Transport::FromHandle(transport)->set_remote_process(std::move(launcher));
+  if (remote_process.IsValid()) {
+    Transport::FromHandle(transport)->set_remote_process(
+        std::move(remote_process));
   }
 
   IpczResult result = GetIpczAPI().ConnectNode(

mojo/public/cpp/system/tests/invitation_unittest.cc

diff --git a/mojo/public/cpp/system/tests/invitation_unittest.cc b/mojo/public/cpp/system/tests/invitation_unittest.cc
index 4623b1b..70373e62 100644
--- a/mojo/public/cpp/system/tests/invitation_unittest.cc
+++ b/mojo/public/cpp/system/tests/invitation_unittest.cc
@@ -8,6 +8,7 @@
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
+#include "base/check.h"
 #include "base/check_op.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ -23,6 +24,7 @@
 #include "build/build_config.h"
 #include "mojo/core/embedder/embedder.h"
 #include "mojo/core/test/test_switches.h"
+#include "mojo/public/c/system/invitation.h"
 #include "mojo/public/cpp/platform/platform_channel.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/public/cpp/system/platform_handle.h"
@@ -35,12 +37,22 @@
 #include "mojo/public/cpp/platform/named_platform_channel.h"
 #endif
 
+#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
+#include "base/win/access_token.h"
+#endif
+
 namespace mojo {
 namespace {
 
 enum class InvitationType {
   kNormal,
   kIsolated,
+#if BUILDFLAG(IS_WIN)
+  // For now, the concept of an elevated process is only meaningful on Windows.
+  kElevated,
+#endif
 };
 
 enum class TransportType {
@@ -140,15 +152,29 @@
       channel->RemoteProcessLaunchAttempted();
 
     OutgoingInvitation invitation;
-    if (invitation_type == InvitationType::kNormal) {
+    if (invitation_type != InvitationType::kIsolated) {
       for (uint64_t name = 0; name < num_primordial_pipes; ++name)
         primordial_pipes[name] = invitation.AttachMessagePipe(name);
     }
 
+#if BUILDFLAG(IS_WIN)
+    if (invitation_type == InvitationType::kElevated) {
+      // We can't elevate the child process because of UAC, so instead we just
+      // lower the integrity level on the IO thread, so that OpenProcess() will
+      // fail with access denied error on the server side, forcing the client
+      // to be responsible for handle duplication. This trick works regardless
+      // of whether the current process is elevated.
+      core::GetIOTaskRunner()->PostTask(
+          FROM_HERE, base::BindOnce(&LowerCurrentThreadIntegrityLevel));
+
+      invitation.set_extra_flags(MOJO_SEND_INVITATION_FLAG_ELEVATED);
+    }
+#endif
+
     switch (transport_type) {
       case TransportType::kChannel:
         DCHECK(channel_endpoint.is_valid());
-        if (invitation_type == InvitationType::kNormal) {
+        if (invitation_type != InvitationType::kIsolated) {
           OutgoingInvitation::Send(std::move(invitation),
                                    child_process_.Handle(),
                                    std::move(channel_endpoint), error_callback);
@@ -162,7 +188,7 @@
 #if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_IOS)
       case TransportType::kChannelServer:
         DCHECK(server_endpoint.is_valid());
-        if (invitation_type == InvitationType::kNormal) {
+        if (invitation_type != InvitationType::kIsolated) {
           OutgoingInvitation::Send(std::move(invitation),
                                    child_process_.Handle(),
                                    std::move(server_endpoint), error_callback);
@@ -177,9 +203,8 @@
         break;
       case TransportType::kChannelServerWithoutHandle:
         DCHECK(server_endpoint.is_valid());
-        if (invitation_type == InvitationType::kNormal) {
-          OutgoingInvitation::Send(std::move(invitation),
-                                   child_process_.Handle(),
+        if (invitation_type != InvitationType::kIsolated) {
+          OutgoingInvitation::Send(std::move(invitation), {},
                                    std::move(server_endpoint), error_callback);
         } else {
           DCHECK(primordial_pipes);
@@ -219,6 +244,21 @@
     return std::string(payload.begin(), payload.end());
   }
 
+#if BUILDFLAG(IS_WIN)
+  static void LowerCurrentThreadIntegrityLevel() {
+    auto restricted_access_token = base::win::AccessToken::FromCurrentProcess(
+        /* impersonation= */ true, TOKEN_ALL_ACCESS);
+    PCHECK(restricted_access_token);
+    CHECK(restricted_access_token->IsImpersonation());
+    CHECK_GT(restricted_access_token->IntegrityLevel(),
+             static_cast<DWORD>(SECURITY_MANDATORY_UNTRUSTED_RID))
+        << "Current integrity level must be higher than UNTRUSTED.";
+    PCHECK(restricted_access_token->SetIntegrityLevel(
+        SECURITY_MANDATORY_UNTRUSTED_RID));
+    PCHECK(ImpersonateLoggedOnUser(restricted_access_token->get()));
+  }
+#endif
+
  private:
   base::test::TaskEnvironment task_environment_;
   base::Process child_process_;
@@ -242,8 +282,9 @@
     return PlatformChannel::RecoverPassedEndpointFromCommandLine(command_line);
   }
 
-  static IncomingInvitation AcceptInvitation() {
-    return IncomingInvitation::Accept(RecoverEndpointFromCommandLine());
+  static IncomingInvitation AcceptInvitation(
+      MojoAcceptInvitationFlags flags = MOJO_ACCEPT_INVITATION_FLAG_NONE) {
+    return IncomingInvitation::Accept(RecoverEndpointFromCommandLine(), flags);
   }
 
   static ScopedMessagePipeHandle AcceptIsolatedInvitation() {
@@ -292,6 +333,22 @@
   CHECK_EQ(kTestMessage1, ReadMessage(pipe));
 }
 
+#if BUILDFLAG(IS_WIN)
+TEST_P(MAYBE_InvitationCppTest, SendElevated) {
+  ScopedMessagePipeHandle pipe;
+  LaunchChildTestClient("CppSendElevatedClient", &pipe, 1,
+                        InvitationType::kElevated, GetParam());
+  WriteMessage(pipe, kTestMessage1);
+  WaitForChildExit();
+}
+
+DEFINE_TEST_CLIENT(CppSendElevatedClient) {
+  auto invitation = AcceptInvitation(MOJO_ACCEPT_INVITATION_FLAG_ELEVATED);
+  auto pipe = invitation.ExtractMessagePipe(0);
+  CHECK_EQ(kTestMessage1, ReadMessage(pipe));
+}
+#endif  // BUILDFLAG(IS_WIN)
+
 TEST_P(MAYBE_InvitationCppTest, SendWithMultiplePipes) {
   ScopedMessagePipeHandle pipes[2];
   LaunchChildTestClient("CppSendWithMultiplePipesClient", pipes, 2,

net/dns/host_resolver_manager.cc

diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
index 17e5d590..e3e361851 100644
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -3926,10 +3926,11 @@
   SetLastIPv6ProbeResult((rv == OK) ? true : false);
   std::move(callback).Run(OK);
   if (!ipv6_request_callbacks_.empty()) {
-    for (auto& request_callback : ipv6_request_callbacks_) {
+    std::vector<CompletionOnceCallback> tmp_request_callbacks;
+    ipv6_request_callbacks_.swap(tmp_request_callbacks);
+    for (auto& request_callback : tmp_request_callbacks) {
       std::move(request_callback).Run(OK);
     }
-    ipv6_request_callbacks_.clear();
   }
 }
 

net/dns/host_resolver_manager.h

diff --git a/net/dns/host_resolver_manager.h b/net/dns/host_resolver_manager.h
index 1402736..2617812 100644
--- a/net/dns/host_resolver_manager.h
+++ b/net/dns/host_resolver_manager.h
@@ -236,6 +236,10 @@
   // mocking time, if expiration would pose a problem.
   void SetLastIPv6ProbeResultForTesting(bool last_ipv6_probe_result);
 
+  void ResetIPv6ProbeTimeForTesting() {
+    last_ipv6_probe_time_ = base::TimeTicks();
+  }
+
   // Allows the tests to catch slots leaking out of the dispatcher.  One
   // HostResolverManager::Job could occupy multiple PrioritizedDispatcher job
   // slots.

net/dns/host_resolver_manager_unittest.cc

diff --git a/net/dns/host_resolver_manager_unittest.cc b/net/dns/host_resolver_manager_unittest.cc
index 3aafba4..6592f18 100644
--- a/net/dns/host_resolver_manager_unittest.cc
+++ b/net/dns/host_resolver_manager_unittest.cc
@@ -1110,6 +1110,74 @@
   NumericIPv6AddressWithSchemeTest(false);
 }
 
+// Regression test for https://crbug.com/1432508.
+//
+// Tests that if a new request is made while the loop within
+// FinishIPv6ReachabilityCheck is still running, and the new request needs to
+// wait on a new IPv6 probe to complete, the new request does not try to modify
+// the same vector that FinishIPv6ReachabilityCheck is iterating over.
+TEST_F(HostResolverManagerTest, AddRequestDuringFinishIPv6ReachabilityCheck) {
+  CreateResolverWithLimitsAndParams(kMaxJobs, DefaultParams(proc_),
+                                    true /* ipv6_reachable */,
+                                    true /* check_ipv6_on_wifi */, true);
+
+  // Reset `last_ipv6_probe_time_` if `reset_ipv6_probe_time` true so a new
+  // request kicks off a new reachability probe.
+  auto custom_callback_template = base::BindLambdaForTesting(
+      [&](bool reset_ipv6_probe_time, const HostPortPair& next_host,
+          std::unique_ptr<ResolveHostResponseHelper>* next_response,
+          CompletionOnceCallback completion_callback, int error) {
+        if (reset_ipv6_probe_time) {
+          resolver_->ResetIPv6ProbeTimeForTesting();
+        }
+        *next_response = std::make_unique<ResolveHostResponseHelper>(
+            resolver_->CreateRequest(next_host, NetworkAnonymizationKey(),
+                                     NetLogWithSource(), absl::nullopt,
+                                     resolve_context_.get(),
+                                     resolve_context_->host_cache()));
+        std::move(completion_callback).Run(error);
+      });
+
+  std::vector<std::unique_ptr<ResolveHostResponseHelper>> next_responses(3);
+
+  ResolveHostResponseHelper response0(
+      resolver_->CreateRequest(HostPortPair("2001:db8::1", 5555),
+                               NetworkAnonymizationKey(), NetLogWithSource(),
+                               absl::nullopt, resolve_context_.get(),
+                               resolve_context_->host_cache()),
+      base::BindOnce(custom_callback_template, true, HostPortPair("zzz", 80),
+                     &next_responses[0]));
+
+  // New requests made by response1 and response2 will wait for a new
+  // reachability probe to complete.
+  ResolveHostResponseHelper response1(
+      resolver_->CreateRequest(HostPortPair("2001:db8::1", 5555),
+                               NetworkAnonymizationKey(), NetLogWithSource(),
+                               absl::nullopt, resolve_context_.get(),
+                               resolve_context_->host_cache()),
+      base::BindOnce(custom_callback_template, false, HostPortPair("aaa", 80),
+                     &next_responses[1]));
+
+  ResolveHostResponseHelper response2(
+      resolver_->CreateRequest(HostPortPair("2001:db8::1", 5555),
+                               NetworkAnonymizationKey(), NetLogWithSource(),
+                               absl::nullopt, resolve_context_.get(),
+                               resolve_context_->host_cache()),
+      base::BindOnce(custom_callback_template, false, HostPortPair("eee", 80),
+                     &next_responses[2]));
+
+  // Unblock all calls to proc.
+  proc_->SignalMultiple(6u);
+
+  // All requests should return OK.
+  EXPECT_THAT(response0.result_error(), IsOk());
+  EXPECT_THAT(response1.result_error(), IsOk());
+  EXPECT_THAT(response2.result_error(), IsOk());
+  EXPECT_THAT(next_responses[0]->result_error(), IsOk());
+  EXPECT_THAT(next_responses[1]->result_error(), IsOk());
+  EXPECT_THAT(next_responses[2]->result_error(), IsOk());
+}
+
 TEST_F(HostResolverManagerTest, EmptyHost) {
   ResolveHostResponseHelper response(resolver_->CreateRequest(
       HostPortPair(std::string(), 5555), NetworkAnonymizationKey(),

net/proxy_resolution/proxy_config_service_linux.cc

diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_resolution/proxy_config_service_linux.cc
index 62ad8e5..a74a050 100644
--- a/net/proxy_resolution/proxy_config_service_linux.cc
+++ b/net/proxy_resolution/proxy_config_service_linux.cc
@@ -535,13 +535,12 @@
       if (!env_var_getter->GetVar(base::env_vars::kHome, &home))
         // User has no $HOME? Give up. Later we'll report the failure.
         return;
-      if (base::nix::GetDesktopEnvironment(env_var_getter) ==
-          base::nix::DESKTOP_ENVIRONMENT_KDE3) {
+      auto desktop = base::nix::GetDesktopEnvironment(env_var_getter);
+      if (desktop == base::nix::DESKTOP_ENVIRONMENT_KDE3) {
         // KDE3 always uses .kde for its configuration.
         base::FilePath kde_path = base::FilePath(home).Append(".kde");
         kde_config_dirs_.emplace_back(KDEHomeToConfigPath(kde_path));
-      } else if (base::nix::GetDesktopEnvironment(env_var_getter) ==
-                 base::nix::DESKTOP_ENVIRONMENT_KDE4) {
+      } else if (desktop == base::nix::DESKTOP_ENVIRONMENT_KDE4) {
         // Some distributions patch KDE4 to use .kde4 instead of .kde, so that
         // both can be installed side-by-side. Sadly they don't all do this, and
         // they don't always do this: some distributions have started switching
@@ -573,7 +572,8 @@
         } else {
           kde_config_dirs_.emplace_back(KDEHomeToConfigPath(kde3_path));
         }
-      } else {
+      } else if (desktop == base::nix::DESKTOP_ENVIRONMENT_KDE5 ||
+                 desktop == base::nix::DESKTOP_ENVIRONMENT_KDE6) {
         // KDE 5 migrated to ~/.config for storing kioslaverc.
         kde_config_dirs_.emplace_back(base::FilePath(home).Append(".config"));
 
@@ -1248,6 +1248,7 @@
     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
     case base::nix::DESKTOP_ENVIRONMENT_KDE5:
+    case base::nix::DESKTOP_ENVIRONMENT_KDE6:
       setting_getter_ =
           std::make_unique<SettingGetterImplKDE>(env_var_getter_.get());
       break;

ppapi/proxy/ppapi_command_buffer_proxy.cc

diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc
index e92622a..d096a77 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc
@@ -119,6 +119,7 @@
 scoped_refptr<gpu::Buffer> PpapiCommandBufferProxy::CreateTransferBuffer(
     uint32_t size,
     int32_t* id,
+    uint32_t alignment,
     gpu::TransferBufferAllocationOption option) {
   *id = -1;
 

ppapi/proxy/ppapi_command_buffer_proxy.h

diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h
index 0a8feb3..403e97d 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.h
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.h
@@ -55,6 +55,7 @@
   scoped_refptr<gpu::Buffer> CreateTransferBuffer(
       uint32_t size,
       int32_t* id,
+      uint32_t alignment = 0,
       gpu::TransferBufferAllocationOption option =
           gpu::TransferBufferAllocationOption::kLoseContextOnOOM) override;
   void DestroyTransferBuffer(int32_t id) override;

services/network/attribution/attribution_request_helper.cc

diff --git a/services/network/attribution/attribution_request_helper.cc b/services/network/attribution/attribution_request_helper.cc
index abc432b..f0f850e 100644
--- a/services/network/attribution/attribution_request_helper.cc
+++ b/services/network/attribution/attribution_request_helper.cc
@@ -17,6 +17,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/strcat.h"
+#include "base/strings/string_piece.h"
 #include "base/uuid.h"
 #include "net/base/isolation_info.h"
 #include "net/base/schemeful_site.h"
@@ -28,8 +29,10 @@
 #include "services/network/attribution/boringssl_attestation_cryptographer.h"
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/is_potentially_trustworthy.h"
+#include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/trigger_attestation.h"
 #include "services/network/public/cpp/trust_token_http_headers.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"
 #include "services/network/trust_tokens/trust_token_key_commitment_getter.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
@@ -40,6 +43,9 @@
 
 namespace {
 
+constexpr char kAttributionReportingEligibleHeader[] =
+    "Attribution-Reporting-Eligible";
+
 void RecordDestinationOriginStatus(
     AttributionRequestHelper::DestinationOriginStatus status) {
   base::UmaHistogramEnumeration(
@@ -58,12 +64,21 @@
 bool IsNeededForRequest(const net::HttpRequestHeaders& request_headers) {
   std::string attribution_header;
   bool is_trigger_ping =
-      request_headers.GetHeader("Attribution-Reporting-Eligible",
+      request_headers.GetHeader(kAttributionReportingEligibleHeader,
                                 &attribution_header) &&
       base::Contains(attribution_header, "trigger");
   return is_trigger_ping;
 }
 
+base::StringPiece GetSupportHeader(mojom::AttributionOsSupport os_support) {
+  switch (os_support) {
+    case mojom::AttributionOsSupport::kDisabled:
+      return "web";
+    case mojom::AttributionOsSupport::kEnabled:
+      return "web, os";
+  }
+}
+
 }  // namespace
 
 struct AttributionRequestHelper::AttestationOperation {
@@ -272,4 +287,16 @@
   std::move(done).Run();
 }
 
+void SetAttributionReportingHeaders(net::URLRequest& url_request,
+                                    const ResourceRequest& request) {
+  if (base::FeatureList::IsEnabled(
+          features::kAttributionReportingCrossAppWeb) &&
+      request.headers.HasHeader(kAttributionReportingEligibleHeader)) {
+    url_request.SetExtraRequestHeaderByName(
+        "Attribution-Reporting-Support",
+        GetSupportHeader(request.attribution_reporting_os_support),
+        /*overwrite=*/true);
+  }
+}
+
 }  // namespace network

services/network/attribution/attribution_request_helper.h

diff --git a/services/network/attribution/attribution_request_helper.h b/services/network/attribution/attribution_request_helper.h
index d641e07..e711f89 100644
--- a/services/network/attribution/attribution_request_helper.h
+++ b/services/network/attribution/attribution_request_helper.h
@@ -28,6 +28,8 @@
 class AttributionAttestationMediator;
 class TrustTokenKeyCommitmentGetter;
 
+struct ResourceRequest;
+
 // Class AttributionRequestHelper handles attribution-reporting-api related
 // operations (https://github.com/WICG/attribution-reporting-api) that must
 // happen in the network service. It is meant to be optionally hooked to a
@@ -147,6 +149,10 @@
   base::WeakPtrFactory<AttributionRequestHelper> weak_ptr_factory_{this};
 };
 
+// Sets the Attribution Reporting request headers on attribution eligible
+// requests. See https://github.com/WICG/attribution-reporting-api.
+void SetAttributionReportingHeaders(net::URLRequest&, const ResourceRequest&);
+
 }  // namespace network
 
 #endif  // SERVICES_NETWORK_ATTRIBUTION_ATTRIBUTION_REQUEST_HELPER_H_

services/network/public/cpp/features.cc

diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
index 4dd799d7..25bef2a 100644
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -144,6 +144,12 @@
              "AttributionReportingTriggerAttestation",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
+// Gate access to Attribution Reporting cross app and web APIs that allow
+// registering with a native attribution API.
+BASE_FEATURE(kAttributionReportingCrossAppWeb,
+             "AttributionReportingCrossAppWeb",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
 // Enables preprocessing requests with the Private State Tokens API Fetch flags
 // set, and handling their responses, according to the protocol.
 // (See https://github.com/WICG/trust-token-api.)

services/network/public/cpp/features.h

diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
index bd0ad94..1bbfa177 100644
--- a/services/network/public/cpp/features.h
+++ b/services/network/public/cpp/features.h
@@ -39,6 +39,9 @@
 COMPONENT_EXPORT(NETWORK_CPP)
 BASE_DECLARE_FEATURE(kAttributionReportingTriggerAttestation);
 
+COMPONENT_EXPORT(NETWORK_CPP)
+BASE_DECLARE_FEATURE(kAttributionReportingCrossAppWeb);
+
 // Both flags need to be checked for required PST components as they are being
 // used in different experiments.
 //

services/network/public/cpp/resource_request.h

diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
index a39040c9..1f790022 100644
--- a/services/network/public/cpp/resource_request.h
+++ b/services/network/public/cpp/resource_request.h
@@ -23,6 +23,7 @@
 #include "services/network/public/cpp/optional_trust_token_params.h"
 #include "services/network/public/cpp/resource_request_body.h"
 #include "services/network/public/mojom/accept_ch_frame_observer.mojom.h"
+#include "services/network/public/mojom/attribution.mojom.h"
 #include "services/network/public/mojom/client_security_state.mojom.h"
 #include "services/network/public/mojom/cookie_access_observer.mojom-forward.h"
 #include "services/network/public/mojom/cors.mojom-shared.h"
@@ -192,6 +193,8 @@
   mojom::IPAddressSpace target_ip_address_space =
       mojom::IPAddressSpace::kUnknown;
   bool has_storage_access = false;
+  network::mojom::AttributionOsSupport attribution_reporting_os_support =
+      network::mojom::AttributionOsSupport::kDisabled;
 };
 
 // This does not accept |kDefault| referrer policy.

services/network/public/cpp/url_request_mojom_traits.cc

diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
index 9b65526..a92b276 100644
--- a/services/network/public/cpp/url_request_mojom_traits.cc
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
@@ -223,6 +223,8 @@
   out->original_destination = data.original_destination();
   out->target_ip_address_space = data.target_ip_address_space();
   out->has_storage_access = data.has_storage_access();
+  out->attribution_reporting_os_support =
+      data.attribution_reporting_os_support();
   return true;
 }
 

services/network/public/cpp/url_request_mojom_traits.h

diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
index e50408e..8844283 100644
--- a/services/network/public/cpp/url_request_mojom_traits.h
+++ b/services/network/public/cpp/url_request_mojom_traits.h
@@ -25,6 +25,7 @@
 #include "services/network/public/cpp/network_isolation_key_mojom_traits.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/resource_request_body.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 #include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
 #include "services/network/public/mojom/client_security_state.mojom-forward.h"
 #include "services/network/public/mojom/cookie_access_observer.mojom-forward.h"
@@ -374,6 +375,11 @@
     return request.has_storage_access;
   }
 
+  static network::mojom::AttributionOsSupport attribution_reporting_os_support(
+      const network::ResourceRequest& request) {
+    return request.attribution_reporting_os_support;
+  }
+
   static bool Read(network::mojom::URLRequestDataView data,
                    network::ResourceRequest* out);
 };

services/network/public/mojom/attribution.mojom

diff --git a/services/network/public/mojom/attribution.mojom b/services/network/public/mojom/attribution.mojom
index 04256cd..59cf280 100644
--- a/services/network/public/mojom/attribution.mojom
+++ b/services/network/public/mojom/attribution.mojom
@@ -13,3 +13,10 @@
   // TODO(https://crbug.com/1240405): replace with `guid` once a type-mapping exists.
   string aggregatable_report_id;
 };
+
+// Indicates whether OS-level attribution is enabled.
+// See https://github.com/WICG/attribution-reporting-api/blob/main/app_to_web.md.
+enum AttributionOsSupport {
+  kDisabled,
+  kEnabled,
+};

services/network/public/mojom/url_request.mojom

diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
index be8d6d8..cd347f0 100644
--- a/services/network/public/mojom/url_request.mojom
+++ b/services/network/public/mojom/url_request.mojom
@@ -8,6 +8,7 @@
 import "mojo/public/mojom/base/file_path.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "mojo/public/mojom/base/unguessable_token.mojom";
+import "services/network/public/mojom/attribution.mojom";
 import "services/network/public/mojom/url_loader_network_service_observer.mojom";
 import "services/network/public/mojom/client_security_state.mojom";
 import "services/network/public/mojom/cors.mojom";
@@ -493,6 +494,9 @@
   // assumption, the browser process has already determined that this access is
   // ok.
   bool has_storage_access;
+
+ // Indicates whether the OS-level attribution is enabled.
+  AttributionOsSupport attribution_reporting_os_support;
 };
 
 // URLRequestBody represents body (i.e. upload data) of a HTTP request.

services/network/url_loader.cc

diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index f2fa6521..78347f4 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -660,6 +660,8 @@
                           has_user_activation_, request_destination_, nullptr,
                           *factory_params_, *origin_access_list_);
 
+  SetAttributionReportingHeaders(*url_request_, request);
+
   if (request.update_first_party_url_on_redirect) {
     url_request_->set_first_party_url_policy(
         net::RedirectInfo::FirstPartyURLPolicy::UPDATE_URL_ON_REDIRECT);

storage/browser/file_system/sandbox_file_stream_writer.cc

diff --git a/storage/browser/file_system/sandbox_file_stream_writer.cc b/storage/browser/file_system/sandbox_file_stream_writer.cc
index 772b243..334e6a9 100644
--- a/storage/browser/file_system/sandbox_file_stream_writer.cc
+++ b/storage/browser/file_system/sandbox_file_stream_writer.cc
@@ -220,7 +220,7 @@
     const scoped_refptr<QuotaManagerProxy>& quota_manager_proxy =
         file_system_context_->quota_manager_proxy();
     if (quota_manager_proxy) {
-      quota_manager_proxy->NotifyWriteFailed(url_.storage_key());
+      quota_manager_proxy->OnClientWriteFailed(url_.storage_key());
     }
     if (CancelIfRequested())
       return;

storage/browser/quota/quota_manager_impl.cc

diff --git a/storage/browser/quota/quota_manager_impl.cc b/storage/browser/quota/quota_manager_impl.cc
index d2924bf..2c4de0c 100644
--- a/storage/browser/quota/quota_manager_impl.cc
+++ b/storage/browser/quota/quota_manager_impl.cc
@@ -1046,6 +1046,8 @@
     return;
   }
 
+  last_opened_bucket_site_ = bucket_params.storage_key;
+
   // The default bucket skips the quota check.
   if (bucket_params.name == kDefaultBucketName) {
     PostTaskAndReplyWithResultForDBThread(
@@ -1354,26 +1356,10 @@
                          weak_factory_.GetWeakPtr(), std::move(callback)));
 }
 
-void QuotaManagerImpl::NotifyWriteFailed(const StorageKey& storage_key) {
+void QuotaManagerImpl::OnClientWriteFailed(const StorageKey& storage_key) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-  auto age_of_disk_stats = base::TimeTicks::Now() -
-                           std::get<0>(cached_disk_stats_for_storage_pressure_);
-
-  // Avoid polling for free disk space if disk stats have been recently
-  // queried.
-  if (age_of_disk_stats < kStoragePressureCheckDiskStatsInterval) {
-    int64_t total_space = std::get<1>(cached_disk_stats_for_storage_pressure_);
-    int64_t available_space =
-        std::get<2>(cached_disk_stats_for_storage_pressure_);
-    MaybeRunStoragePressureCallback(storage_key, total_space, available_space);
-  }
-
-  GetStorageCapacity(
-      base::BindOnce(&QuotaManagerImpl::MaybeRunStoragePressureCallback,
-                     weak_factory_.GetWeakPtr(), storage_key));
+  OnFullDiskError(storage_key);
 }
-
 void QuotaManagerImpl::SetUsageCacheEnabled(QuotaClientType client_id,
                                             const StorageKey& storage_key,
                                             StorageType type,
@@ -1773,9 +1759,9 @@
                                                             : profile_path_);
 
   // Start the storage eviction routine on a full disk error.
-  database_->SetOnFullDiskErrorCallback(
-      base::BindPostTaskToCurrentDefault(base::BindRepeating(
-          &QuotaManagerImpl::StartEviction, weak_factory_.GetWeakPtr())));
+  database_->SetOnFullDiskErrorCallback(base::BindPostTaskToCurrentDefault(
+      base::BindRepeating(&QuotaManagerImpl::OnFullDiskError,
+                          weak_factory_.GetWeakPtr(), absl::nullopt)));
 
   temporary_usage_tracker_ = std::make_unique<UsageTracker>(
       this, client_types_[StorageType::kTemporary], StorageType::kTemporary,
@@ -2049,6 +2035,43 @@
   std::move(barrier_callback).Run(std::move(entry));
 }
 
+void QuotaManagerImpl::OnFullDiskError(absl::optional<StorageKey> storage_key) {
+  if ((base::TimeTicks::Now() - last_full_disk_eviction_time_) >
+      base::Minutes(15)) {
+    last_full_disk_eviction_time_ = base::TimeTicks::Now();
+    StartEviction();
+  }
+
+  // We may already be evicting, either due to the above or just by chance. In
+  // either case, do nothing more for now.
+  if (temporary_storage_evictor_ && temporary_storage_evictor_->in_round()) {
+    return;
+  }
+
+  if (storage_key) {
+    NotifyWriteFailed(*storage_key);
+  } else if (last_opened_bucket_site_) {
+    NotifyWriteFailed(*last_opened_bucket_site_);
+  }
+}
+
+void QuotaManagerImpl::NotifyWriteFailed(const blink::StorageKey& storage_key) {
+  auto [time_of_last_stats, total_space, available_space] =
+      cached_disk_stats_for_storage_pressure_;
+  auto age_of_disk_stats = base::TimeTicks::Now() - time_of_last_stats;
+
+  // Avoid polling for free disk space if disk stats have been recently
+  // queried.
+  if (age_of_disk_stats < kStoragePressureCheckDiskStatsInterval) {
+    MaybeRunStoragePressureCallback(storage_key, total_space, available_space);
+    return;
+  }
+
+  GetStorageCapacity(
+      base::BindOnce(&QuotaManagerImpl::MaybeRunStoragePressureCallback,
+                     weak_factory_.GetWeakPtr(), storage_key));
+}
+
 void QuotaManagerImpl::StartEviction() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
@@ -2239,7 +2262,8 @@
 }
 
 void QuotaManagerImpl::SetStoragePressureCallback(
-    base::RepeatingCallback<void(StorageKey)> storage_pressure_callback) {
+    base::RepeatingCallback<void(const StorageKey&)>
+        storage_pressure_callback) {
   storage_pressure_callback_ = storage_pressure_callback;
   if (storage_key_for_pending_storage_pressure_callback_.has_value()) {
     storage_pressure_callback_.Run(

storage/browser/quota/quota_manager_impl.h

diff --git a/storage/browser/quota/quota_manager_impl.h b/storage/browser/quota/quota_manager_impl.h
index 7cce195a..d58a6e2 100644
--- a/storage/browser/quota/quota_manager_impl.h
+++ b/storage/browser/quota/quota_manager_impl.h
@@ -325,7 +325,7 @@
   // of space, and trigger actions if deemed appropriate.
   //
   // This method is declared as virtual to allow test code to override it.
-  virtual void NotifyWriteFailed(const blink::StorageKey& storage_key);
+  virtual void OnClientWriteFailed(const blink::StorageKey& storage_key);
 
   void SetUsageCacheEnabled(QuotaClientType client_id,
                             const blink::StorageKey& storage_key,
@@ -430,7 +430,7 @@
   // Called when StoragePartition is initialized if embedder has an
   // implementation of StorageNotificationService.
   void SetStoragePressureCallback(
-      base::RepeatingCallback<void(blink::StorageKey)>
+      base::RepeatingCallback<void(const blink::StorageKey&)>
           storage_pressure_callback);
 
   // DevTools Quota Override methods:
@@ -639,6 +639,14 @@
       BucketInfo bucket_info,
       QuotaErrorOr<mojom::BucketTableEntryPtr> result);
 
+  // Called when the quota database or a quota client run into low disk space
+  // errors.
+  void OnFullDiskError(absl::optional<blink::StorageKey> storage_key);
+
+  // Notifies the embedder that space is too low. This ends up showing a
+  // user-facing dialog in Chrome.
+  void NotifyWriteFailed(const blink::StorageKey& storage_key);
+
   // Methods for eviction logic.
   void StartEviction();
   void DeleteBucketFromDatabase(
@@ -775,7 +783,8 @@
 
   GetQuotaSettingsFunc get_settings_function_;
   scoped_refptr<base::TaskRunner> get_settings_task_runner_;
-  base::RepeatingCallback<void(blink::StorageKey)> storage_pressure_callback_;
+  base::RepeatingCallback<void(const blink::StorageKey&)>
+      storage_pressure_callback_;
   base::RepeatingClosure quota_change_callback_;
   QuotaSettings settings_;
   base::TimeTicks settings_timestamp_;
@@ -786,6 +795,14 @@
   CallbackQueue<StorageCapacityCallback, int64_t, int64_t>
       storage_capacity_callbacks_;
 
+  // The storage key for the last time a bucket was opened. This is used as an
+  // imperfect estimate of which site may have encountered the last quota
+  // database full disk error.
+  absl::optional<blink::StorageKey> last_opened_bucket_site_;
+
+  // The last time that an eviction round was started due to a full disk error.
+  base::TimeTicks last_full_disk_eviction_time_;
+
   GetBucketCallback lru_bucket_callback_;
 
   // Buckets that have been notified of access during LRU task to exclude from

storage/browser/quota/quota_manager_proxy.cc

diff --git a/storage/browser/quota/quota_manager_proxy.cc b/storage/browser/quota/quota_manager_proxy.cc
index 44cd454..54a2525 100644
--- a/storage/browser/quota/quota_manager_proxy.cc
+++ b/storage/browser/quota/quota_manager_proxy.cc
@@ -447,17 +447,17 @@
       client_id, bucket, delta, modification_time, std::move(manager_callback));
 }
 
-void QuotaManagerProxy::NotifyWriteFailed(const StorageKey& storage_key) {
+void QuotaManagerProxy::OnClientWriteFailed(const StorageKey& storage_key) {
   if (!quota_manager_impl_task_runner_->RunsTasksInCurrentSequence()) {
     quota_manager_impl_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&QuotaManagerProxy::NotifyWriteFailed, this,
+        FROM_HERE, base::BindOnce(&QuotaManagerProxy::OnClientWriteFailed, this,
                                   storage_key));
     return;
   }
 
   DCHECK_CALLED_ON_VALID_SEQUENCE(quota_manager_impl_sequence_checker_);
   if (quota_manager_impl_) {
-    quota_manager_impl_->NotifyWriteFailed(storage_key);
+    quota_manager_impl_->OnClientWriteFailed(storage_key);
   }
 }
 

storage/browser/quota/quota_manager_proxy.h

diff --git a/storage/browser/quota/quota_manager_proxy.h b/storage/browser/quota/quota_manager_proxy.h
index 32c984c2..ca4fcc2 100644
--- a/storage/browser/quota/quota_manager_proxy.h
+++ b/storage/browser/quota/quota_manager_proxy.h
@@ -202,7 +202,7 @@
       scoped_refptr<base::SequencedTaskRunner> callback_task_runner,
       base::OnceClosure callback);
 
-  virtual void NotifyWriteFailed(const blink::StorageKey& storage_key);
+  virtual void OnClientWriteFailed(const blink::StorageKey& storage_key);
 
   virtual void SetUsageCacheEnabled(QuotaClientType client_id,
                                     const blink::StorageKey& storage_key,

storage/browser/quota/quota_manager_unittest.cc

diff --git a/storage/browser/quota/quota_manager_unittest.cc b/storage/browser/quota/quota_manager_unittest.cc
index 210529a..82d95b0e 100644
--- a/storage/browser/quota/quota_manager_unittest.cc
+++ b/storage/browser/quota/quota_manager_unittest.cc
@@ -496,8 +496,8 @@
   }
 
   void SetStoragePressureCallback(
-      base::RepeatingCallback<void(StorageKey)> callback) {
-    quota_manager_impl_->SetStoragePressureCallback(std::move(callback));
+      base::RepeatingCallback<void(const StorageKey&)> callback) {
+    quota_manager_impl_->SetStoragePressureCallback(callback);
   }
 
   void MaybeRunStoragePressureCallback(const StorageKey& storage_key,
@@ -3343,10 +3343,12 @@
 TEST_F(QuotaManagerImplTest, MaybeRunStoragePressureCallback) {
   bool callback_ran = false;
   auto cb = base::BindRepeating(
-      [](bool* callback_ran, StorageKey storage_key) { *callback_ran = true; },
+      [](bool* callback_ran, const StorageKey& storage_key) {
+        *callback_ran = true;
+      },
       &callback_ran);
 
-  SetStoragePressureCallback(std::move(cb));
+  SetStoragePressureCallback(cb);
 
   int64_t kGBytes = QuotaManagerImpl::kMBytes * 1024;
   MaybeRunStoragePressureCallback(StorageKey(), 100 * kGBytes, 2 * kGBytes);
@@ -3578,9 +3580,9 @@
   bool callback_ran = false;
 
   auto cb = base::BindLambdaForTesting(
-      [&callback_ran](StorageKey storage_key) { callback_ran = true; });
+      [&callback_ran](const StorageKey& storage_key) { callback_ran = true; });
 
-  SetStoragePressureCallback(std::move(cb));
+  SetStoragePressureCallback(cb);
 
   ResetQuotaManagerImpl(/*is_incognito=*/true);
 

storage/browser/quota/quota_temporary_storage_evictor.cc

diff --git a/storage/browser/quota/quota_temporary_storage_evictor.cc b/storage/browser/quota/quota_temporary_storage_evictor.cc
index f0b31221..d50936bc 100644
--- a/storage/browser/quota/quota_temporary_storage_evictor.cc
+++ b/storage/browser/quota/quota_temporary_storage_evictor.cc
@@ -126,7 +126,7 @@
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   // Don't start while we're in a round.
-  if (round_statistics_.in_round) {
+  if (in_round()) {
     return;
   }
 
@@ -159,7 +159,7 @@
 void QuotaTemporaryStorageEvictor::ConsiderEviction() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   // Only look for expired buckets once per round.
-  if (round_statistics_.in_round) {
+  if (in_round()) {
     OnEvictedExpiredBuckets(blink::mojom::QuotaStatusCode::kOk);
     return;
   }

storage/browser/quota/quota_temporary_storage_evictor.h

diff --git a/storage/browser/quota/quota_temporary_storage_evictor.h b/storage/browser/quota/quota_temporary_storage_evictor.h
index 8319506..fc192cf 100644
--- a/storage/browser/quota/quota_temporary_storage_evictor.h
+++ b/storage/browser/quota/quota_temporary_storage_evictor.h
@@ -70,6 +70,8 @@
   void ReportPerHourHistogram();
   void Start();
 
+  bool in_round() const { return round_statistics_.in_round; }
+
  private:
   friend class QuotaTemporaryStorageEvictorTest;
 

storage/browser/test/mock_quota_manager.cc

diff --git a/storage/browser/test/mock_quota_manager.cc b/storage/browser/test/mock_quota_manager.cc
index 24b4a58..a404867 100644
--- a/storage/browser/test/mock_quota_manager.cc
+++ b/storage/browser/test/mock_quota_manager.cc
@@ -311,7 +311,7 @@
   }
 }
 
-void MockQuotaManager::NotifyWriteFailed(const StorageKey& storage_key) {
+void MockQuotaManager::OnClientWriteFailed(const StorageKey& storage_key) {
   auto storage_key_error_log =
       write_error_tracker_.insert(std::pair<StorageKey, int>(storage_key, 0))
           .first;

storage/browser/test/mock_quota_manager.h

diff --git a/storage/browser/test/mock_quota_manager.h b/storage/browser/test/mock_quota_manager.h
index 73a87aabf..d534ae8 100644
--- a/storage/browser/test/mock_quota_manager.h
+++ b/storage/browser/test/mock_quota_manager.h
@@ -127,7 +127,7 @@
 
   // Overrides QuotaManager's implementation so that tests can observe
   // calls to this function.
-  void NotifyWriteFailed(const blink::StorageKey& storage_key) override;
+  void OnClientWriteFailed(const blink::StorageKey& storage_key) override;
 
   void CreateBucketForTesting(
       const blink::StorageKey& storage_key,

testing/buildbot/autoshard_exceptions.json

diff --git a/testing/buildbot/autoshard_exceptions.json b/testing/buildbot/autoshard_exceptions.json
new file mode 100644
index 0000000..92db11b
--- /dev/null
+++ b/testing/buildbot/autoshard_exceptions.json
@@ -0,0 +1,101 @@
+{
+    "chromium.android": {
+        "android-12-x64-rel": {
+            "webview_instrumentation_test_apk": {
+                "shards": "11"
+            }
+        }
+    },
+    "chromium.chromiumos": {
+        "linux-chromeos-rel": {
+            "browser_tests": {
+                "shards": "64"
+            }
+        },
+        "linux-lacros-tester-rel": {
+            "interactive_ui_tests": {
+                "shards": "4"
+            },
+            "interactive_ui_tests Lacros version skew testing ash beta": {
+                "shards": "4"
+            },
+            "interactive_ui_tests Lacros version skew testing ash canary": {
+                "shards": "4"
+            },
+            "interactive_ui_tests Lacros version skew testing ash dev": {
+                "shards": "4"
+            },
+            "interactive_ui_tests Lacros version skew testing ash stable": {
+                "shards": "4"
+            },
+            "lacros_chrome_browsertests_run_in_series": {
+                "shards": "3"
+            },
+            "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash beta": {
+                "shards": "3"
+            },
+            "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash canary": {
+                "shards": "3"
+            },
+            "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash dev": {
+                "shards": "3"
+            },
+            "lacros_chrome_browsertests_run_in_series Lacros version skew testing ash stable": {
+                "shards": "3"
+            }
+        }
+    },
+    "chromium.fuchsia": {
+        "fuchsia-x64-cast-receiver-rel": {
+            "content_unittests": {
+                "shards": "2"
+            }
+        }
+    },
+    "chromium.linux": {
+        "Linux Tests": {
+            "blink_wpt_tests": {
+                "shards": "11"
+            },
+            "browser_tests": {
+                "shards": "24"
+            },
+            "interactive_ui_tests": {
+                "shards": "5"
+            }
+        },
+        "Linux Tests (Wayland)": {
+            "browser_tests": {
+                "shards": "21"
+            },
+            "interactive_ui_tests": {
+                "shards": "4"
+            }
+        }
+    },
+    "chromium.memory": {
+        "Linux ASan LSan Tests (1)": {
+            "content_browsertests": {
+                "shards": "26"
+            },
+            "interactive_ui_tests": {
+                "shards": "15"
+            }
+        },
+        "Linux TSan Tests": {
+            "content_browsertests": {
+                "shards": "32"
+            }
+        }
+    },
+    "chromium.win": {
+        "Win10 Tests x64": {
+            "updater_tests": {
+                "shards": "2"
+            },
+            "updater_tests_system": {
+                "shards": "2"
+            }
+        }
+    }
+}
\ No newline at end of file

testing/buildbot/chromium.android.json

diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index ecf6363f2..89f8c6cb 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -10498,7 +10498,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 10
+          "shards": 11
         },
         "test": "webview_instrumentation_test_apk",
         "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"

testing/buildbot/chromium.chromiumos.json

diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index e9100e36..1a3652c 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -3490,7 +3490,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 60
+          "shards": 64
         },
         "test": "browser_tests",
         "test_id_prefix": "ninja://chrome/test:browser_tests/"
@@ -5545,7 +5545,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
+          "shards": 4
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
@@ -5553,10 +5553,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.beta.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5567,8 +5566,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -5577,7 +5576,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
+          "shards": 4
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/",
@@ -5586,9 +5585,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5599,8 +5598,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -5609,7 +5608,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
+          "shards": 4
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/",
@@ -5642,7 +5641,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
+          "shards": 4
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/",
@@ -5675,7 +5674,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
+          "shards": 4
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/",
@@ -5722,10 +5721,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5736,8 +5734,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -5754,9 +5752,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5767,8 +5765,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -5863,7 +5861,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
+          "shards": 3
         },
         "test": "lacros_chrome_browsertests_run_in_series",
         "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/"
@@ -5871,10 +5869,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5885,8 +5882,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -5895,7 +5892,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
+          "shards": 3
         },
         "test": "lacros_chrome_browsertests_run_in_series",
         "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
@@ -5904,9 +5901,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -5917,8 +5914,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -5927,7 +5924,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
+          "shards": 3
         },
         "test": "lacros_chrome_browsertests_run_in_series",
         "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
@@ -5960,7 +5957,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
+          "shards": 3
         },
         "test": "lacros_chrome_browsertests_run_in_series",
         "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",
@@ -5993,7 +5990,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 2
+          "shards": 3
         },
         "test": "lacros_chrome_browsertests_run_in_series",
         "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests_run_in_series/",

testing/buildbot/chromium.coverage.json

diff --git a/testing/buildbot/chromium.coverage.json b/testing/buildbot/chromium.coverage.json
index aad0b61d..dcc9c770 100644
--- a/testing/buildbot/chromium.coverage.json
+++ b/testing/buildbot/chromium.coverage.json
@@ -25179,10 +25179,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.beta.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -25193,8 +25192,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -25212,9 +25211,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -25225,8 +25224,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -25348,10 +25347,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -25362,8 +25360,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -25380,9 +25378,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -25393,8 +25391,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -25497,10 +25495,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -25511,8 +25508,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -25530,9 +25527,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -25543,8 +25540,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [

testing/buildbot/chromium.fuchsia.json

diff --git a/testing/buildbot/chromium.fuchsia.json b/testing/buildbot/chromium.fuchsia.json
index 964c447..c0df1841 100644
--- a/testing/buildbot/chromium.fuchsia.json
+++ b/testing/buildbot/chromium.fuchsia.json
@@ -2599,7 +2599,8 @@
               "os": "Ubuntu-18.04"
             }
           ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
         },
         "test": "content_unittests",
         "test_id_prefix": "ninja://content/test:content_unittests/"

testing/buildbot/chromium.fyi.json

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 8829e51..80d2e94d 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -33915,10 +33915,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.beta.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -33928,8 +33927,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -33948,9 +33947,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -33960,8 +33959,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -34084,10 +34083,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -34097,8 +34095,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -34116,9 +34114,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -34128,8 +34126,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -34233,10 +34231,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -34246,8 +34243,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -34266,9 +34263,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -34278,8 +34275,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -35676,10 +35673,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.beta.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -35689,8 +35685,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -35709,9 +35705,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -35721,8 +35717,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -35845,10 +35841,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -35858,8 +35853,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -35877,9 +35872,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -35889,8 +35884,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -35994,10 +35989,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -36007,8 +36001,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -36027,9 +36021,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -36039,8 +36033,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -36727,10 +36721,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -36740,8 +36733,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -36759,9 +36752,9 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome"
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
@@ -36771,8 +36764,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [

testing/buildbot/chromium.linux.json

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index ff1ab31..a47622d 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -2036,7 +2036,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 20
+          "shards": 24
         },
         "test": "browser_tests",
         "test_id_prefix": "ninja://chrome/test:browser_tests/"
@@ -2568,7 +2568,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
+          "shards": 5
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
@@ -3354,7 +3354,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 10
+          "shards": 11
         },
         "test_id_prefix": "ninja://:blink_wpt_tests/"
       },
@@ -4162,12 +4162,12 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "os": "Ubuntu-18.04"
+              "os": "Ubuntu-22.04"
             }
           ],
           "quickrun_shards": 24,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 20
+          "shards": 21
         },
         "test": "browser_tests",
         "test_id_prefix": "ninja://chrome/test:browser_tests/"
@@ -4801,7 +4801,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 3
+          "shards": 4
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"

testing/buildbot/chromium.memory.json

diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 5787d40..81ce880 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -462,7 +462,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 24
+          "shards": 26
         },
         "test": "content_browsertests",
         "test_id_prefix": "ninja://content/test:content_browsertests/"
@@ -889,7 +889,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 12
+          "shards": 15
         },
         "test": "interactive_ui_tests",
         "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
@@ -8788,7 +8788,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 30
+          "shards": 32
         },
         "test": "content_browsertests",
         "test_id_prefix": "ninja://content/test:content_browsertests/"
@@ -17688,13 +17688,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.beta.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -17705,8 +17704,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -17724,12 +17723,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter;../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -17740,8 +17739,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -17877,13 +17876,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -17894,8 +17892,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -17912,12 +17910,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -17928,8 +17926,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [
@@ -18041,13 +18039,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome",
-          "--test-launcher-print-timestamps",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 113.0.5672.21",
+        "description": "Run with ash-chrome version 113.0.5672.46",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -18058,8 +18055,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v113.0.5672.21",
-              "revision": "version:113.0.5672.21"
+              "location": "lacros_version_skew_tests_v113.0.5672.46",
+              "revision": "version:113.0.5672.46"
             }
           ],
           "dimension_sets": [
@@ -18077,12 +18074,12 @@
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter",
-          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome",
+          "--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome",
           "--test-launcher-print-test-stdio=always",
           "--combine-ash-logs-on-bots",
           "--asan-symbolize-output"
         ],
-        "description": "Run with ash-chrome version 114.0.5719.0",
+        "description": "Run with ash-chrome version 114.0.5720.0",
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -18093,8 +18090,8 @@
           "cipd_packages": [
             {
               "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip",
-              "location": "lacros_version_skew_tests_v114.0.5719.0",
-              "revision": "version:114.0.5719.0"
+              "location": "lacros_version_skew_tests_v114.0.5720.0",
+              "revision": "version:114.0.5720.0"
             }
           ],
           "dimension_sets": [

testing/buildbot/chromium.win.json

diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index e8ea79e..787e97c 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -1735,7 +1735,8 @@
               "os": "Windows-10-19045"
             }
           ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
         },
         "test": "updater_tests",
         "test_id_prefix": "ninja://chrome/updater:updater_tests/"
@@ -1753,7 +1754,8 @@
               "os": "Windows-10-19045"
             }
           ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
         },
         "test": "updater_tests_system",
         "test_id_prefix": "ninja://chrome/updater:updater_tests_system/"

testing/buildbot/test_suite_exceptions.pyl

diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 0f07e494..4831a45f 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -1047,12 +1047,6 @@
           '--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter',
         ],
         'swarming': {
-          'dimension_sets': [
-            {
-              # TODO(crbug.com/1412588): Move to Jammy.
-              'os': 'Ubuntu-18.04',
-            },
-          ],
           'shards': 20,
           'quickrun_shards': 24,
         },

testing/buildbot/variants.pyl

diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl
index 92b45ac0..fffe62a 100644
--- a/testing/buildbot/variants.pyl
+++ b/testing/buildbot/variants.pyl
@@ -22,16 +22,16 @@
   },
   'LACROS_VERSION_SKEW_CANARY': {
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5719.0/test_ash_chrome',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v114.0.5720.0/test_ash_chrome',
     ],
-    'description': 'Run with ash-chrome version 114.0.5719.0',
+    'description': 'Run with ash-chrome version 114.0.5720.0',
     'identifier': 'Lacros version skew testing ash canary',
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v114.0.5719.0',
-          'revision': 'version:114.0.5719.0',
+          'location': 'lacros_version_skew_tests_v114.0.5720.0',
+          'revision': 'version:114.0.5720.0',
         },
       ],
     },
@@ -56,18 +56,16 @@
   },
   'LACROS_VERSION_SKEW_BETA': {
     'args': [
-      '--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.21/test_ash_chrome',
-      # TODO(crbug.com/1430562): Remove this print timestamps.
-      '--test-launcher-print-timestamps',
+      '--ash-chrome-path-override=../../lacros_version_skew_tests_v113.0.5672.46/test_ash_chrome',
     ],
-    'description': 'Run with ash-chrome version 113.0.5672.21',
+    'description': 'Run with ash-chrome version 113.0.5672.46',
     'identifier': 'Lacros version skew testing ash beta',
     'swarming': {
       'cipd_packages': [
         {
           'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip',
-          'location': 'lacros_version_skew_tests_v113.0.5672.21',
-          'revision': 'version:113.0.5672.21',
+          'location': 'lacros_version_skew_tests_v113.0.5672.46',
+          'revision': 'version:113.0.5672.46',
         },
       ],
     },

testing/variations/fieldtrial_testing_config.json

diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
index 794e8b4..4b55e33 100644
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -65,7 +65,7 @@
             ]
         }
     ],
-    "AlignWakeUps": [
+    "AlignWakeUpsWithAntiStarvation": [
         {
             "platforms": [
                 "android",
@@ -75,22 +75,19 @@
                 "fuchsia",
                 "ios",
                 "linux",
-                "mac",
-                "windows"
+                "mac"
             ],
             "experiments": [
                 {
-                    "name": "Enabled16ms_20221212",
+                    "name": "Enabled16msAntiStarvation_20230405",
                     "params": {
+                        "count": "1",
                         "leeway": "16ms"
                     },
                     "enable_features": [
                         "AddTaskLeeway",
                         "AlignWakeUps",
-                        "ExplicitHighResolutionTimerWin"
-                    ],
-                    "disable_features": [
-                        "UseLessHighResTimers"
+                        "MaxDelayedStarvationTasks"
                     ]
                 }
             ]
@@ -2912,6 +2909,22 @@
             ]
         }
     ],
+    "ChurnPrivateComputingCheckIn": [
+        {
+            "platforms": [
+                "chromeos"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "DeviceActiveClientChurnCohortCheckIn",
+                        "DeviceActiveClientChurnObservationCheckIn"
+                    ]
+                }
+            ]
+        }
+    ],
     "ClientSideDetectionModelOptimizationGuide": [
         {
             "platforms": [
@@ -5008,6 +5021,26 @@
             ]
         }
     ],
+    "ExplicitHighResolutionTimerWin": [
+        {
+            "platforms": [
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled_20230405",
+                    "params": {
+                        "leeway": "16ms"
+                    },
+                    "enable_features": [
+                        "AddTaskLeeway",
+                        "ExplicitHighResolutionTimerWin",
+                        "UseLessHighResTimers"
+                    ]
+                }
+            ]
+        }
+    ],
     "ExploreSitesDense": [
         {
             "platforms": [
@@ -6475,6 +6508,21 @@
             ]
         }
     ],
+    "IOSDefaultBrowserRefactoringPromoManager": [
+        {
+            "platforms": [
+                "ios"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "DefaultBrowserRefactoringPromoManager"
+                    ]
+                }
+            ]
+        }
+    ],
     "IOSEmailExperience": [
         {
             "platforms": [
@@ -10654,29 +10702,6 @@
             ]
         }
     ],
-    "QuickIntensiveWakeUpThrottlingAfterLoading": [
-        {
-            "platforms": [
-                "windows",
-                "chromeos",
-                "chromeos_lacros",
-                "fuchsia",
-                "mac",
-                "linux"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "params": {
-                        "grace_period_seconds_loaded": "60"
-                    },
-                    "enable_features": [
-                        "QuickIntensiveWakeUpThrottlingAfterLoading"
-                    ]
-                }
-            ]
-        }
-    ],
     "RawDrawAndDrDc": [
         {
             "platforms": [

third_party/abseil-cpp/absl/base/options.h

diff --git a/third_party/abseil-cpp/absl/base/options.h b/third_party/abseil-cpp/absl/base/options.h
index 9a15f2af..50431087 100644
--- a/third_party/abseil-cpp/absl/base/options.h
+++ b/third_party/abseil-cpp/absl/base/options.h
@@ -148,7 +148,7 @@
 // absl::string_view is a typedef of std::string_view, use the feature macro
 // ABSL_USES_STD_STRING_VIEW.
 
-#define ABSL_OPTION_USE_STD_STRING_VIEW 0
+#define ABSL_OPTION_USE_STD_STRING_VIEW 2
 
 // ABSL_OPTION_USE_STD_VARIANT
 //

third_party/abseil-cpp/patches/0001-Turn-on-hardened-mode.patch

diff --git a/third_party/abseil-cpp/patches/0001-Turn-on-hardened-mode.patch b/third_party/abseil-cpp/patches/0001-Turn-on-hardened-mode.patch
index 6881a086..4ce90d3 100644
--- a/third_party/abseil-cpp/patches/0001-Turn-on-hardened-mode.patch
+++ b/third_party/abseil-cpp/patches/0001-Turn-on-hardened-mode.patch
@@ -3,9 +3,12 @@
 Date: Wed, 6 Oct 2021 03:23:23 -0700
 Subject: [PATCH] Turn on hardened mode and alias absl types to STL types..
 
-The absl implementations contain various hardening checks that are
-sometimes simply UB as defined by the standard, and thus, as
-implemented by STL.
+The absl implementations contain various hardening checks where the
+standard is UB. At the time, libc++ lacked corresponding hardening
+checks, so we forced the use of absl types. As of
+https://crbug.com/1335422, this is no longer true. Switching so the STL
+versions of optional and variant is tracked by https://crbug.com/1373619 and
+https://crbug.com/1373620, respectively.
 ---
  third_party/abseil-cpp/absl/base/options.h | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
@@ -32,15 +35,6 @@
  
  
  // ABSL_OPTION_USE_STD_STRING_VIEW
-@@ -154,7 +154,7 @@
- // absl::string_view is a typedef of std::string_view, use the feature macro
- // ABSL_USES_STD_STRING_VIEW.
- 
--#define ABSL_OPTION_USE_STD_STRING_VIEW 2
-+#define ABSL_OPTION_USE_STD_STRING_VIEW 0
- 
- // ABSL_OPTION_USE_STD_VARIANT
- //
 @@ -180,7 +180,7 @@
  // absl::variant is a typedef of std::variant, use the feature macro
  // ABSL_USES_STD_VARIANT.

third_party/abseil-cpp/symbols_arm64_dbg.def

diff --git a/third_party/abseil-cpp/symbols_arm64_dbg.def b/third_party/abseil-cpp/symbols_arm64_dbg.def
index 0582220..6e3d4b0d 100644
--- a/third_party/abseil-cpp/symbols_arm64_dbg.def
+++ b/third_party/abseil-cpp/symbols_arm64_dbg.def
@@ -40,7 +40,6 @@
     ??$?0$$TX@?$__compressed_pair_elem@PEAVFormatArgImpl@str_format_internal@absl@@$0A@$0A@@Cr@std@@QEAA@$$QEA$$T@Z
     ??$?0$$V@?$__temp_value@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@AEAV?$allocator@UTransition@cctz@time_internal@absl@@@12@@Z
     ??$?0$$V@?$__temp_value@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@AEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@@Z
-    ??$?0$$Y_And@Cr@std@@$0A@@?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@QEAA@AEBVstring_view@absl@@AEBH@Z
     ??$?0$00X@?$__compressed_pair@U?$__hash_node_base@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@23@@Cr@std@@QEAA@XZ
     ??$?0$00X@?$unique_ptr@$$BY0A@PEAU?$__hash_node_base@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@V?$__bucket_list_deallocator@V?$allocator@PEAU?$__hash_node_base@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@Cr@std@@@23@@Cr@std@@QEAA@XZ
     ??$?0$00X@?$unique_ptr@$$CBVImpl@time_zone@cctz@time_internal@absl@@U?$default_delete@$$CBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@PEBVImpl@time_zone@cctz@time_internal@absl@@@Z
@@ -57,7 +56,6 @@
     ??$?0$00X@?$unique_ptr@VTimeZoneInfo@cctz@time_internal@absl@@U?$default_delete@VTimeZoneInfo@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@PEAVTimeZoneInfo@cctz@time_internal@absl@@@Z
     ??$?0$00X@?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@$$T@Z
     ??$?0$00X@?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@PEAVZoneInfoSource@cctz@time_internal@absl@@@Z
-    ??$?0$0A@$00$$ZAEBVstring_view@absl@@AEBH$$Z$S$$Z$$V$$ZAEBV01@AEBH@?$__tuple_impl@U?$__tuple_indices@$0A@$00@Cr@std@@AEBVstring_view@absl@@AEBH@Cr@std@@QEAA@U?$__tuple_indices@$0A@$00@12@U?$__tuple_types@AEBVstring_view@absl@@AEBH@12@U?$__tuple_indices@$S@12@U?$__tuple_types@$$V@12@AEBVstring_view@absl@@AEBH@Z
     ??$?0AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAPEAPEAPEBV01234@$0A@@?$pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV12345@@Cr@std@@QEAA@AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@0@Z
     ??$?0AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV01234@$0A@@?$pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV12345@@Cr@std@@QEAA@AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@$$QEAPEAPEAPEBV34567@@Z
     ??$?0AEAPEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@AEAPEAPEAU0123@$0A@@?$pair@PEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@PEAPEAU1234@@Cr@std@@QEAA@AEAPEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@0@Z
@@ -117,7 +115,6 @@
     ??$?0AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$$Z$$V@?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@QEAA@Upiecewise_construct_t@12@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@V?$tuple@$$V@12@@Z
     ??$?0AEBVCord@absl@@$0A@@?$optional@VCord@absl@@@absl@@QEAA@AEBVCord@1@@Z
     ??$?0AEBVCord@absl@@@?$optional_data_dtor_base@VCord@absl@@$0A@@optional_internal@absl@@IEAA@Uin_place_t@2@AEBVCord@2@@Z
-    ??$?0AEBVstring_view@absl@@X@?$__tuple_leaf@$0A@AEBVstring_view@absl@@$0A@@Cr@std@@QEAA@AEBVstring_view@absl@@@Z
     ??$?0D@FormatArgImpl@str_format_internal@absl@@QEAA@AEBD@Z
     ??$?0H@FormatArgImpl@str_format_internal@absl@@QEAA@AEBH@Z
     ??$?0HU__default_init_tag@Cr@std@@@?$__compressed_pair@_KV?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QEAA@$$QEAH$$QEAU__default_init_tag@12@@Z
@@ -210,7 +207,6 @@
     ??$?0V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@AEA_N$0A@@?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@_N@Cr@std@@QEAA@$$QEAV?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@12@AEA_N@Z
     ??$?0V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@Cr@std@@X@?$__compressed_pair_elem@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@Cr@std@@$00$0A@@Cr@std@@QEAA@$$QEAV?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@12@@Z
     ??$?0V?$allocator@D@Cr@std@@@AlphaNum@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ??$?0V?$allocator@D@Cr@std@@@string_view@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$allocator@H@Cr@std@@@?$Storage@V?$allocator@H@Cr@std@@$0A@$00@internal_compressed_tuple@container_internal@absl@@QEAA@Uin_place_t@3@$$QEAV?$allocator@H@Cr@std@@@Z
     ??$?0V?$allocator@H@Cr@std@@I$00@?$CompressedTuple@V?$allocator@H@Cr@std@@_K@container_internal@absl@@QEAA@$$QEAV?$allocator@H@Cr@std@@$$QEAI@Z
     ??$?0V?$allocator@H@Cr@std@@I@?$CompressedTupleImpl@V?$CompressedTuple@V?$allocator@H@Cr@std@@_K@container_internal@absl@@U?$integer_sequence@_K$0A@$00@3@$00@internal_compressed_tuple@container_internal@absl@@QEAA@Uin_place_t@3@$$QEAV?$allocator@H@Cr@std@@$$QEAI@Z
@@ -226,6 +222,8 @@
     ??$?0V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QEAA@PEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAA@$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QEAA@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ??$?0V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@QEAA@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$?0V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XV012@$0A@@?$Span@$$CBD@absl@@QEAA@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$?0V?$reverse_iterator@PEAPEAVCordzHandle@cord_internal@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PEAPEAVCordzHandle@cord_internal@absl@@@Cr@std@@V123@@Cr@std@@QEAA@$$QEAV?$reverse_iterator@PEAPEAVCordzHandle@cord_internal@absl@@@12@0@Z
     ??$?0V?$reverse_iterator@PEAPEAVLogSink@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PEAPEAVLogSink@absl@@@Cr@std@@V123@@Cr@std@@QEAA@$$QEAV?$reverse_iterator@PEAPEAVLogSink@absl@@@12@0@Z
     ??$?0V?$reverse_iterator@PEAPEBVCordzHandle@cord_internal@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PEAPEBVCordzHandle@cord_internal@absl@@@Cr@std@@V123@@Cr@std@@QEAA@$$QEAV?$reverse_iterator@PEAPEBVCordzHandle@cord_internal@absl@@@12@0@Z
@@ -238,8 +236,6 @@
     ??$?0VFILERawSink@str_format_internal@absl@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QEAA@PEAVFILERawSink@12@@Z
     ??$?0VFallbackCrcMemcpyEngine@crc_internal@absl@@@?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@QEAA@AEBU?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@12@PEAX@Z
     ??$?0VFallbackCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@XX@?$unique_ptr@VCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAA@$$QEAV?$unique_ptr@VFallbackCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@12@@Z
-    ??$?0Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@QEAA@AEBVstring_view@2@@Z
-    ??$?0Vstring_view@absl@@XV01@$0A@@?$Span@$$CBD@absl@@QEAA@AEBVstring_view@1@@Z
     ??$?0_J@FormatArgImpl@str_format_internal@absl@@QEAA@AEB_J@Z
     ??$?0_K$0A@@?$optional@_K@absl@@QEAA@$$QEA_K@Z
     ??$?0_K@?$optional_data_dtor_base@_K$00@optional_internal@absl@@IEAA@Uin_place_t@2@$$QEA_K@Z
@@ -280,7 +276,6 @@
     ??$?9PEAUViableSubstitution@strings_internal@absl@@PEAU012@@Cr@std@@YA_NAEBV?$reverse_iterator@PEAUViableSubstitution@strings_internal@absl@@@01@0@Z
     ??$?9PEBQEAVLogSink@absl@@PEAPEAV01@@Cr@std@@YA_NAEBV?$__wrap_iter@PEBQEAVLogSink@absl@@@01@AEBV?$__wrap_iter@PEAPEAVLogSink@absl@@@01@@Z
     ??$?9PEBUConversionItem@ParsedFormatBase@str_format_internal@absl@@@Cr@std@@YA_NAEBV?$__wrap_iter@PEBUConversionItem@ParsedFormatBase@str_format_internal@absl@@@01@0@Z
-    ??$?BV?$allocator@D@Cr@std@@@string_view@absl@@QEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ??$?DH@absl@@YA?AVDuration@0@HV10@@Z
     ??$?DH@absl@@YA?AVDuration@0@V10@H@Z
     ??$?DN@absl@@YA?AVDuration@0@NV10@@Z
@@ -342,8 +337,8 @@
     ??$?RW4LogSeverity@absl@@AEBQEBDHV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$AtomicHook@P6AXW4LogSeverity@absl@@PEBDHAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z@base_internal@absl@@QEBAX$$QEAW4LogSeverity@2@AEBQEBD$$QEAH$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?VVLogMessage@log_internal@absl@@@Voidify@log_internal@absl@@QEHBAXAEBVLogMessage@12@@Z
     ??$?XH$0A@@Duration@absl@@QEAAAEAV01@H@Z
-    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@Vstring_view@1@@Z
-    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@AEBVstring_view@3@AEBH@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$AbslHashValue@VMixingHashState@hash_internal@absl@@AEB_K@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEB_K@Cr@std@@@Z
     ??$AbslStringify@VStringifySink@strings_internal@absl@@@absl@@YAXAEAVStringifySink@strings_internal@0@UHex@0@@Z
     ??$Add@$00@CordRepBtree@cord_internal@absl@@AEAAXPEAUCordRep@12@@Z
@@ -352,10 +347,10 @@
     ??$Add@$0A@@CordRepBtree@cord_internal@absl@@AEAAXV?$Span@QEAUCordRep@cord_internal@absl@@@2@@Z
     ??$AddCordRep@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
     ??$AddCordRep@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$AddEdge@$00@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$AddEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
@@ -378,8 +373,8 @@
     ??$ArgumentToConv@PEBD@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@UVoidPtr@str_format_internal@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
+    ??$ArgumentToConv@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@Vint128@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
-    ??$ArgumentToConv@Vstring_view@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@Vuint128@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@_J@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@_K@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
@@ -429,8 +424,8 @@
     ??$Dispatch@PEBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
+    ??$Dispatch@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
-    ??$Dispatch@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
@@ -451,7 +446,7 @@
     ??$ExtractCharSet@$0IAAAE@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0IAAAE@@01@@Z
     ??$ExtractCharSet@$0JPOAA@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0JPOAA@@01@@Z
     ??$ExtractCharSet@$0JPPPL@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0JPPPL@@01@@Z
-    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AVstring_view@1@AEAVStringifySink@01@AEBUHex@1@@Z
+    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAVStringifySink@01@AEBUHex@1@@Z
     ??$FastIntToBuffer@C@numbers_internal@absl@@YAPEADCPEAD@Z
     ??$FastIntToBuffer@D@numbers_internal@absl@@YAPEADDPEAD@Z
     ??$FastIntToBuffer@E@numbers_internal@absl@@YAPEADEPEAD@Z
@@ -463,11 +458,11 @@
     ??$Fill@$0A@@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
     ??$FindBinary@$00@CordRepRing@cord_internal@absl@@AEBAIII_K@Z
     ??$FindBinary@$0A@@CordRepRing@cord_internal@absl@@AEBAIII_K@Z
-    ??$FindSubstitutions@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@Vstring_view@1@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
+    ??$FindSubstitutions@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV234@II@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$Fill@$00@012@AEAAXPEBV012@II@Z@@Z
@@ -480,15 +475,15 @@
     ??$FromInt64@$0DLJKMKAA@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0DLJKMKAA@@Cr@std@@@Z
     ??$FromInt64@$0DOI@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0DOI@@Cr@std@@@Z
     ??$FromInt64@$0PECEA@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0PECEA@@Cr@std@@@Z
+    ??$GenericCompare@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@HVCord@absl@@@absl@@YAHAEBVCord@0@0_K@Z
-    ??$GenericCompare@HVstring_view@absl@@@absl@@YAHAEBVCord@0@AEBVstring_view@0@_K@Z
+    ??$GenericCompare@_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YA_NAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@_NVCord@absl@@@absl@@YA_NAEBVCord@0@0_K@Z
-    ??$GenericCompare@_NVstring_view@absl@@@absl@@YA_NAEBVCord@0@AEBVstring_view@0@_K@Z
     ??$GetData@$$CBV?$Span@D@absl@@@span_internal@absl@@YAPEADAEBV?$Span@D@1@@Z
     ??$GetData@$$CBV?$Span@I@absl@@@span_internal@absl@@YAPEAIAEBV?$Span@I@1@@Z
     ??$GetData@$$CBV?$Span@VFormatArgImpl@str_format_internal@absl@@@absl@@@span_internal@absl@@YAPEAVFormatArgImpl@str_format_internal@1@AEBV?$Span@VFormatArgImpl@str_format_internal@absl@@@1@@Z
+    ??$GetData@$$CBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBDAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$GetData@$$CBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBVFormatArgImpl@str_format_internal@1@AEBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@Z
-    ??$GetData@$$CBVstring_view@absl@@@span_internal@absl@@YAPEBDAEBVstring_view@1@@Z
     ??$GetData@U?$array@D$0DKJI@@Cr@std@@@span_internal@absl@@YAPEADAEAU?$array@D$0DKJI@@Cr@std@@@Z
     ??$GetData@V?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@absl@@@span_internal@absl@@YAPEAPEAVLogSink@1@AEAV?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@1@@Z
     ??$GetData@V?$Span@D@absl@@@span_internal@absl@@YAPEADAEAV?$Span@D@1@@Z
@@ -497,14 +492,14 @@
     ??$GetDataImpl@$$CBV?$Span@D@absl@@@span_internal@absl@@YAPEADAEBV?$Span@D@1@D@Z
     ??$GetDataImpl@$$CBV?$Span@I@absl@@@span_internal@absl@@YAPEAIAEBV?$Span@I@1@D@Z
     ??$GetDataImpl@$$CBV?$Span@VFormatArgImpl@str_format_internal@absl@@@absl@@@span_internal@absl@@YAPEAVFormatArgImpl@str_format_internal@1@AEBV?$Span@VFormatArgImpl@str_format_internal@absl@@@1@D@Z
+    ??$GetDataImpl@$$CBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBDAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ??$GetDataImpl@$$CBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBVFormatArgImpl@str_format_internal@1@AEBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@D@Z
-    ??$GetDataImpl@$$CBVstring_view@absl@@@span_internal@absl@@YAPEBDAEBVstring_view@1@D@Z
     ??$GetDataImpl@U?$array@D$0DKJI@@Cr@std@@@span_internal@absl@@YAPEADAEAU?$array@D$0DKJI@@Cr@std@@D@Z
     ??$GetDataImpl@V?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@absl@@@span_internal@absl@@YAPEAPEAVLogSink@1@AEAV?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@1@D@Z
     ??$GetDataImpl@V?$Span@D@absl@@@span_internal@absl@@YAPEADAEAV?$Span@D@1@D@Z
     ??$GetDataImpl@V?$Span@I@absl@@@span_internal@absl@@YAPEAIAEAV?$Span@I@1@D@Z
     ??$GetDataImpl@V?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEAPEAVLogSink@1@AEAV?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@D@Z
-    ??$HashOf@$S$$ZVstring_view@absl@@H@absl@@YA_KAEBVstring_view@0@AEBH@Z
+    ??$HashOf@$S$$ZV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@absl@@YA_KAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Z
     ??$HashOf@$S$$Z_K@absl@@YA_KAEB_K@Z
     ??$HidePtr@$$CBX@base_internal@absl@@YA_KPEBX@Z
     ??$HidePtr@U?$atomic@_J@Cr@std@@@base_internal@absl@@YA_KPEAU?$atomic@_J@Cr@std@@@Z
@@ -515,20 +510,20 @@
     ??$Init@H@FormatArgImpl@str_format_internal@absl@@AEAAXAEBH@Z
     ??$Init@I@FormatArgImpl@str_format_internal@absl@@AEAAXAEBI@Z
     ??$Init@PEBD@FormatArgImpl@str_format_internal@absl@@AEAAXAEBQEBD@Z
-    ??$Init@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@AEAAXAEBVstring_view@2@@Z
+    ??$Init@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@AEAAXAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$Init@_J@FormatArgImpl@str_format_internal@absl@@AEAAXAEB_J@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@H@UniquelyRepresentedProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBH@Z
-    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@AEB_K@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$tuple@AEB_K@Cr@std@@@Z
-    ??$Invoke@VMixingHashState@hash_internal@absl@@Vstring_view@3@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBVstring_view@3@@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@_K@UniquelyRepresentedProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEB_K@Z
-    ??$InvokeFlush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@Vstring_view@1@@Z
-    ??$InvokeFlush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ??$InvokeFlush@VBufferRawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVBufferRawSink@01@Vstring_view@1@@Z
-    ??$InvokeFlush@VFILERawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVFILERawSink@01@Vstring_view@1@@Z
+    ??$InvokeFlush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ??$InvokeFlush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ??$InvokeFlush@VBufferRawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVBufferRawSink@01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$InvokeFlush@VFILERawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVFILERawSink@01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$LowLevelCallOnce@A6AXXZ$$V@base_internal@absl@@YAXPEAVonce_flag@1@A6AXXZ@Z
     ??$MakeCheckOpString@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV234@0PEBD@Z
-    ??$MakeCheckOpString@AEBVstring_view@absl@@AEBV12@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVstring_view@1@0PEBD@Z
+    ??$MakeCheckOpString@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@0PEBD@Z
     ??$MakeCheckOpString@DD@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@DDPEBD@Z
     ??$MakeCheckOpString@EE@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@EEPEBD@Z
     ??$MakeCheckOpString@MM@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@MMPEBD@Z
@@ -546,7 +541,7 @@
     ??$MakeCheckOpValueString@PEBD@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBQEBD@Z
     ??$MakeCheckOpValueString@PEBE@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBQEBE@Z
     ??$MakeCheckOpValueString@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
-    ??$MakeCheckOpValueString@Vstring_view@absl@@@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVstring_view@1@@Z
+    ??$MakeCheckOpValueString@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ??$MakeCheckOpValueString@_J@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEB_J@Z
     ??$MakeCheckOpValueString@_K@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEB_K@Z
     ??$MakeCheckOpValueString@_N@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEB_N@Z
@@ -578,8 +573,8 @@
     ??$Nanoseconds@_J$0A@@absl@@YA?AVDuration@0@_J@Z
     ??$NewImpl@$0BAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
     ??$NewImpl@$0EAAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
-    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
-    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
+    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@$00$01@absl@@U45@@internal_layout@container_internal@absl@@QEBA_KXZ
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@$00@absl@@U?$integer_sequence@_K$0A@$00$01@5@@internal_layout@container_internal@absl@@QEBA_KXZ
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@@absl@@U?$integer_sequence@_K$0A@$00@5@@internal_layout@container_internal@absl@@QEBA_KXZ
@@ -591,7 +586,7 @@
     ??$Offset@$0A@$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$S@absl@@U?$integer_sequence@_K$0A@@5@@internal_layout@container_internal@absl@@QEBA_KXZ
     ??$ParseFloat@$09@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
     ??$ParseFloat@$0BA@@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
-    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NVstring_view@1@UParsedFormatConsumer@ParsedFormatBase@01@@Z
+    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@UParsedFormatConsumer@ParsedFormatBase@01@@Z
     ??$Partial@$$V@?$Layout@_KPEAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$S@absl@@U?$integer_sequence@_K$0A@@5@@internal_layout@12@XZ
     ??$Partial@AEAI@?$Layout@_KPEAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@@absl@@U?$integer_sequence@_K$0A@$00@5@@internal_layout@12@AEAI@Z
     ??$Partial@AEAIAEAI@?$Layout@_KPEAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@$00@absl@@U?$integer_sequence@_K$0A@$00$01@5@@internal_layout@12@AEAI0@Z
@@ -620,8 +615,8 @@
     ??$Seconds@_J$0A@@absl@@YA?AVDuration@0@_J@Z
     ??$SetEdge@$00@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
+    ??$SharedCompareImpl@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$SharedCompareImpl@VCord@absl@@@absl@@YAHAEBVCord@0@0@Z
-    ??$SharedCompareImpl@Vstring_view@absl@@@absl@@YAHAEBVCord@0@AEBVstring_view@0@@Z
     ??$SmallMemmove@$00@cord_internal@absl@@YAXPEADPEBD_K@Z
     ??$SmallMemmove@$0A@@cord_internal@absl@@YAXPEADPEBD_K@Z
     ??$StoreCallback@P6A_NPEAUSynchEvent@absl@@@Z@Condition@absl@@AEAAXP6A_NPEAUSynchEvent@1@@Z@Z
@@ -629,9 +624,9 @@
     ??$StoreCallback@P6A_NPEBU?$atomic@_N@Cr@std@@@Z@Condition@absl@@AEAAXP6A_NPEBU?$atomic@_N@Cr@std@@@Z@Z
     ??$StrAppend@$$V@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@0@1111@Z
     ??$StrCat@$$BY01D@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@0@0000AEAY01$$CBD@Z
-    ??$StrFormat@DHHHHH_JIVstring_view@absl@@HPEBDV12@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBVstring_view@0@2AEBQEBD5@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@0@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@3@@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
+    ??$StrFormat@DHHHHH_JIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HPEBDV123@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@2AEBQEBD5@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@3@@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
     ??$ToChronoDuration@V?$duration@JV?$ratio@$0DM@$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0DM@$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$ToChronoDuration@V?$duration@JV?$ratio@$0OBA@$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0OBA@$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$ToChronoDuration@V?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
@@ -653,9 +648,9 @@
     ??$ToInt@PEBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
+    ??$ToInt@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@VFormatArgImpl@str_format_internal@absl@@@FormatArgImplFriend@str_format_internal@absl@@SA_NVFormatArgImpl@12@PEAH@Z
     ??$ToInt@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
-    ??$ToInt@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$00@Cr@std@@U?$integral_constant@_N$0A@@56@@Z
     ??$ToInt@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$00@Cr@std@@U?$integral_constant@_N$0A@@56@@Z
@@ -695,7 +690,7 @@
     ??$__construct_node_hash@AEBUpiecewise_construct_t@Cr@std@@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AEAA?AV?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@@12@_KAEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QEAV?$tuple@$$V@12@@Z
     ??$__construct_one_at_end@$$V@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ??$__construct_one_at_end@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
-    ??$__construct_one_at_end@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__construct_one_at_end@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__construct_one_at_end@AEBQEAVCordzHandle@cord_internal@absl@@@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVCordzHandle@cord_internal@absl@@@Z
     ??$__construct_one_at_end@AEBQEAVLogSink@absl@@@?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVLogSink@absl@@@Z
     ??$__construct_one_at_end@AEBQEBVCordzHandle@cord_internal@absl@@@?$vector@PEBVCordzHandle@cord_internal@absl@@V?$allocator@PEBVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEBVCordzHandle@cord_internal@absl@@@Z
@@ -797,7 +792,7 @@
     ??$__distance@V?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YA_JV?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@01@0Urandom_access_iterator_tag@01@@Z
     ??$__distance@V?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YA_JV?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@01@0Urandom_access_iterator_tag@01@@Z
     ??$__do_rehash@$00@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AEAAX_K@Z
-    ??$__emplace_back_slow_path@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__emplace_back_slow_path@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__emplace_unique_key_args@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBUpiecewise_construct_t@23@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AU?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@_N@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@AEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QEAV?$tuple@$$V@12@@Z
     ??$__invoke@AEAUByCivilTime@Transition@cctz@time_internal@absl@@AEBU2345@AEBU2345@@Cr@std@@YA_NAEAUByCivilTime@Transition@cctz@time_internal@absl@@AEBU3456@1@Z
     ??$__invoke@AEAUByUnixTime@Transition@cctz@time_internal@absl@@AEBU2345@AEBU2345@@Cr@std@@YA_NAEAUByUnixTime@Transition@cctz@time_internal@absl@@AEBU3456@1@Z
@@ -960,9 +955,9 @@
     ??$assign@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$optional_data_base@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@optional_internal@absl@@IEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$call_once@A6AXXZ$$V@absl@@YAXAEAVonce_flag@0@A6AXXZ@Z
     ??$combine@H$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBH@Z
-    ??$combine@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$combine@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Z
+    ??$combine@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$combine@V?$tuple@AEB_K@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$tuple@AEB_K@Cr@std@@@Z
-    ??$combine@Vstring_view@absl@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBVstring_view@2@AEBH@Z
     ??$combine@_K$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEB_K@Z
     ??$combine_contiguous@D@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@PEBD_K@Z
     ??$construct@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEBQEAPEBV12345@XX@?$allocator_traits@V?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@12@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEBQEAPEBV45678@@Z
@@ -988,7 +983,7 @@
     ??$construct@UTransition@cctz@time_internal@absl@@U1234@XX@?$allocator_traits@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UTransition@cctz@time_internal@absl@@@12@PEAUTransition@cctz@time_internal@absl@@$$QEAU4567@@Z
     ??$construct@UTransitionType@cctz@time_internal@absl@@$$VXX@?$allocator_traits@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@PEAUTransitionType@cctz@time_internal@absl@@@Z
     ??$construct@UTransitionType@cctz@time_internal@absl@@U1234@XX@?$allocator_traits@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@PEAUTransitionType@cctz@time_internal@absl@@$$QEAU4567@@Z
-    ??$construct@UViableSubstitution@strings_internal@absl@@AEAVstring_view@3@AEBV43@AEA_KXX@?$allocator_traits@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UViableSubstitution@strings_internal@absl@@@12@PEAUViableSubstitution@strings_internal@absl@@AEAVstring_view@6@AEBV76@AEA_K@Z
+    ??$construct@UViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV456@AEA_KXX@?$allocator_traits@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UViableSubstitution@strings_internal@absl@@@12@PEAUViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV712@AEA_K@Z
     ??$construct@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$optional_data_base@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@optional_internal@absl@@IEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$construct_at@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEBQEAPEBV12345@PEAPEAPEBV12345@@Cr@std@@YAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV23456@AEBQEAPEBV23456@@Z
     ??$construct_at@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEBV12345@PEAPEAPEBV12345@@Cr@std@@YAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV23456@$$QEAPEAPEBV23456@@Z
@@ -1013,7 +1008,7 @@
     ??$construct_at@UTransition@cctz@time_internal@absl@@U1234@PEAU1234@@Cr@std@@YAPEAUTransition@cctz@time_internal@absl@@PEAU2345@$$QEAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@$$VPEAU1234@@Cr@std@@YAPEAUTransitionType@cctz@time_internal@absl@@PEAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@U1234@PEAU1234@@Cr@std@@YAPEAUTransitionType@cctz@time_internal@absl@@PEAU2345@$$QEAU2345@@Z
-    ??$construct_at@UViableSubstitution@strings_internal@absl@@AEAVstring_view@3@AEBV43@AEA_KPEAU123@@Cr@std@@YAPEAUViableSubstitution@strings_internal@absl@@PEAU234@AEAVstring_view@4@AEBV54@AEA_K@Z
+    ??$construct_at@UViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV456@AEA_KPEAU123@@Cr@std@@YAPEAUViableSubstitution@strings_internal@absl@@PEAU234@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@01@AEBV501@AEA_K@Z
     ??$copy@PEBVFormatArgImpl@str_format_internal@absl@@PEAV123@@Cr@std@@YAPEAVFormatArgImpl@str_format_internal@absl@@PEBV234@0PEAV234@@Z
     ??$copy@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@Cr@std@@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@23@@Cr@std@@YA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@01@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@01@0V201@@Z
     ??$countl_zero@_K@absl@@YAH_K@Z
@@ -1059,7 +1054,7 @@
     ??$emplace@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAUTransitionType@cctz@time_internal@absl@@@12@V?$__wrap_iter@PEBUTransitionType@cctz@time_internal@absl@@@12@@Z
     ??$emplace_back@$$V@?$__split_buffer@UTransition@cctz@time_internal@absl@@AEAV?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXXZ
     ??$emplace_back@$$V@?$__split_buffer@UTransitionType@cctz@time_internal@absl@@AEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXXZ
-    ??$emplace_back@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@AEAVstring_view@5@AEBV65@AEA_K@Z
+    ??$emplace_back@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV612@AEA_K@Z
     ??$emplace_back@AEBQEAUCordRep@cord_internal@absl@@@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAAEAPEAUCordRep@cord_internal@1@AEBQEAU231@@Z
     ??$emplace_back@AEBQEAVLogSink@absl@@@?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@absl@@QEAAAEAPEAVLogSink@1@AEBQEAV21@@Z
     ??$emplace_back@HVcrc32c_t@absl@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUPrefixCrc@CrcCordState@crc_internal@absl@@$$QEAH$$QEAVcrc32c_t@6@@Z
@@ -1095,8 +1090,6 @@
     ??$get@$00@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGAAAEA_KXZ
     ??$get@$00@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGBAAEB_KXZ
     ??$get@$00@?$CompressedTuple@_KVHashtablezInfoHandle@container_internal@absl@@@container_internal@absl@@QEGAAAEAVHashtablezInfoHandle@12@XZ
-    ??$get@$00AEBVstring_view@absl@@AEBH@Cr@std@@YAAEBHAEBV?$tuple@AEBVstring_view@absl@@AEBH@01@@Z
-    ??$get@$00Vstring_view@absl@@V12@@Cr@std@@YAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@01@@Z
     ??$get@$0A@@?$CompressedTuple@V?$allocator@H@Cr@std@@_K@container_internal@absl@@QEGAAAEAV?$allocator@H@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@PEAPEAUCordRep@cord_internal@absl@@@container_internal@absl@@QEGAAAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGAAAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@XZ
@@ -1106,16 +1099,12 @@
     ??$get@$0A@@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGAAAEAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGBAAEBV?$allocator@UPayload@status_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@_KVHashtablezInfoHandle@container_internal@absl@@@container_internal@absl@@QEGAAAEA_KXZ
-    ??$get@$0A@AEBVstring_view@absl@@AEBH@Cr@std@@YAAEBVstring_view@absl@@AEBV?$tuple@AEBVstring_view@absl@@AEBH@01@@Z
-    ??$get@$0A@Vstring_view@absl@@V12@@Cr@std@@YAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@01@@Z
-    ??$get@Vstring_view@absl@@V12@@?$__get_pair@$00@Cr@std@@SAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@12@@Z
-    ??$get@Vstring_view@absl@@V12@@?$__get_pair@$0A@@Cr@std@@SAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@12@@Z
-    ??$hash@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SA_KAEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$hash@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SA_KAEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$hash@V?$tuple@AEB_K@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SA_KAEBV?$tuple@AEB_K@Cr@std@@@Z
     ??$hash_bytes@VMixingHashState@hash_internal@absl@@H@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBH@Z
     ??$hash_bytes@VMixingHashState@hash_internal@absl@@_K@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEB_K@Z
     ??$hash_range_or_bytes@VMixingHashState@hash_internal@absl@@D@hash_internal@absl@@YA?AVMixingHashState@01@V201@PEBD_K@Z
-    ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@$0A@$00@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@U?$integer_sequence@_K$0A@$00@1@@Z
+    ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@$0A@$00@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@U?$integer_sequence@_K$0A@$00@1@@Z
     ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@AEB_K@Cr@std@@$0A@@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEB_K@Cr@std@@U?$integer_sequence@_K$0A@@1@@Z
     ??$launder@$$CBU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAPEBU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@01@PEBU201@@Z
     ??$launder@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAPEAU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@01@PEAU201@@Z
@@ -1205,17 +1194,15 @@
     ??$swap@PEAUViableSubstitution@strings_internal@absl@@@Cr@std@@YAXAEAPEAUViableSubstitution@strings_internal@absl@@0@Z
     ??$swap@PEBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@YAXAEAPEBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@0@Z
     ??$swap@UViableSubstitution@strings_internal@absl@@@Cr@std@@YAXAEAUViableSubstitution@strings_internal@absl@@0@Z
-    ??$swap@Vstring_view@absl@@@Cr@std@@YAXAEAVstring_view@absl@@0@Z
-    ??$tie@$$CBVstring_view@absl@@$$CBH@Cr@std@@YA?AV?$tuple@AEBVstring_view@absl@@AEBH@01@AEBVstring_view@absl@@AEBH@Z
     ??$upper_bound@PEBUTransition@cctz@time_internal@absl@@U1234@UByCivilTime@1234@@Cr@std@@YAPEBUTransition@cctz@time_internal@absl@@PEBU2345@0AEBU2345@UByCivilTime@2345@@Z
     ??$upper_bound@PEBUTransition@cctz@time_internal@absl@@U1234@UByUnixTime@1234@@Cr@std@@YAPEBUTransition@cctz@time_internal@absl@@PEBU2345@0AEBU2345@UByUnixTime@2345@@Z
     ??0?$AllocationTransaction@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAA@AEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@Z
     ??0?$AllocationTransaction@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAA@AEAV?$allocator@PEAVLogSink@absl@@@Cr@std@@@Z
     ??0?$AllocationTransaction@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAA@AEAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@@Z
-    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@_K@Z
-    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@_K@Z
     ??0?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@absl@@QEAA@PEBD@Z
@@ -1444,7 +1431,7 @@
     ??0?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@QEAA@XZ
     ??0AlphaNum@absl@@QEAA@H@Z
     ??0AlphaNum@absl@@QEAA@PEBD@Z
-    ??0AlphaNum@absl@@QEAA@Vstring_view@1@@Z
+    ??0AlphaNum@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0AlphaNum@absl@@QEAA@_J@Z
     ??0AlphaNum@absl@@QEAA@_K@Z
     ??0Arena@LowLevelAlloc@base_internal@absl@@QEAA@I@Z
@@ -1458,9 +1445,9 @@
     ??0BoundConversion@str_format_internal@absl@@QEAA@XZ
     ??0Breakdown@Time@absl@@QEAA@XZ
     ??0BufferRawSink@str_format_internal@absl@@QEAA@PEAD_K@Z
-    ??0ByAnyChar@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByAnyChar@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0ByLength@absl@@QEAA@_J@Z
-    ??0ByString@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByString@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0CRC32@crc_internal@absl@@QEAA@XZ
     ??0CRC@crc_internal@absl@@IEAA@XZ
     ??0CRCImpl@crc_internal@absl@@QEAA@XZ
@@ -1472,7 +1459,7 @@
     ??0CivilInfo@TimeZone@absl@@QEAA@XZ
     ??0Condition@absl@@QEAA@P6A_NPEAX@Z0@Z
     ??0Condition@absl@@QEAA@PEB_N@Z
-    ??0Cord@absl@@AEAA@Vstring_view@1@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
+    ??0Cord@absl@@AEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
     ??0Cord@absl@@QEAA@$$QEAV01@@Z
     ??0Cord@absl@@QEAA@AEBV01@@Z
     ??0Cord@absl@@QEAA@XZ
@@ -1527,9 +1514,9 @@
     ??0LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@2@@Z
     ??0LogMessageData@LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@3@VTime@3@@Z
     ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogSink@absl@@QEAA@XZ
     ??0Long@Rep@CordBuffer@absl@@QEAA@PEAUCordRepFlat@cord_internal@3@@Z
     ??0MixingHashState@hash_internal@absl@@AEAA@XZ
@@ -1539,7 +1526,7 @@
     ??0NodeCounts@CordzStatistics@cord_internal@absl@@QEAA@XZ
     ??0OstreamView@LogMessage@log_internal@absl@@QEAA@AEAULogMessageData@123@@Z
     ??0ParsedFloat@strings_internal@absl@@QEAA@XZ
-    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@Vstring_view@2@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@std@@@Z
+    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@5@@Z
     ??0ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA@PEAV123@@Z
     ??0Payload@status_internal@absl@@QEAA@$$QEAU012@@Z
     ??0Payload@status_internal@absl@@QEAA@AEBU012@@Z
@@ -1567,8 +1554,8 @@
     ??0SpinLockHolder@base_internal@absl@@QEAA@PEAVSpinLock@12@@Z
     ??0Status@absl@@QEAA@$$QEAV01@@Z
     ??0Status@absl@@QEAA@AEBV01@@Z
-    ??0Status@absl@@QEAA@W4StatusCode@1@Vstring_view@1@@Z
-    ??0StatusRep@status_internal@absl@@QEAA@W4StatusCode@2@Vstring_view@2@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@@Z
+    ??0Status@absl@@QEAA@W4StatusCode@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0StatusRep@status_internal@absl@@QEAA@W4StatusCode@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@56@@Z
     ??0StdcppWaiter@synchronization_internal@absl@@QEAA@XZ
     ??0Streamable@str_format_internal@absl@@QEAA@AEBVUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ??0StringifySink@strings_internal@absl@@QEAA@XZ
@@ -1585,9 +1572,9 @@
     ??0Transition@cctz@time_internal@absl@@QEAA@XZ
     ??0TransitionType@cctz@time_internal@absl@@QEAA@XZ
     ??0UnboundConversion@str_format_internal@absl@@QEAA@XZ
-    ??0UntypedFormatSpec@absl@@QEAA@Vstring_view@1@@Z
-    ??0UntypedFormatSpecImpl@str_format_internal@absl@@QEAA@Vstring_view@2@@Z
-    ??0ViableSubstitution@strings_internal@absl@@QEAA@Vstring_view@2@0_K@Z
+    ??0UntypedFormatSpec@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0UntypedFormatSpecImpl@str_format_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0ViableSubstitution@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0_K@Z
     ??0Win32Waiter@synchronization_internal@absl@@QEAA@XZ
     ??0WriterMutexLock@absl@@QEAA@PEAVMutex@1@@Z
     ??0ZoneInfoSource@cctz@time_internal@absl@@QEAA@XZ
@@ -1623,10 +1610,6 @@
     ??0int128@absl@@QEAA@N@Z
     ??0int128@absl@@QEAA@O@Z
     ??0once_flag@absl@@QEAA@XZ
-    ??0string_view@absl@@AEAA@PEBD_KUSkipCheckLengthTag@01@@Z
-    ??0string_view@absl@@QEAA@PEBD@Z
-    ??0string_view@absl@@QEAA@PEBD_K@Z
-    ??0string_view@absl@@QEAA@XZ
     ??0time_zone@cctz@time_internal@absl@@AEAA@PEBVImpl@0123@@Z
     ??0time_zone@cctz@time_internal@absl@@QEAA@XZ
     ??0uint128@absl@@AEAA@_K0@Z
@@ -1764,7 +1747,7 @@
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@$$QEAV01@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@AEBV01@@Z
     ??4Cord@absl@@QEAAAEAV01@$$QEAV01@@Z
-    ??4Cord@absl@@QEAAAEAV01@Vstring_view@1@@Z
+    ??4Cord@absl@@QEAAAEAV01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??4CordzUpdateTracker@cord_internal@absl@@QEAAAEAV012@AEBV012@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@$$QEAV012@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@AEBV012@@Z
@@ -1783,13 +1766,12 @@
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@H@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV345@@Z@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAVios_base@Cr@std@@AEAV345@@Z@Z
-    ??6LogMessage@log_internal@absl@@QEAAAEAV012@Vstring_view@2@@Z
+    ??6LogMessage@log_internal@absl@@QEAAAEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??6absl@@YA?AVuint128@0@V10@H@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVCord@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVStatus@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vcrc32c_t@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vint128@0@@Z
-    ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vstring_view@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vuint128@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverity@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverityAtLeast@0@@Z
@@ -1823,7 +1805,6 @@
     ??8absl@@YA_NVDuration@0@0@Z
     ??8absl@@YA_NVTime@0@0@Z
     ??8absl@@YA_NVint128@0@0@Z
-    ??8absl@@YA_NVstring_view@0@0@Z
     ??8absl@@YA_NVuint128@0@0@Z
     ??8cord_internal@absl@@YA_NAEBVInlineData@01@0@Z
     ??9ChunkIterator@Cord@absl@@QEBA_NAEBV012@@Z
@@ -1837,7 +1818,6 @@
     ??9GraphId@synchronization_internal@absl@@QEBA_NAEBU012@@Z
     ??9absl@@YA_NAEBVCord@0@0@Z
     ??9absl@@YA_NVint128@0@0@Z
-    ??9absl@@YA_NVstring_view@0@0@Z
     ??9absl@@YA_NVuint128@0@0@Z
     ??A?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAAEAUPayload@status_internal@1@_K@Z
     ??A?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEBAAEBUPayload@status_internal@1@_K@Z
@@ -1854,7 +1834,6 @@
     ??A?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAAEBUTransitionType@cctz@time_internal@absl@@_K@Z
     ??A?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@_K@Z
     ??ACord@absl@@QEBAD_K@Z
-    ??Astring_view@absl@@QEBAAEBD_K@Z
     ??B?$NonIterableBitMask@_K$07$02@container_internal@absl@@QEBA_NXZ
     ??B?$__atomic_base@PEAVCordzHandle@cord_internal@absl@@$0A@@Cr@std@@QEBAPEAVCordzHandle@cord_internal@absl@@XZ
     ??B?$optional@_K@absl@@QEBA_NXZ
@@ -1883,7 +1862,7 @@
     ??C?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QEBAPEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@XZ
     ??C?$unique_ptr@VTimeZoneIf@cctz@time_internal@absl@@U?$default_delete@VTimeZoneIf@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAPEAVTimeZoneIf@cctz@time_internal@absl@@XZ
     ??C?$unique_ptr@VTimeZoneInfo@cctz@time_internal@absl@@U?$default_delete@VTimeZoneInfo@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAPEAVTimeZoneInfo@cctz@time_internal@absl@@XZ
-    ??CChunkIterator@Cord@absl@@QEBAPEBVstring_view@2@XZ
+    ??CChunkIterator@Cord@absl@@QEBAPEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ??D?$__deque_iterator@PEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEBV12345@AEAPEBV12345@PEAPEAPEBV12345@_J$0A@@Cr@std@@QEBAAEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ??D?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@Cr@std@@QEBAAEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ??D?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@Cr@std@@QEBAAEBUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
@@ -1910,7 +1889,7 @@
     ??D?$reverse_iterator@PEAUViableSubstitution@strings_internal@absl@@@Cr@std@@QEBAAEAUViableSubstitution@strings_internal@absl@@XZ
     ??D?$unique_ptr@ULogMessageData@LogMessage@log_internal@absl@@U?$default_delete@ULogMessageData@LogMessage@log_internal@absl@@@Cr@std@@@Cr@std@@QEBAAEAULogMessageData@LogMessage@log_internal@absl@@XZ
     ??D?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QEBAAEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@XZ
-    ??DChunkIterator@Cord@absl@@QEBA?AVstring_view@2@XZ
+    ??DChunkIterator@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ??D__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AU__deque_block_range@123@XZ
     ??Dabsl@@YA?AVint128@0@V10@0@Z
     ??Dabsl@@YA?AVuint128@0@V10@0@Z
@@ -1991,15 +1970,13 @@
     ??R<lambda_1>@?0???A?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@absl@@QEBAAEBVFormatArgImpl@str_format_internal@2@_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???A?$Span@D@absl@@QEBAAEAD_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???A?$Span@I@absl@@QEBAAEAI_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0???Astring_view@absl@@QEBAAEBD_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0???CChunkIterator@Cord@absl@@QEBAPEBVstring_view@3@XZ@QEBA?A?<auto>@@XZ
+    ??R<lambda_1>@?0???CChunkIterator@Cord@absl@@QEBAPEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???D?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@QEGAAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0???DChunkIterator@Cord@absl@@QEBA?AVstring_view@3@XZ@QEBA?A?<auto>@@XZ
+    ??R<lambda_1>@?0???DChunkIterator@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???EChunkIterator@Cord@absl@@QEAAAEAV123@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??Append@FormatSinkImpl@str_format_internal@absl@@QEAAX_KD@Z@QEBA?A?<auto>@@0@Z
-    ??R<lambda_1>@?0??CheckLengthInternal@string_view@absl@@CA_K_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHAEBV23@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAVstring_view@3@@Z
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHVstring_view@3@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAV43@@Z
+    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHAEBV23@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAV456@@Z
     ??R<lambda_1>@?0??InitFrom@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXAEBV234@@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??SetLength@CordBuffer@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??SubtractSize@?$Storage@H$0CP@V?$allocator@H@Cr@std@@@inlined_vector_internal@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
@@ -2010,17 +1987,14 @@
     ??R<lambda_1>@?0??back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAAEAPEAUCordRep@cord_internal@3@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$0CP@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAAEAPEAUCordRep@cord_internal@3@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??front@string_view@absl@@QEBAAEBDXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??inline_size@Rep@InlineData@cord_internal@absl@@QEBA_KXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@H$0CP@V?$allocator@H@Cr@std@@@absl@@QEAAXXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAXXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$0CP@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAXXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_prefix@?$Span@$$CBD@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_prefix@?$Span@D@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??remove_prefix@string_view@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_suffix@?$Span@$$CBD@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_suffix@?$Span@D@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??remove_suffix@string_view@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??set_inline_data@InlineData@cord_internal@absl@@QEAAXPEBD_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??set_inline_size@Rep@InlineData@cord_internal@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_2>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@0_K1@Z@QEBA?A?<auto>@@I@Z
@@ -2028,9 +2002,9 @@
     ??R<lambda_2>@?0??erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@@Z@QEBA?A?<auto>@@XZ
     ??R?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@absl@@QEBAXPEAUCordRep@cord_internal@1@_K1@Z
     ??R?$FunctionRef@$$A6AXV?$Span@I@absl@@@Z@absl@@QEBAXV?$Span@I@1@@Z
-    ??R?$FunctionRef@$$A6AXVstring_view@absl@@@Z@absl@@QEBAXVstring_view@1@@Z
-    ??R?$FunctionRef@$$A6AXVstring_view@absl@@AEBVCord@2@@Z@absl@@QEBAXVstring_view@1@AEBVCord@1@@Z
-    ??R?$HashImpl@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@hash_internal@absl@@QEBA_KAEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??R?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@absl@@QEBAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??R?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@absl@@@Z@absl@@QEBAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@1@@Z
+    ??R?$HashImpl@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@hash_internal@absl@@QEBA_KAEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??R?$HashImpl@V?$tuple@AEB_K@Cr@std@@@hash_internal@absl@@QEBA_KAEBV?$tuple@AEB_K@Cr@std@@@Z
     ??R?$RandenPool@E@random_internal@absl@@QEAAEXZ
     ??R?$RandenPool@G@random_internal@absl@@QEAAGXZ
@@ -2089,20 +2063,20 @@
     ??_4uint128@absl@@QEAAAEAV01@V01@@Z
     ??_5uint128@absl@@QEAAAEAV01@V01@@Z
     ??_6uint128@absl@@QEAAAEAV01@V01@@Z
-    ?AbortedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AbortedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?AbsDuration@absl@@YA?AVDuration@1@V21@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVBufferRawSink@12@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVFILERawSink@12@Vstring_view@2@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVBufferRawSink@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVFILERawSink@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?AbslUnparseFlag@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@@Z
@@ -2144,34 +2118,34 @@
     ?AllocatedSize@CordRepFlat@cord_internal@absl@@QEBA_KXZ
     ?AllocatedSizeToTag@cord_internal@absl@@YAE_K@Z
     ?AllocatedSizeToTagUnchecked@cord_internal@absl@@YAE_K@Z
-    ?AlreadyExistsError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AlreadyExistsError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@?$AppendUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
     ?Append@Cord@absl@@QEAAX$$QEAV12@@Z
     ?Append@Cord@absl@@QEAAXAEBV12@@Z
-    ?Append@Cord@absl@@QEAAXVstring_view@2@@Z
+    ?Append@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAX_KD@Z
-    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NVstring_view@4@@Z
-    ?Append@StringifySink@strings_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Append@StringifySink@strings_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@StringifySink@strings_internal@absl@@QEAAX_KD@Z
-    ?AppendArray@InlineRep@Cord@absl@@QEAAXVstring_view@3@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
+    ?AppendArray@InlineRep@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
     ?AppendLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
     ?AppendPack@str_format_internal@absl@@YAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAV345@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
-    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
-    ?AppendPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
+    ?AppendPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?AppendSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?AppendText@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_KVstring_view@4@@Z
+    ?AppendText@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_KV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?AppendTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToInlined@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTruncated@log_internal@absl@@YA_KD_KAEAV?$Span@D@2@@Z
-    ?AppendTruncated@log_internal@absl@@YA_KVstring_view@2@AEAV?$Span@D@2@@Z
-    ?ApplySubstitutions@strings_internal@absl@@YAHVstring_view@2@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@56@@Z
+    ?AppendTruncated@log_internal@absl@@YA_KV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV?$Span@D@2@@Z
+    ?ApplySubstitutions@strings_internal@absl@@YAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@45@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AsciiStrToLower@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AsciiStrToUpper@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AssertHeld@CordzInfo@cord_internal@absl@@QEAAXXZ
@@ -2186,16 +2160,16 @@
     ?AsyncSignalSafeWriteToStderr@raw_log_internal@absl@@YAXPEBD_K@Z
     ?At@TimeZone@absl@@QEBA?AUCivilInfo@12@VTime@2@@Z
     ?At@TimeZone@absl@@QEBA?AUTimeInfo@12@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@@Z
-    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@Vstring_view@3@H@Z
+    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?Avail@FormatSinkImpl@str_format_internal@absl@@AEBA_KXZ
     ?Await@Mutex@absl@@QEAAXAEBVCondition@2@@Z
     ?AwaitCommon@Mutex@absl@@AEAA_NAEBVCondition@2@VKernelTimeout@synchronization_internal@2@@Z
     ?AwaitWithDeadline@Mutex@absl@@QEAA_NAEBVCondition@2@VTime@2@@Z
     ?AwaitWithTimeout@Mutex@absl@@QEAA_NAEBVCondition@2@VDuration@2@@Z
-    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Base64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Base64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?Base64EscapeInternal@strings_internal@absl@@YA_KPEBE_KPEAD1PEBD_N@Z
-    ?Base64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?BindWithPack@str_format_internal@absl@@YA_NPEBUUnboundConversion@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@PEAVBoundConversion@12@@Z
     ?BitCastToSigned@int128_internal@absl@@YA_J_K@Z
     ?Block@Barrier@absl@@QEAA_NXZ
@@ -2205,22 +2179,21 @@
     ?BreakTime@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?BufferSizeFor@log_internal@absl@@YA_KXZ
     ?Build@Header@TimeZoneInfo@cctz@time_internal@absl@@QEAA_NAEBUtzhead@@@Z
-    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?CPUSupportsRandenHwAes@random_internal@absl@@YA_NXZ
-    ?CUnescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@1@Z
+    ?CUnescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@1@Z
     ?CalculateBase64EscapedLenInternal@strings_internal@absl@@YA_K_K_N@Z
     ?CallVoidPtrFunction@Condition@absl@@CA_NPEBV12@@Z
-    ?CancelledError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?CancelledError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Capacity@CordRepFlat@cord_internal@absl@@QEBA_KXZ
     ?CapacityToGrowth@container_internal@absl@@YA_K_K@Z
-    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEVstring_view@2@0E@Z
-    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
+    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0E@Z
+    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
     ?Ceil@absl@@YA?AVDuration@1@V21@0@Z
     ?CheckFastPathSetting@str_format_internal@absl@@YA_NAEBUUnboundConversion@12@@Z
     ?CheckInvariants@GraphCycles@synchronization_internal@absl@@QEBA_NXZ
-    ?CheckLengthInternal@string_view@absl@@CA_K_K@Z
     ?CheckstrcasecmpfalseImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
     ?CheckstrcasecmptrueImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
     ?CheckstrcmpfalseImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
@@ -2241,15 +2214,15 @@
     ?CombineLargeContiguousImpl32@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
     ?CombineLargeContiguousImpl64@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
     ?CommitTree@InlineRep@Cord@absl@@QEAAXPEBUCordRep@cord_internal@3@PEAU453@AEBVCordzUpdateScope@53@W4MethodIdentifier@CordzUpdateTracker@53@@Z
-    ?Compare@Cord@absl@@QEBAHVstring_view@2@@Z
+    ?Compare@Cord@absl@@QEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?CompareImpl@Cord@absl@@AEBAHAEBV12@@Z
     ?CompareSlowPath@Cord@absl@@AEBAHAEBV12@_K1@Z
-    ?CompareSlowPath@Cord@absl@@AEBAHVstring_view@2@_K1@Z
+    ?CompareSlowPath@Cord@absl@@AEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K1@Z
     ?Compute@CrcNonTemporalMemcpyAVXEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@CrcNonTemporalMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@FallbackCrcMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?ComputeCapacity@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@SA_K_K0@Z
-    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@Vstring_view@1@@Z
+    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Concat@CRC@crc_internal@absl@@UEAAXPEAII_K@Z
     ?ConcatCrc32c@absl@@YA?AVcrc32c_t@1@V21@0_K@Z
     ?ConstructNext@?$IteratorValueAdapter@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@V?$move_iterator@PEAPEAUCordRep@cord_internal@absl@@@23@@inlined_vector_internal@absl@@QEAAXAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@PEAPEAUCordRep@cord_internal@3@@Z
@@ -2258,7 +2231,7 @@
     ?ConstructNext@?$IteratorValueAdapter@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@V?$move_iterator@PEAUPayload@status_internal@absl@@@23@@inlined_vector_internal@absl@@QEAAXAEAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@PEAUPayload@status_internal@3@@Z
     ?Consume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
     ?ConsumeBeginTo@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@_K1@Z
-    ?ConsumePrefix@absl@@YA_NPEAVstring_view@1@V21@@Z
+    ?ConsumePrefix@absl@@YA_NPEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
     ?ConsumeUnboundConversion@str_format_internal@absl@@YAPEBDPEBD0PEAUUnboundConversion@12@PEAH@Z
     ?ConsumeUnboundConversionNoInline@str_format_internal@absl@@YAPEBDPEBD0PEAUUnboundConversion@12@PEAH@Z
     ?Contains@str_format_internal@absl@@YA_NW4FormatConversionCharSet@2@D@Z
@@ -2270,7 +2243,7 @@
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NMAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NNAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NOAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@Vstring_view@4@@Z
+    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ConvertSpecialToEmptyAndFullToDeleted@GroupAArch64Impl@container_internal@absl@@QEBAXPEAW4ctrl_t@23@@Z
     ?Copy@CordRepBtree@cord_internal@absl@@AEBAPEAV123@XZ
     ?Copy@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@II_K@Z
@@ -2282,14 +2255,14 @@
     ?CopyTo@InlineRep@Cord@absl@@QEBAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyToArraySlowPath@Cord@absl@@AEBAXPEAD@Z
     ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXD_KW4StringType@123@@Z
-    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXVstring_view@3@W4StringType@123@@Z
+    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4StringType@123@@Z
     ?CopyToEndFrom@CordRepBtree@cord_internal@absl@@AEBAPEAV123@_K0@Z
     ?Crash@Helper@internal_statusor@absl@@SAXAEBVStatus@3@@Z
     ?Crc32CAndCopy@crc_internal@absl@@YA?AVcrc32c_t@2@PEIAXPEIBX_KV32@_N@Z
     ?Crc32c@CRC@crc_internal@absl@@SAPEAV123@XZ
     ?CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z
     ?Create@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAUCordRep@23@@Z
-    ?Create@CordRepFlat@cord_internal@absl@@SAPEAU123@Vstring_view@3@_K@Z
+    ?Create@CordRepFlat@cord_internal@absl@@SAPEAU123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Create@CordRepRing@cord_internal@absl@@SAPEAV123@PEAUCordRep@23@_K@Z
     ?CreateFromLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAUCordRep@23@_K11@Z
     ?CreateSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAUCordRep@23@@Z
@@ -2299,12 +2272,12 @@
     ?CreateWithDefaultLimit@CordBuffer@absl@@SA?AV12@_K@Z
     ?Current@CordRepBtreeNavigator@cord_internal@absl@@QEBAPEAUCordRep@23@XZ
     ?CurrentThreadIdentityIfPresent@base_internal@absl@@YAPEAUThreadIdentity@12@XZ
-    ?Data@CordRepBtree@cord_internal@absl@@QEBA?AVstring_view@3@_K@Z
+    ?Data@CordRepBtree@cord_internal@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Data@CordRepFlat@cord_internal@absl@@QEAAPEADXZ
     ?Data@CordRepFlat@cord_internal@absl@@QEBAPEBDXZ
     ?DataLength@Header@TimeZoneInfo@cctz@time_internal@absl@@QEBA_K_K@Z
-    ?DataLossError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?DeadlineExceededError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?DataLossError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?DeadlineExceededError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@H@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAEAV?$allocator@H@Cr@std@@PEAH_K@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@PEAPEAUCordRep@cord_internal@3@_K@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@PEAVLogSink@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAEAV?$allocator@PEAVLogSink@absl@@@Cr@std@@PEAPEAVLogSink@3@_K@Z
@@ -2353,7 +2326,7 @@
     ?Digits10@?$BigUnsigned@$0FE@@strings_internal@absl@@SAHXZ
     ?DisableRescheduling@SchedulingGuard@base_internal@absl@@CA_NXZ
     ?Distance@CordRepRing@cord_internal@absl@@SA_K_K0@Z
-    ?DoLoad@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@AEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@ZXZ
+    ?DoLoad@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@AEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@AEBAP6AXPEBDH000@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@AEBAP6AXPEBDPEBX@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@AEBAP6AXPEBDPEBX_J@ZXZ
@@ -2363,7 +2336,7 @@
     ?DoLoad@?$AtomicHook@P6AX_J@Z@base_internal@absl@@AEBAP6AX_J@ZXZ
     ?DoLoad@?$AtomicHook@P6A_NPEBXPEADH@Z@base_internal@absl@@AEBAP6A_NPEBXPEADH@ZXZ
     ?DoLoad@?$AtomicHook@P6A_NW4LogSeverity@absl@@PEBDHPEAPEADPEAH@Z@base_internal@absl@@AEBAP6A_NW4LogSeverity@3@PEBDHPEAPEADPEAH@ZXZ
-    ?DoStore@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@AEAA_NP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z@Z
+    ?DoStore@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@AEAA_NP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z@Z
     ?DoStore@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@AEAA_NP6AXPEBDH000@Z@Z
     ?DoStore@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@AEAA_NP6AXPEBDPEBX@Z@Z
     ?DoStore@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@AEAA_NP6AXPEBDPEBX_J@Z@Z
@@ -2374,7 +2347,7 @@
     ?DoStore@?$AtomicHook@P6A_NPEBXPEADH@Z@base_internal@absl@@AEAA_NP6A_NPEBXPEADH@Z@Z
     ?DoStore@?$AtomicHook@P6A_NW4LogSeverity@absl@@PEBDHPEAPEADPEAH@Z@base_internal@absl@@AEAA_NP6A_NW4LogSeverity@3@PEBDHPEAPEADPEAH@Z@Z
     ?DropDeletesWithoutResize@container_internal@absl@@YAXAEAVCommonFields@12@AEBUPolicyFunctions@12@PEAX@Z
-    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z
+    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@CAXPEBDH000@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@CAXPEBDPEBX@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@CAXPEBDPEBX_J@Z
@@ -2382,15 +2355,15 @@
     ?DummyFunction@?$AtomicHook@P6AXXZ@base_internal@absl@@CAXXZ
     ?DummyFunction@?$AtomicHook@P6AX_J@Z@base_internal@absl@@CAX_J@Z
     ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
     ?DumpPCAndFrameSizesAndStackTrace@debugging_internal@absl@@YAXQEAXQEBQEAXQEAHHH_NP6AXPEBDPEAX@Z5@Z
     ?DumpStackTrace@debugging_internal@absl@@YAXHH_NP6AXPEBDPEAX@Z2@Z
     ?DurationFromTimespec@absl@@YA?AVDuration@1@Utimespec@@@Z
     ?DurationFromTimeval@absl@@YA?AVDuration@1@Utimeval@@@Z
     ?Edge@CordRepBtree@cord_internal@absl@@QEBAPEAUCordRep@23@W4EdgeType@123@@Z
     ?Edge@CordRepBtree@cord_internal@absl@@QEBAPEAUCordRep@23@_K@Z
-    ?EdgeData@cord_internal@absl@@YA?AVstring_view@2@PEBUCordRep@12@@Z
+    ?EdgeData@cord_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEBUCordRep@12@@Z
     ?Edges@CordRepBtree@cord_internal@absl@@QEBA?AV?$Span@QEAUCordRep@cord_internal@absl@@@3@XZ
     ?Edges@CordRepBtree@cord_internal@absl@@QEBA?AV?$Span@QEAUCordRep@cord_internal@absl@@@3@_K0@Z
     ?EmplaceTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@AEBVInlineData@53@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -2412,22 +2385,22 @@
     ?EncodeBytesTruncate@log_internal@absl@@YA_N_KV?$Span@$$CBD@2@PEAV?$Span@D@2@@Z
     ?EncodeMessageLength@log_internal@absl@@YAXV?$Span@D@2@PEBV32@@Z
     ?EncodeMessageStart@log_internal@absl@@YA?AV?$Span@D@2@_K0PEAV32@@Z
-    ?EncodeStringTruncate@log_internal@absl@@YA_N_KVstring_view@2@PEAV?$Span@D@2@@Z
+    ?EncodeStringTruncate@log_internal@absl@@YA_N_KV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$Span@D@2@@Z
     ?EncodeUTF8Char@strings_internal@absl@@YA_KPEAD_U@Z
     ?EncodeVarint@log_internal@absl@@YA_N_K0PEAV?$Span@D@2@@Z
     ?EncodeWaitCycles@SpinLock@base_internal@absl@@KAI_J0@Z
     ?EndsWith@Cord@absl@@QEBA_NAEBV12@@Z
-    ?EndsWith@Cord@absl@@QEBA_NVstring_view@2@@Z
-    ?EndsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?EqualsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?EndsWith@Cord@absl@@QEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?EndsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?EqualsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?EqualsImpl@Cord@absl@@AEBA_NAEBV12@_K@Z
-    ?EqualsImpl@Cord@absl@@AEBA_NVstring_view@2@_K@Z
+    ?EqualsImpl@Cord@absl@@AEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?EqualsSlow@Status@absl@@CA_NAEBV12@0@Z
     ?EquivTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEBA_NEE@Z
     ?Erase@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@0@Z
     ?EraseMetaOnly@container_internal@absl@@YAXAEAVCommonFields@12@PEAW4ctrl_t@12@_K@Z
-    ?ErasePayload@Status@absl@@QEAA_NVstring_view@2@@Z
-    ?ErrnoToStatus@absl@@YA?AVStatus@1@HVstring_view@1@@Z
+    ?ErasePayload@Status@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ErrnoToStatus@absl@@YA?AVStatus@1@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ErrnoToStatusCode@absl@@YA?AW4StatusCode@1@H@Z
     ?Eval@Condition@absl@@QEBA_NXZ
     ?Excess@str_format_internal@absl@@YA_K_K0@Z
@@ -2436,17 +2409,17 @@
     ?Extend@CRC32@crc_internal@absl@@UEBAXPEAIPEBX_K@Z
     ?ExtendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?ExtendByZeroesImpl@CRC32@crc_internal@absl@@CAXPEAI_KQEBI2@Z
-    ?ExtendCrc32c@absl@@YA?AVcrc32c_t@1@V21@Vstring_view@1@@Z
+    ?ExtendCrc32c@absl@@YA?AVcrc32c_t@1@V21@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendCrc32cByZeroes@absl@@YA?AVcrc32c_t@1@V21@_K@Z
     ?ExtendCrc32cInline@crc_internal@absl@@YA_NPEAIPEBD_K@Z
-    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@Vstring_view@2@@Z
+    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NXZ
     ?ExtractAppendBuffer@CordRepBtree@cord_internal@absl@@SA?AUExtractResult@CordRep@23@PEAV123@_K@Z
     ?ExtractFront@CordRepBtree@cord_internal@absl@@CAPEAUCordRep@23@PEAV123@@Z
     ?FDivDuration@absl@@YANVDuration@1@0@Z
     ?FailQuietly@LogMessage@log_internal@absl@@KAXXZ
     ?FailWithoutStackTrace@LogMessage@log_internal@absl@@KAXXZ
-    ?FailedPreconditionError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?FailedPreconditionError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?FailureSignalToString@debugging_internal@absl@@YAPEBDH@Z
     ?FastHexToBufferZeroPad16@numbers_internal@absl@@YA_K_KPEAD@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADHPEAD@Z
@@ -2462,12 +2435,12 @@
     ?FillWordTable@CRCImpl@crc_internal@absl@@SAXIIHPEAY0BAA@I@Z
     ?FillZeroesTable@CRCImpl@crc_internal@absl@@SAHIPEAY0BAA@I@Z
     ?FinalizeEncodingAndFormat@LogMessageData@LogMessage@log_internal@absl@@QEAAXXZ
-    ?Find@ByAnyChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByLength@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByString@absl@@QEBA?AVstring_view@2@V32@_K@Z
+    ?Find@ByAnyChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByLength@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByString@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
     ?Find@CordRepRing@cord_internal@absl@@QEBA?AUPosition@123@_K@Z
-    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AVstring_view@3@XZ
+    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?FindPath@GraphCycles@synchronization_internal@absl@@QEBAHUGraphId@23@0HQEAU423@@Z
     ?FindSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
     ?FindTail@CordRepRing@cord_internal@absl@@QEBA?AUPosition@123@I_K@Z
@@ -2483,15 +2456,15 @@
     ?FlagsToString@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4Flags@12@@Z
     ?FlatOverhead@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?FlatTagToLength@CordTestAccess@strings_internal@absl@@SA_KE@Z
-    ?FlattenSlowPath@Cord@absl@@AEAA?AVstring_view@2@XZ
+    ?FlattenSlowPath@Cord@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Floor@absl@@YA?AVDuration@1@V21@0@Z
     ?Flush@FormatSinkImpl@str_format_internal@absl@@QEAAXXZ
     ?Flush@LogMessage@log_internal@absl@@IEAAXXZ
     ?Flush@LogSink@absl@@UEAAXXZ
     ?FlushLogSinks@absl@@YAXXZ
     ?FlushLogSinks@log_internal@absl@@YAXXZ
-    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXVstring_view@absl@@@Z@2@@Z
-    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXVstring_view@absl@@AEBVCord@2@@Z@2@@Z
+    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@2@@Z
+    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@absl@@@Z@2@@Z
     ?ForVar1@CheckOpMessageBuilder@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForVar2@CheckOpMessageBuilder@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForgetDeadlockInfo@Mutex@absl@@QEAAXXZ
@@ -2513,7 +2486,7 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAA@@12@UVoidPtr@12@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAE@@12@PEBDVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@Vstring_view@2@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
+    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@MVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@NVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@OVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
@@ -2528,12 +2501,12 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_JVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_KVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatDuration@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
-    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IVstring_view@2@HW4PrefixFormat@12@3@Z
-    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IVstring_view@2@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
+    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@HW4PrefixFormat@12@3@Z
+    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
     ?FormatPack@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
+    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@VTime@1@VTimeZone@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@VTimeZone@1@@Z
-    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@VTime@1@VTimeZone@1@@Z
     ?FormatUntyped@str_format_internal@absl@@YA_NVFormatRawSinkImpl@12@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?FprintF@str_format_internal@absl@@YAHPEAU_iobuf@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?Frequency@CycleClock@base_internal@absl@@SANXZ
@@ -2598,9 +2571,9 @@
     ?GetDebugStackTraceHook@debugging_internal@absl@@YAP6AXQEBQEAXHP6AXPEBDPEAX@Z2@ZXZ
     ?GetEstimatedFairShareMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
     ?GetEstimatedMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
-    ?GetFirstChunk@Cord@absl@@CA?AVstring_view@2@AEBV12@@Z
-    ?GetFirstChunk@Cord@absl@@CA?AVstring_view@2@V32@@Z
-    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAVstring_view@2@@Z
+    ?GetFirstChunk@Cord@absl@@CA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV12@@Z
+    ?GetFirstChunk@Cord@absl@@CA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@@Z
+    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetHashtablezMaxSamples@container_internal@absl@@YA_KXZ
     ?GetHashtablezSampleParameter@container_internal@absl@@YAHXZ
     ?GetId@GraphCycles@synchronization_internal@absl@@QEAA?AUGraphId@23@PEAX@Z
@@ -2626,7 +2599,7 @@
     ?GetOrCreateCurrentThreadIdentity@synchronization_internal@absl@@YAPEAUThreadIdentity@base_internal@2@XZ
     ?GetParentMethod@CordzInfo@cord_internal@absl@@CA?AW4MethodIdentifier@CordzUpdateTracker@23@PEBV123@@Z
     ?GetParentStack@CordzInfo@cord_internal@absl@@QEBA?AV?$Span@QEAX@3@XZ
-    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@Vstring_view@2@@Z
+    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetPayloads@Status@absl@@AEAAPEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@2@XZ
     ?GetPayloads@Status@absl@@AEBAPEBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@2@XZ
     ?GetPrependBuffer@CordRepRing@cord_internal@absl@@QEAA?AV?$Span@D@3@_K@Z
@@ -2657,7 +2630,7 @@
     ?GetStackTrace@GraphCycles@synchronization_internal@absl@@QEAAHUGraphId@23@PEAPEAPEAX@Z
     ?GetStackTrace@absl@@YAHPEAPEAXHH@Z
     ?GetStackTraceWithContext@absl@@YAHPEAPEAXHHPEBXPEAH@Z
-    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@ZXZ
+    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@ZXZ
     ?GetStride@ExponentialBiased@profiling_internal@absl@@QEAA_J_J@Z
     ?GetTID@base_internal@absl@@YAIXZ
     ?GetTagForChar@str_format_internal@absl@@YA?AVConvTag@12@D@Z
@@ -2688,7 +2661,7 @@
     ?Guard@?$NullGuard@PEBE@log_internal@absl@@SAPEBEPEBE@Z
     ?Guard@?$NullGuard@PEBX@log_internal@absl@@SAAEBQEBXAEBQEBX@Z
     ?Guard@?$NullGuard@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@log_internal@absl@@SAAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV456@@Z
-    ?Guard@?$NullGuard@Vstring_view@absl@@@log_internal@absl@@SAAEBVstring_view@3@AEBV43@@Z
+    ?Guard@?$NullGuard@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@log_internal@absl@@SAAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV456@@Z
     ?Guard@?$NullGuard@_J@log_internal@absl@@SAAEB_JAEB_J@Z
     ?Guard@?$NullGuard@_K@log_internal@absl@@SAAEB_KAEB_K@Z
     ?Guard@?$NullGuard@_N@log_internal@absl@@SAAEB_NAEB_N@Z
@@ -2700,7 +2673,7 @@
     ?HasNode@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@@Z
     ?HasRandenHwAesImplementation@random_internal@absl@@YA_NXZ
     ?Head@CordzInfo@cord_internal@absl@@SAPEAV123@AEBVCordzSnapshot@23@@Z
-    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?HideMask@base_internal@absl@@YA_KXZ
     ?HighestBitSet@?$NonIterableBitMask@_K$07$02@container_internal@absl@@QEBAIXZ
     ?IDivDuration@absl@@YA_JVDuration@1@0PEAV21@@Z
@@ -2717,7 +2690,7 @@
     ?InfiniteDuration@absl@@YA?AVDuration@1@XZ
     ?InfiniteFuture@absl@@YA?AVTime@1@XZ
     ?InfinitePast@absl@@YA?AVTime@1@XZ
-    ?Init@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@PEAVCordRepBtree@23@@Z
+    ?Init@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVCordRepBtree@23@@Z
     ?Init@PerThreadSem@synchronization_internal@absl@@CAXPEAUThreadIdentity@base_internal@3@@Z
     ?InitDiscreteDistribution@random_internal@absl@@YA?AV?$vector@U?$pair@N_K@Cr@std@@V?$allocator@U?$pair@N_K@Cr@std@@@23@@Cr@std@@PEAV?$vector@NV?$allocator@N@Cr@std@@@45@@Z
     ?InitFirst@CordRepBtreeNavigator@cord_internal@absl@@QEAAPEAUCordRep@23@PEAVCordRepBtree@23@@Z
@@ -2727,7 +2700,7 @@
     ?InitTree@ChunkIterator@Cord@absl@@AEAAXPEAUCordRep@cord_internal@3@@Z
     ?InitWhat@BadStatusOrAccess@absl@@AEBAXXZ
     ?Initialize@ExponentialBiased@profiling_internal@absl@@AEAAXXZ
-    ?InitializeCordRepExternal@cord_internal@absl@@YAXVstring_view@2@PEAUCordRepExternal@12@@Z
+    ?InitializeCordRepExternal@cord_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAUCordRepExternal@12@@Z
     ?InitializeSymbolizer@absl@@YAXPEBD@Z
     ?InlinedRepToCode@Status@absl@@CA?AW4StatusCode@2@_K@Z
     ?InsertEdge@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@0@Z
@@ -2739,9 +2712,9 @@
     ?InternalAttemptToUseMutexInFatalSignalHandler@Mutex@absl@@SAXXZ
     ?InternalCondVarPoke@StdcppWaiter@synchronization_internal@absl@@AEAAXXZ
     ?InternalCondVarPoke@Win32Waiter@synchronization_internal@absl@@AEAAXXZ
-    ?InternalError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InternalError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?InternalStream@LogMessage@log_internal@absl@@QEAAAEAV123@XZ
-    ?InvalidArgumentError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InvalidArgumentError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?InvalidGraphId@synchronization_internal@absl@@YA?AUGraphId@12@XZ
     ?IsAborted@absl@@YA_NAEBVStatus@1@@Z
     ?IsAlreadyExists@absl@@YA_NAEBVStatus@1@@Z
@@ -2759,8 +2732,8 @@
     ?IsFailedPrecondition@absl@@YA_NAEBVStatus@1@@Z
     ?IsFatal@LogMessage@log_internal@absl@@AEBA_NXZ
     ?IsFlat@CordRep@cord_internal@absl@@QEBA_NXZ
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAVstring_view@3@@Z
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAVstring_view@3@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsFull@container_internal@absl@@YA_NW4ctrl_t@12@@Z
     ?IsHashtablezEnabled@container_internal@absl@@YA_NXZ
     ?IsImmortal@RefcountAndFlags@cord_internal@absl@@QEBA_NXZ
@@ -2796,7 +2769,7 @@
     ?Load16@big_endian@absl@@YAGPEBX@Z
     ?Load32@big_endian@absl@@YAIPEBX@Z
     ?Load32@little_endian@absl@@YAIPEBX@Z
-    ?Load@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@QEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@ZXZ
+    ?Load@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@QEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@ZXZ
     ?Load@?$AtomicHook@P6AXXZ@base_internal@absl@@QEBAP6AXXZXZ
     ?Load@TimeZoneIf@cctz@time_internal@absl@@SA?AV?$unique_ptr@VTimeZoneIf@cctz@time_internal@absl@@U?$default_delete@VTimeZoneIf@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@67@@Z
     ?Load@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NPEAVZoneInfoSource@234@@Z
@@ -2860,7 +2833,6 @@
     ?MaybeTrackCordImpl@CordzInfo@cord_internal@absl@@CAXAEAVInlineData@23@AEBV423@W4MethodIdentifier@CordzUpdateTracker@23@@Z
     ?MemcpyCrc32c@absl@@YA?AVcrc32c_t@1@PEAXPEBX_KV21@@Z
     ?MergeTrees@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@0@Z
-    ?Min@string_view@absl@@CA_K_K0@Z
     ?MinLogLevel@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?MixIntoSeedMaterial@random_internal@absl@@YAXV?$Span@$$CBI@2@V?$Span@I@2@@Z
     ?MovedFromRep@Status@absl@@CA_KXZ
@@ -2894,7 +2866,7 @@
     ?NewInternal@CRCImpl@crc_internal@absl@@SAPEAV123@XZ
     ?NewString@CheckOpMessageBuilder@log_internal@absl@@QEAAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Next@CordRepBtreeNavigator@cord_internal@absl@@QEAAPEAUCordRep@23@XZ
-    ?Next@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@XZ
+    ?Next@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Next@CordzInfo@cord_internal@absl@@QEBAPEAV123@AEBVCordzSnapshot@23@@Z
     ?NextCapacity@?$Storage@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@SA_K_K@Z
     ?NextCapacity@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@SA_K_K@Z
@@ -2910,13 +2882,13 @@
     ?Normalize@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?NormalizeLogSeverity@absl@@YA?AW4LogSeverity@1@W421@@Z
     ?NormalizedPrefixCrcAtNthChunk@CrcCordState@crc_internal@absl@@QEBA?AUPrefixCrc@123@_K@Z
-    ?NotFoundError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?NotFoundError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Notify@Notification@absl@@QEAAXXZ
     ?Now@CycleClock@base_internal@absl@@SA_JXZ
     ?Now@UnscaledCycleClock@base_internal@absl@@CA_JXZ
     ?Now@UnscaledCycleClockWrapperForGetCurrentTime@time_internal@absl@@SA_JXZ
     ?Now@absl@@YA?AVTime@1@XZ
-    ?NullSafeStringView@absl@@YA?AVstring_view@1@PEBD@Z
+    ?NullSafeStringView@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEBD@Z
     ?NumCPUs@base_internal@absl@@YAHXZ
     ?NumChunks@CrcCordState@crc_internal@absl@@QEBA_KXZ
     ?NumClonedBytes@container_internal@absl@@YA_KXZ
@@ -2925,29 +2897,29 @@
     ?OccursBefore@ViableSubstitution@strings_internal@absl@@QEBA_NAEBU123@@Z
     ?OneTimeInitThreadIdentity@synchronization_internal@absl@@YAXPEAUThreadIdentity@base_internal@2@@Z
     ?OppositeInfinity@time_internal@absl@@YA?AVDuration@2@V32@@Z
-    ?OutOfRangeError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?OutOfRangeError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParseDigits@str_format_internal@absl@@YAHAEADAEAPEBDQEBD@Z
-    ?ParseDuration@absl@@YA_NVstring_view@1@PEAVDuration@1@@Z
+    ?ParseDuration@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVDuration@1@PEAV234@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVTime@1@PEAV234@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParsePosixSpec@cctz@time_internal@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAUPosixTimeZone@123@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?PerTableSalt@container_internal@absl@@YA_KPEBW4ctrl_t@12@@Z
-    ?PermissionDeniedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?Piece@AlphaNum@absl@@QEBA?AVstring_view@2@XZ
+    ?PermissionDeniedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Piece@AlphaNum@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?PiecewiseChunkSize@hash_internal@absl@@YA_KXZ
     ?PointerToRep@Status@absl@@CA_KPEAUStatusRep@status_internal@2@@Z
     ?Poison@CrcCordState@crc_internal@absl@@QEAAXXZ
@@ -2961,14 +2933,14 @@
     ?PrepareToDie@LogMessage@log_internal@absl@@AEAAXXZ
     ?PrepareToModify@Status@absl@@AEAAXXZ
     ?Prepend@Cord@absl@@QEAAXAEBV12@@Z
-    ?Prepend@Cord@absl@@QEAAXVstring_view@2@@Z
+    ?Prepend@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?PrependArray@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?PrependArray@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
-    ?PrependPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?PrependPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -2982,7 +2954,7 @@
     ?Ptr@GraphCycles@synchronization_internal@absl@@QEAAPEAXUGraphId@23@@Z
     ?PushDead@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAXPEAUHashtablezInfo@container_internal@3@@Z
     ?PushNew@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAXPEAUHashtablezInfo@container_internal@3@@Z
-    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NVstring_view@3@HH_N@Z
+    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HH_N@Z
     ?PutTwoDigits@numbers_internal@absl@@YAX_KPEAD@Z
     ?RawAbsNanos@KernelTimeout@synchronization_internal@absl@@AEBA_JXZ
     ?RawEnableLogPrefix@log_internal@absl@@YAX_N@Z
@@ -2994,7 +2966,7 @@
     ?Read4To8@MixingHashState@hash_internal@absl@@CA_KPEBE_K@Z
     ?Read9To16@MixingHashState@hash_internal@absl@@CA?AU?$pair@_K_K@Cr@std@@PEBE_K@Z
     ?Read@CordRepBtreeNavigator@cord_internal@absl@@QEAA?AUReadResult@123@_K0@Z
-    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K0AEAPEAUCordRep@23@@Z
+    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K0AEAPEAUCordRep@23@@Z
     ?ReadDigits@?$BigUnsigned@$03@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadDigits@?$BigUnsigned@$0FE@@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadFloatMantissa@?$BigUnsigned@$03@strings_internal@absl@@QEAAHAEBUParsedFloat@23@H@Z
@@ -3061,7 +3033,7 @@
     ?ResetToBuiltinUTC@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NAEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?ResetToEmpty@InlineRep@Cord@absl@@AEAAXXZ
     ?Resize@?$ResizeUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
-    ?ResourceExhaustedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ResourceExhaustedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Rethrow@variant_internal@absl@@YAXXZ
     ?ReverseConsume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
     ?RoundUp@cord_internal@absl@@YA_K_K0@Z
@@ -3073,7 +3045,7 @@
     ?SanitizerUnpoisonMemoryRegion@container_internal@absl@@YAXPEBX_K@Z
     ?Scramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
     ?Seek@CordRepBtreeNavigator@cord_internal@absl@@QEAA?AUPosition@123@_K@Z
-    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K@Z
+    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?SendToLog@LogMessage@log_internal@absl@@AEAAXXZ
     ?SetAllocation@?$Storage@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXU?$Allocation@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@23@@Z
     ?SetAllocation@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXU?$Allocation@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@23@@Z
@@ -3103,16 +3075,16 @@
     ?SetIsAllocated@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXXZ
     ?SetIsAllocated@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXXZ
     ?SetLength@CordBuffer@absl@@QEAAX_K@Z
-    ?SetLogBacktraceLocation@absl@@YAXVstring_view@1@H@Z
+    ?SetLogBacktraceLocation@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?SetLoggingGlobalsListener@log_internal@absl@@YAXP6AXXZ@Z
     ?SetMaxFramesInLogStackTrace@log_internal@absl@@YAXH@Z
     ?SetMaxSamples@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@QEAAX_K@Z
     ?SetMinLogLevel@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetMutexDeadlockDetectionMode@absl@@YAXW4OnDeadlockCycle@1@@Z
-    ?SetPayload@Status@absl@@QEAAXVstring_view@2@VCord@2@@Z
+    ?SetPayload@Status@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VCord@2@@Z
     ?SetPrecision@FormatConversionSpecImplFriend@str_format_internal@absl@@SAXHPEAVFormatConversionSpecImpl@23@@Z
     ?SetStackUnwinder@absl@@YAXP6AHPEAPEAXPEAHHHPEBX1@Z@Z
-    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@Z@Z
+    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@Z
     ?SetStderrThreshold@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetSuppressSigabortTrace@log_internal@absl@@YA_N_N@Z
     ?SetThreadBlockedCounter@PerThreadSem@synchronization_internal@absl@@SAXPEAU?$atomic@H@Cr@std@@@Z
@@ -3125,7 +3097,7 @@
     ?SetValue@?$Manager@H$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBH@Z
     ?SetValue@?$Manager@I$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBI@Z
     ?SetValue@?$Manager@PEBD$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBQEBD@Z
-    ?SetValue@?$Manager@Vstring_view@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBVstring_view@4@@Z
+    ?SetValue@?$Manager@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?SetValue@?$Manager@_J$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEB_J@Z
     ?SetWidth@FormatConversionSpecImplFriend@str_format_internal@absl@@SAXHPEAVFormatConversionSpecImpl@23@@Z
     ?ShiftLeft@?$BigUnsigned@$03@strings_internal@absl@@QEAAXH@Z
@@ -3135,16 +3107,16 @@
     ?ShouldLog@LogEveryNState@log_internal@absl@@QEAA_NH@Z
     ?ShouldLog@LogEveryPow2State@log_internal@absl@@QEAA_NXZ
     ?ShouldLog@LogFirstNState@log_internal@absl@@QEAA_NH@Z
-    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NVstring_view@2@H@Z
+    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?ShouldPrependLogPrefix@absl@@YA_NXZ
     ?ShouldSymbolizeLogStackTrace@log_internal@absl@@YA_NXZ
     ?Signal@CondVar@absl@@QEAAXXZ
     ?SignalAll@CondVar@absl@@QEAAXXZ
     ?SignedAddResult@int128_internal@absl@@YA?AVint128@2@V32@0@Z
     ?SignedSubstructResult@int128_internal@absl@@YA?AVint128@2@V32@00@Z
-    ?SimpleAtob@absl@@YA_NVstring_view@1@PEA_N@Z
-    ?SimpleAtod@absl@@YA_NVstring_view@1@PEAN@Z
-    ?SimpleAtof@absl@@YA_NVstring_view@1@PEAM@Z
+    ?SimpleAtob@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_N@Z
+    ?SimpleAtod@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAN@Z
+    ?SimpleAtof@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAM@Z
     ?SixDigitsToBuffer@numbers_internal@absl@@YA_KNPEAD@Z
     ?SizeofCordRepExternal@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?SizeofCordRepSubstring@CordTestAccess@strings_internal@absl@@SA_KXZ
@@ -3161,13 +3133,13 @@
     ?SpinLockWake@base_internal@absl@@YAXPEAU?$atomic@I@Cr@std@@_N@Z
     ?SpinLoop@SpinLock@base_internal@absl@@AEAAIXZ
     ?StackTraceWorksForTest@debugging_internal@absl@@YA_NXZ
-    ?StartsWith@absl@@YA_NVstring_view@1@0@Z
-    ?StartsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?StartsWith@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StartsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?StatusCodeToString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4StatusCode@1@@Z
     ?StderrThreshold@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?SteadyClockNow@KernelTimeout@synchronization_internal@absl@@CA_JXZ
     ?Store64@little_endian@absl@@YAXPEAX_K@Z
-    ?Store@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@QEAAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z@Z
+    ?Store@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@QEAAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z@Z
     ?Store@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@QEAAXP6AXPEBDH000@Z@Z
     ?Store@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@QEAAXP6AXPEBDPEBX@Z@Z
     ?Store@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@QEAAXP6AXPEBDPEBX_J@Z@Z
@@ -3185,21 +3157,20 @@
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@00@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@0@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@@Z
-    ?StrContains@absl@@YA_NVstring_view@1@D@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@D@Z
+    ?StrContains@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ?StrError@base_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@H@Z
-    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
-    ?StripAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StripLeadingAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StripTrailingAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StrlenInternal@string_view@absl@@CA_KPEBD@Z
+    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
+    ?StripAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
+    ?StripLeadingAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
+    ?StripTrailingAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
     ?SubLength@CordRepRing@cord_internal@absl@@AEAAXI_K@Z
     ?SubRing@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@_K11@Z
     ?SubTree@CordRepBtree@cord_internal@absl@@QEAAPEAUCordRep@23@_K0@Z
     ?Subcord@Cord@absl@@QEBA?AV12@_K0@Z
-    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@PEBV62@_K@Z
+    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@PEBV645@_K@Z
     ?Substring@CordRepSubstring@cord_internal@absl@@SAPEAUCordRep@23@PEAU423@_K1@Z
     ?SubstructResult@int128_internal@absl@@YA?AVuint128@2@V32@00@Z
     ?SubtractSize@?$Storage@H$0CP@V?$allocator@H@Cr@std@@@inlined_vector_internal@absl@@QEAAX_K@Z
@@ -3317,13 +3288,13 @@
     ?UnalignedLoad32@base_internal@absl@@YAIPEBX@Z
     ?UnalignedLoad64@base_internal@absl@@YA_KPEBX@Z
     ?UnalignedStore64@base_internal@absl@@YAXPEAX_K@Z
-    ?UnauthenticatedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnavailableError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnauthenticatedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnavailableError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UnextendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?UnextendCrc32cByZeroes@crc_internal@absl@@YA?AVcrc32c_t@2@V32@_K@Z
-    ?UnimplementedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnimplementedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UniversalEpoch@absl@@YA?AVTime@1@XZ
-    ?UnknownError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnknownError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Unlock@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?Unlock@Mutex@absl@@QEAAXXZ
     ?Unlock@SpinLock@base_internal@absl@@QEAAXXZ
@@ -3342,8 +3313,8 @@
     ?Unscramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
     ?Untrack@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?UpdateStackTrace@GraphCycles@synchronization_internal@absl@@QEAAXUGraphId@23@HP6AHPEAPEAXH@Z@Z
-    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?Validate@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEBDH@Z
     ?Value@?$Manager@C$01@FormatArgImpl@str_format_internal@absl@@SACTData@234@@Z
     ?Value@?$Manager@D$01@FormatArgImpl@str_format_internal@absl@@SADTData@234@@Z
@@ -3360,8 +3331,8 @@
     ?Value@?$Manager@PEBD$01@FormatArgImpl@str_format_internal@absl@@SAPEBDTData@234@@Z
     ?Value@?$Manager@UVoidPtr@str_format_internal@absl@@$01@FormatArgImpl@str_format_internal@absl@@SA?AUVoidPtr@34@TData@234@@Z
     ?Value@?$Manager@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@TData@234@@Z
+    ?Value@?$Manager@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@TData@234@@Z
     ?Value@?$Manager@Vint128@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBVint128@4@TData@234@@Z
-    ?Value@?$Manager@Vstring_view@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBVstring_view@4@TData@234@@Z
     ?Value@?$Manager@Vuint128@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBVuint128@4@TData@234@@Z
     ?Value@?$Manager@_J$01@FormatArgImpl@str_format_internal@absl@@SA_JTData@234@@Z
     ?Value@?$Manager@_K$01@FormatArgImpl@str_format_internal@absl@@SA_KTData@234@@Z
@@ -3385,18 +3356,18 @@
     ?WaitWithTimeout@CondVar@absl@@QEAA_NPEAVMutex@2@VDuration@2@@Z
     ?Wakeup@CondVar@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?Wakeup@Mutex@absl@@AEAAPEAUPerThreadSynch@base_internal@2@PEAU342@@Z
-    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?WebSafeBase64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?WebSafeBase64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?WebSafeBase64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?WebSafeBase64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?WithMetadataFrom@LogMessage@log_internal@absl@@QEAAAEAV123@AEBVLogEntry@3@@Z
     ?WithPerror@LogMessage@log_internal@absl@@QEAAAEAV123@XZ
     ?WithThreadID@LogMessage@log_internal@absl@@QEAAAEAV123@I@Z
     ?WithTimestamp@LogMessage@log_internal@absl@@QEAAAEAV123@VTime@3@@Z
     ?WithVerbosity@LogMessage@log_internal@absl@@QEAAAEAV123@H@Z
-    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?Write@FILERawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?Write@FormatRawSinkImpl@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?WriteToStderr@log_internal@absl@@YAXVstring_view@2@W4LogSeverity@2@@Z
+    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FILERawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FormatRawSinkImpl@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?WriteToStderr@log_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4LogSeverity@2@@Z
     ?WriterLock@Mutex@absl@@QEAAXXZ
     ?WriterUnlock@Mutex@absl@@QEAAXXZ
     ?ZeroDuration@absl@@YA?AVDuration@1@XZ
@@ -3870,9 +3841,7 @@
     ?begin@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBAPEBQEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?begin@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@23@XZ
     ?begin@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@23@XZ
-    ?begin@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QEBAPEBU?$pair@Vstring_view@absl@@V12@@Cr@2@XZ
     ?begin@?$initializer_list@VFormatArgImpl@str_format_internal@absl@@@std@@QEBAPEBVFormatArgImpl@str_format_internal@absl@@XZ
-    ?begin@?$initializer_list@Vstring_view@absl@@@std@@QEBAPEBVstring_view@absl@@XZ
     ?begin@?$initializer_list@W4FormatConversionCharSet@absl@@@std@@QEBAPEBW4FormatConversionCharSet@absl@@XZ
     ?begin@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_map_iterator@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@XZ
     ?begin@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAPEAVCordzHandle@cord_internal@absl@@@23@XZ
@@ -3884,7 +3853,6 @@
     ?begin@ChunkRange@Cord@absl@@QEBA?AVChunkIterator@23@XZ
     ?begin@CordRepBtree@cord_internal@absl@@QEBA_KXZ
     ?begin@__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AU1234@XZ
-    ?begin@string_view@absl@@QEBAPEBDXZ
     ?btree@CordRep@cord_internal@absl@@QEAAPEAVCordRepBtree@23@XZ
     ?btree@CordRep@cord_internal@absl@@QEBAPEBVCordRepBtree@23@XZ
     ?btree@CordRepBtreeNavigator@cord_internal@absl@@QEBAPEAVCordRepBtree@23@XZ
@@ -3980,7 +3948,6 @@
     ?data@CordBuffer@absl@@QEAAPEADXZ
     ?data@InlineRep@Cord@absl@@QEBAPEBDXZ
     ?data@Rep@CordBuffer@absl@@QEAAPEADXZ
-    ?data@string_view@absl@@QEBAPEBDXZ
     ?day@?$civil_time@Uday_tag@detail@cctz@time_internal@absl@@@detail@cctz@time_internal@absl@@QEBAHXZ
     ?day@?$civil_time@Usecond_tag@detail@cctz@time_internal@absl@@@detail@cctz@time_internal@absl@@QEBAHXZ
     ?day@?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@absl@@QEBAHXZ
@@ -4043,7 +4010,6 @@
     ?empty@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBA_NXZ
     ?empty@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEBA_NXZ
     ?empty@Cord@absl@@QEBA_NXZ
-    ?empty@string_view@absl@@QEBA_NXZ
     ?end@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@2@XZ
     ?end@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEBAPEBUPayload@status_internal@2@XZ
     ?end@?$Span@$$CBI@absl@@QEBAPEBIXZ
@@ -4057,8 +4023,6 @@
     ?end@?$deque@PEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__deque_iterator@PEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEBV12345@AEAPEBV12345@PEAPEAPEBV12345@_J$0A@@23@XZ
     ?end@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@23@XZ
     ?end@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@23@XZ
-    ?end@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QEBAPEBU?$pair@Vstring_view@absl@@V12@@Cr@2@XZ
-    ?end@?$initializer_list@Vstring_view@absl@@@std@@QEBAPEBVstring_view@absl@@XZ
     ?end@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_map_iterator@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@XZ
     ?end@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAPEAVCordzHandle@cord_internal@absl@@@23@XZ
     ?end@?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAPEAVLogSink@absl@@@23@XZ
@@ -4068,7 +4032,6 @@
     ?end@ChunkRange@Cord@absl@@QEBA?AVChunkIterator@23@XZ
     ?end@CordRepBtree@cord_internal@absl@@QEBA_KXZ
     ?end@__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AU1234@XZ
-    ?end@string_view@absl@@QEBAPEBDXZ
     ?engines@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@4@PEIAXPEIBX_KV54@_N@Z@4UArchSpecificEngines@234@B
     ?entries@CordRepRing@cord_internal@absl@@QEBAIII@Z
     ?entries@CordRepRing@cord_internal@absl@@QEBAIXZ
@@ -4089,19 +4052,7 @@
     ?external@CordRep@cord_internal@absl@@QEBAPEBUCordRepExternal@23@XZ
     ?fetch_add_end@CordRepBtree@cord_internal@absl@@AEAA_K_K@Z
     ?find@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_map_iterator@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@23@@Z
-    ?find@string_view@absl@@QEBA_KD_K@Z
-    ?find@string_view@absl@@QEBA_KV12@_K@Z
     ?find_first_non_full_outofline@container_internal@absl@@YA?AUFindInfo@12@AEBVCommonFields@12@_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KPEBD_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KPEBD_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KV12@_K@Z
     ?first@?$__compressed_pair@MV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QEAAAEAMXZ
     ?first@?$__compressed_pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?first@?$__compressed_pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAAEBQEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
@@ -4180,7 +4131,6 @@
     ?front@?$__split_buffer@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?front@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?front@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUTransition@cctz@time_internal@absl@@XZ
-    ?front@string_view@absl@@QEBAAEBDXZ
     ?gbswap_16@absl@@YAGG@Z
     ?gbswap_32@absl@@YAII@Z
     ?gbswap_64@absl@@YA_K_K@Z
@@ -4198,7 +4148,6 @@
     ?get@?$Storage@_K$0A@$0A@@internal_compressed_tuple@container_internal@absl@@QEGAAAEA_KXZ
     ?get@?$__temp_value@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUTransition@cctz@time_internal@absl@@XZ
     ?get@?$__temp_value@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUTransitionType@cctz@time_internal@absl@@XZ
-    ?get@?$__tuple_leaf@$0A@AEBVstring_view@absl@@$0A@@Cr@std@@QEBAAEBVstring_view@absl@@XZ
     ?get@?$unique_ptr@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@V?$__allocator_destructor@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@@Cr@std@@QEBAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?get@?$unique_ptr@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$__allocator_destructor@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@@Cr@std@@QEBAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?get@?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@@Cr@std@@QEBAPEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@23@XZ
@@ -4256,7 +4205,6 @@
     ?key_eq@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAAAEAV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@XZ
     ?length@?$Span@D@absl@@QEBA_KXZ
     ?length@CordRepBtreeReader@cord_internal@absl@@QEBA_KXZ
-    ?length@string_view@absl@@QEBA_KXZ
     ?load@?$__atomic_base@P6AXAEBUHashtablezInfo@container_internal@absl@@@Z$0A@@Cr@std@@QEBAP6AXAEBUHashtablezInfo@container_internal@absl@@@ZW4memory_order@23@@Z
     ?load@?$__atomic_base@PEAUHashtablezInfo@container_internal@absl@@$0A@@Cr@std@@QEBAPEAUHashtablezInfo@container_internal@absl@@W4memory_order@23@@Z
     ?load@?$__atomic_base@PEAVCordzHandle@cord_internal@absl@@$0A@@Cr@std@@QEBAPEAVCordzHandle@cord_internal@absl@@W4memory_order@23@@Z
@@ -4295,7 +4243,7 @@
     ?mempbrk@strings_internal@absl@@YAPEADPEBD_K0@Z
     ?memrchr@strings_internal@absl@@YAPEADPEBDH_K@Z
     ?memspn@strings_internal@absl@@YA_KPEBD_K0@Z
-    ?message@Status@absl@@QEBA?AVstring_view@2@XZ
+    ?message@Status@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?min@?$RandenPool@E@random_internal@absl@@SAEXZ
     ?min@?$RandenPool@G@random_internal@absl@@SAGXZ
     ?min@?$RandenPool@I@random_internal@absl@@SAIXZ
@@ -4370,7 +4318,6 @@
     ?push_front@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@AEAV?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAXAEBQEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Z
     ?push_front@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAX$$QEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Z
     ?raw_code@Status@absl@@QEBAHXZ
-    ?rbegin@string_view@absl@@QEBA?AV?$reverse_iterator@PEBD@Cr@std@@XZ
     ?reduce_size@InlineRep@Cord@absl@@QEAAX_K@Z
     ?reference@?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@AEAAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?reference@?$optional@_K@absl@@AEAAAEA_KXZ
@@ -4385,11 +4332,8 @@
     ?remove_prefix@?$Span@$$CBD@absl@@QEAAX_K@Z
     ?remove_prefix@?$Span@D@absl@@QEAAX_K@Z
     ?remove_prefix@InlineRep@Cord@absl@@QEAAX_K@Z
-    ?remove_prefix@string_view@absl@@QEAAX_K@Z
     ?remove_suffix@?$Span@$$CBD@absl@@QEAAX_K@Z
     ?remove_suffix@?$Span@D@absl@@QEAAX_K@Z
-    ?remove_suffix@string_view@absl@@QEAAX_K@Z
-    ?rend@string_view@absl@@QEBA?AV?$reverse_iterator@PEBD@Cr@std@@XZ
     ?rep@CrcCordState@crc_internal@absl@@QEBAAEBURep@123@XZ
     ?rep@Rep@CordBuffer@absl@@QEBAPEAUCordRepFlat@cord_internal@3@XZ
     ?reserve@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
@@ -4410,16 +4354,14 @@
     ?resize@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
     ?retreat@CordRepRing@cord_internal@absl@@QEBAII@Z
     ?retreat@CordRepRing@cord_internal@absl@@QEBAIII@Z
-    ?rfind@string_view@absl@@QEBA_KD_K@Z
-    ?rfind@string_view@absl@@QEBA_KV12@_K@Z
     ?ring@CordRep@cord_internal@absl@@QEAAPEAVCordRepRing@23@XZ
     ?ring@CordRep@cord_internal@absl@@QEBAPEBVCordRepRing@23@XZ
-    ?safe_strto128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVint128@2@H@Z
-    ?safe_strto32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAHH@Z
-    ?safe_strto64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_JH@Z
-    ?safe_strtou128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVuint128@2@H@Z
-    ?safe_strtou32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAIH@Z
-    ?safe_strtou64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_KH@Z
+    ?safe_strto128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVint128@2@H@Z
+    ?safe_strto32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAHH@Z
+    ?safe_strto64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_JH@Z
+    ?safe_strtou128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVuint128@2@H@Z
+    ?safe_strtou32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAIH@Z
+    ?safe_strtou64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_KH@Z
     ?scale_add@impl@detail@cctz@time_internal@absl@@YA_J_J00@Z
     ?second@?$__compressed_pair@MV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QEAAAEAV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@XZ
     ?second@?$__compressed_pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@23@XZ
@@ -4516,7 +4458,6 @@
     ?size@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
     ?size@?$deque@PEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
     ?size@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
-    ?size@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QEBA_KXZ
     ?size@?$initializer_list@VFormatArgImpl@str_format_internal@absl@@@std@@QEBA_KXZ
     ?size@?$initializer_list@W4FormatConversionCharSet@absl@@@std@@QEBA_KXZ
     ?size@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
@@ -4531,10 +4472,9 @@
     ?size@Cord@absl@@QEBA_KXZ
     ?size@CordRepBtree@cord_internal@absl@@QEBA_KXZ
     ?size@InlineRep@Cord@absl@@QEBA_KXZ
-    ?size@string_view@absl@@QEBA_KXZ
-    ?source_basename@LogEntry@absl@@QEBA?AVstring_view@2@XZ
+    ?source_basename@LogEntry@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?source_line@LogEntry@absl@@QEBAHXZ
-    ?stacktrace@LogEntry@absl@@QEBA?AVstring_view@2@XZ
+    ?stacktrace@LogEntry@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?status@BadStatusOrAccess@absl@@QEBAAEBVStatus@2@XZ
     ?step@detail@cctz@time_internal@absl@@YA?AUfields@1234@Uday_tag@1234@U51234@_J@Z
     ?step@detail@cctz@time_internal@absl@@YA?AUfields@1234@Usecond_tag@1234@U51234@_J@Z
@@ -4542,19 +4482,18 @@
     ?store@?$__atomic_base@PEAVCordzInfo@cord_internal@absl@@$0A@@Cr@std@@QEAAXPEAVCordzInfo@cord_internal@absl@@W4memory_order@23@@Z
     ?store@?$__atomic_base@W4OnDeadlockCycle@absl@@$0A@@Cr@std@@QEAAXW4OnDeadlockCycle@absl@@W4memory_order@23@@Z
     ?store@?$__atomic_base@W4State@PerThreadSynch@base_internal@absl@@$0A@@Cr@std@@QEAAXW4State@PerThreadSynch@base_internal@absl@@W4memory_order@23@@Z
-    ?str@UntypedFormatSpecImpl@str_format_internal@absl@@QEBA?AVstring_view@3@XZ
+    ?str@UntypedFormatSpecImpl@str_format_internal@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?stream@OstreamView@LogMessage@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
-    ?string_value@ProtoField@log_internal@absl@@QEBA?AVstring_view@3@XZ
+    ?string_value@ProtoField@log_internal@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?sub_fetch_begin@CordRepBtree@cord_internal@absl@@AEAA_K_K@Z
     ?subspan@?$Span@$$CBD@absl@@QEBA?AV12@_K0@Z
     ?subspan@?$Span@D@absl@@QEBA?AV12@_K0@Z
-    ?substr@string_view@absl@@QEBA?AV12@_K0@Z
     ?substring@CordRep@cord_internal@absl@@QEAAPEAUCordRepSubstring@23@XZ
     ?substring@CordRep@cord_internal@absl@@QEBAPEBUCordRepSubstring@23@XZ
     ?tag@ProtoField@log_internal@absl@@QEBA_KXZ
     ?tag@Rep@InlineData@cord_internal@absl@@QEBACXZ
     ?tail@CordRepRing@cord_internal@absl@@QEBAIXZ
-    ?text_message_with_prefix_and_newline@LogEntry@absl@@QEBA?AVstring_view@2@XZ
+    ?text_message_with_prefix_and_newline@LogEntry@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?text_message_with_prefix_and_newline_c_str@LogEntry@absl@@QEBAPEBDXZ
     ?thread_identity@PerThreadSynch@base_internal@absl@@QEAAPEAUThreadIdentity@23@XZ
     ?throw_bad_optional_access@optional_internal@absl@@YAXXZ

third_party/abseil-cpp/symbols_arm64_rel.def

diff --git a/third_party/abseil-cpp/symbols_arm64_rel.def b/third_party/abseil-cpp/symbols_arm64_rel.def
index 6e7c051..38226b9 100644
--- a/third_party/abseil-cpp/symbols_arm64_rel.def
+++ b/third_party/abseil-cpp/symbols_arm64_rel.def
@@ -2,6 +2,7 @@
     ?$TSS0@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z@4HA
     ??$?0AEBVCord@absl@@@?$optional_data_dtor_base@VCord@absl@@$0A@@optional_internal@absl@@IEAA@Uin_place_t@2@AEBVCord@2@@Z
     ??$?0PEAI@?$SaltedSeedSeq@Vseed_seq@Cr@std@@@random_internal@absl@@QEAA@PEAI0@Z
+    ??$?0V?$allocator@D@Cr@std@@@AlphaNum@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAA@$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?6C$0A@@LogMessage@log_internal@absl@@QEAAAEAV012@AEBC@Z
     ??$?6D$0A@@LogMessage@log_internal@absl@@QEAAAEAV012@AEBD@Z
@@ -25,14 +26,14 @@
     ??$?RW4LogSeverity@absl@@AEBQEBDHAEAPEBD@?$AtomicHook@P6AXW4LogSeverity@absl@@PEBDHAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z@base_internal@absl@@QEBAX$$QEAW4LogSeverity@2@AEBQEBD$$QEAHAEAPEBD@Z
     ??$?RW4LogSeverity@absl@@AEBQEBDHAEAY0CC@$$CBD@?$AtomicHook@P6AXW4LogSeverity@absl@@PEBDHAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z@base_internal@absl@@QEBAX$$QEAW4LogSeverity@2@AEBQEBD$$QEAHAEAY0CC@$$CBD@Z
     ??$?RW4LogSeverity@absl@@AEBQEBDHAEAY0CG@$$CBD@?$AtomicHook@P6AXW4LogSeverity@absl@@PEBDHAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z@base_internal@absl@@QEBAX$$QEAW4LogSeverity@2@AEBQEBD$$QEAHAEAY0CG@$$CBD@Z
-    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@Vstring_view@1@@Z
+    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$AbslStringify@VStringifySink@strings_internal@absl@@@absl@@YAXAEAVStringifySink@strings_internal@0@UHex@0@@Z
     ??$AddCordRep@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
     ??$AddCordRep@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
     ??$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
     ??$Append@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -73,8 +74,8 @@
     ??$Dispatch@PEBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
+    ??$Dispatch@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
-    ??$Dispatch@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
@@ -85,13 +86,14 @@
     ??$EmplaceBack@UPayload@status_internal@absl@@@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAAEAUPayload@status_internal@2@$$QEAU342@@Z
     ??$EmplaceBackSlow@AEBQEAVLogSink@absl@@@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@AEAAAEAPEAVLogSink@2@AEBQEAV32@@Z
     ??$EmplaceBackSlow@UPayload@status_internal@absl@@@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@AEAAAEAUPayload@status_internal@2@$$QEAU342@@Z
+    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAVStringifySink@01@AEBUHex@1@@Z
     ??$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
     ??$Fill@$0A@@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
-    ??$FindSubstitutions@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@Vstring_view@1@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
+    ??$FindSubstitutions@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV234@II@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$Fill@$00@012@AEAAXPEBV012@II@Z@@Z
@@ -99,12 +101,12 @@
     ??$ForEach@V<lambda_2>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_2>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_2>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_2>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$FormatConvertImpl@_N$0A@@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@01@_NVFormatConversionSpecImpl@01@PEAVFormatSinkImpl@01@@Z
+    ??$GenericCompare@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@HVCord@absl@@@absl@@YAHAEBVCord@0@0_K@Z
-    ??$GenericCompare@HVstring_view@absl@@@absl@@YAHAEBVCord@0@AEBVstring_view@0@_K@Z
+    ??$GenericCompare@_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YA_NAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@_NVCord@absl@@@absl@@YA_NAEBVCord@0@0_K@Z
-    ??$GenericCompare@_NVstring_view@absl@@@absl@@YA_NAEBVCord@0@AEBVstring_view@0@_K@Z
     ??$MakeCheckOpString@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV234@0PEBD@Z
-    ??$MakeCheckOpString@AEBVstring_view@absl@@AEBV12@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVstring_view@1@0PEBD@Z
+    ??$MakeCheckOpString@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@0PEBD@Z
     ??$MakeCheckOpString@DD@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@DDPEBD@Z
     ??$MakeCheckOpString@EE@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@EEPEBD@Z
     ??$MakeCheckOpString@MM@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@MMPEBD@Z
@@ -120,11 +122,11 @@
     ??$Merge@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@0@Z
     ??$NewImpl@$0BAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
     ??$NewImpl@$0EAAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
-    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
-    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
+    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$ParseFloat@$09@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
     ??$ParseFloat@$0BA@@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
-    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NVstring_view@1@UParsedFormatConsumer@ParsedFormatBase@01@@Z
+    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@UParsedFormatConsumer@ParsedFormatBase@01@@Z
     ??$PopDead@_J_K@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAPEAUHashtablezInfo@container_internal@2@_J_K@Z
     ??$Prepend@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$Register@AEB_JAEA_K@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@QEAAPEAUHashtablezInfo@container_internal@2@AEB_JAEA_K@Z
@@ -132,9 +134,9 @@
     ??$STLStringResizeUninitializedAmortized@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
     ??$SetEdge@$00@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
-    ??$StrFormat@DHHHHH_JIVstring_view@absl@@HPEBDV12@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBVstring_view@0@2AEBQEBD5@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@0@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@3@@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
+    ??$StrFormat@DHHHHH_JIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HPEBDV123@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@2AEBQEBD5@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@3@@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
     ??$ToChronoDuration@V?$duration@_JV?$ratio@$00$0DOI@@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@_JV?$ratio@$00$0DOI@@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$ToChronoDuration@V?$duration@_JV?$ratio@$00$0PECEA@@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@_JV?$ratio@$00$0PECEA@@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$__allocate_at_least@V?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YA?AU?$__allocation_result@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@@01@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@01@_K@Z
@@ -161,24 +163,24 @@
     ??$assign@PEBVFormatArgImpl@str_format_internal@absl@@$0A@@?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@QEAAXPEBVFormatArgImpl@str_format_internal@absl@@0@Z
     ??$assign@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@Cr@std@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@12@0PEAX@Z
     ??$assign@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$optional_data_base@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@optional_internal@absl@@IEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ??$combine@Vstring_view@absl@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBVstring_view@2@AEBH@Z
+    ??$combine@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Z
     ??$construct_at@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@AEBUpiecewise_construct_t@23@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@PEAU123@@Cr@std@@YAPEAU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@01@PEAU201@AEBUpiecewise_construct_t@01@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@01@$$QEAV?$tuple@$$V@01@@Z
     ??$construct_at@UPayload@status_internal@absl@@AEBU123@PEAU123@@Cr@std@@YAPEAUPayload@status_internal@absl@@PEAU234@AEBU234@@Z
     ??$construct_at@UTransition@cctz@time_internal@absl@@$$VPEAU1234@@Cr@std@@YAPEAUTransition@cctz@time_internal@absl@@PEAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@$$VPEAU1234@@Cr@std@@YAPEAUTransitionType@cctz@time_internal@absl@@PEAU2345@@Z
-    ??$construct_at@UViableSubstitution@strings_internal@absl@@AEAVstring_view@3@AEBV43@AEA_KPEAU123@@Cr@std@@YAPEAUViableSubstitution@strings_internal@absl@@PEAU234@AEAVstring_view@4@AEBV54@AEA_K@Z
+    ??$construct_at@UViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV456@AEA_KPEAU123@@Cr@std@@YAPEAUViableSubstitution@strings_internal@absl@@PEAU234@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@01@AEBV501@AEA_K@Z
     ??$emplace@$$V@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAUTransition@cctz@time_internal@absl@@@12@V?$__wrap_iter@PEBUTransition@cctz@time_internal@absl@@@12@@Z
     ??$emplace@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAUTransitionType@cctz@time_internal@absl@@@12@V?$__wrap_iter@PEBUTransitionType@cctz@time_internal@absl@@@12@@Z
     ??$emplace_back@$$V@?$__split_buffer@UTransition@cctz@time_internal@absl@@AEAV?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXXZ
     ??$emplace_back@$$V@?$__split_buffer@UTransitionType@cctz@time_internal@absl@@AEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXXZ
-    ??$emplace_back@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@AEAVstring_view@5@AEBV65@AEA_K@Z
+    ??$emplace_back@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV612@AEA_K@Z
     ??$emplace_back@HVcrc32c_t@absl@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUPrefixCrc@CrcCordState@crc_internal@absl@@$$QEAH$$QEAVcrc32c_t@6@@Z
     ??$find@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@@Z
     ??$find_first_non_full@X@container_internal@absl@@YA?AUFindInfo@01@AEBVCommonFields@01@_K@Z
-    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@_K@Z
-    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@_K@Z
     ??0?$RandenPool@E@random_internal@absl@@QEAA@XZ
@@ -197,15 +199,14 @@
     ??0BadStatusOrAccess@absl@@QEAA@AEBV01@@Z
     ??0BadStatusOrAccess@absl@@QEAA@VStatus@1@@Z
     ??0BlockingCounter@absl@@QEAA@H@Z
-    ??0ByAnyChar@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByAnyChar@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0ByLength@absl@@QEAA@_J@Z
-    ??0ByString@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByString@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0CRC@crc_internal@absl@@IEAA@XZ
     ??0CheckOpMessageBuilder@log_internal@absl@@QEAA@PEBD@Z
-    ??0ChunkIterator@Cord@absl@@AEAA@PEBV12@@Z
     ??0Condition@absl@@QEAA@P6A_NPEAX@Z0@Z
     ??0Condition@absl@@QEAA@PEB_N@Z
-    ??0Cord@absl@@AEAA@Vstring_view@1@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
+    ??0Cord@absl@@AEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
     ??0Cord@absl@@QEAA@AEBV01@@Z
     ??0CordzHandle@cord_internal@absl@@IEAA@_N@Z
     ??0CordzInfo@cord_internal@absl@@AEAA@PEAUCordRep@12@PEBV012@W4MethodIdentifier@CordzUpdateTracker@12@@Z
@@ -220,18 +221,17 @@
     ??0LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@2@@Z
     ??0LogMessageData@LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@3@VTime@3@@Z
     ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0OstreamView@LogMessage@log_internal@absl@@QEAA@AEAULogMessageData@123@@Z
-    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@Vstring_view@2@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@std@@@Z
+    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@5@@Z
     ??0Randen@random_internal@absl@@QEAA@XZ
     ??0Rep@GraphCycles@synchronization_internal@absl@@QEAA@XZ
     ??0ScopedMinLogLevel@log_internal@absl@@QEAA@W4LogSeverityAtLeast@2@@Z
     ??0ScopedStderrThreshold@absl@@QEAA@W4LogSeverityAtLeast@1@@Z
     ??0SpinLock@base_internal@absl@@QEAA@W4SchedulingMode@12@@Z
-    ??0Status@absl@@QEAA@W4StatusCode@1@Vstring_view@1@@Z
-    ??0StatusRep@status_internal@absl@@QEAA@W4StatusCode@2@Vstring_view@2@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@@Z
+    ??0Status@absl@@QEAA@W4StatusCode@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0StdcppWaiter@synchronization_internal@absl@@QEAA@XZ
     ??0Streamable@str_format_internal@absl@@QEAA@AEBVUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ??0TimeZoneLibC@cctz@time_internal@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -239,7 +239,6 @@
     ??0int128@absl@@QEAA@M@Z
     ??0int128@absl@@QEAA@N@Z
     ??0int128@absl@@QEAA@O@Z
-    ??0string_view@absl@@QEAA@PEBD@Z
     ??0uint128@absl@@QEAA@M@Z
     ??0uint128@absl@@QEAA@N@Z
     ??0uint128@absl@@QEAA@O@Z
@@ -271,17 +270,16 @@
     ??4?$optional_data@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@optional_internal@absl@@IEAAAEAV012@$$QEAV012@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@$$QEAV01@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@AEBV01@@Z
-    ??4Cord@absl@@QEAAAEAV01@Vstring_view@1@@Z
+    ??4Cord@absl@@QEAAAEAV01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@$$QEAV012@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@AEBV012@@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV345@@Z@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAVios_base@Cr@std@@AEAV345@@Z@Z
-    ??6LogMessage@log_internal@absl@@QEAAAEAV012@Vstring_view@2@@Z
+    ??6LogMessage@log_internal@absl@@QEAAAEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVCord@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVStatus@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vint128@0@@Z
-    ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vstring_view@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vuint128@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverity@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverityAtLeast@0@@Z
@@ -327,15 +325,15 @@
     ??_0Duration@absl@@QEAAAEAV01@N@Z
     ??_0Duration@absl@@QEAAAEAV01@_J@Z
     ??_1Duration@absl@@QEAAAEAV01@V01@@Z
-    ?AbortedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?AbortedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?AbslUnparseFlag@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@@Z
@@ -358,29 +356,29 @@
     ?AllocWithArena@LowLevelAlloc@base_internal@absl@@SAPEAX_KPEAUArena@123@@Z
     ?Allocate@?$MallocAdapter@V?$allocator@PEAVLogSink@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SA?AU?$Allocation@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@23@AEAV?$allocator@PEAVLogSink@absl@@@Cr@std@@_K@Z
     ?Allocate@?$MallocAdapter@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SA?AU?$Allocation@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@23@AEAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@Z
-    ?AlreadyExistsError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AlreadyExistsError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@?$AppendUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
     ?Append@Cord@absl@@QEAAX$$QEAV12@@Z
     ?Append@Cord@absl@@QEAAXAEBV12@@Z
-    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAX_KD@Z
-    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NVstring_view@4@@Z
-    ?Append@StringifySink@strings_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Append@StringifySink@strings_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@StringifySink@strings_internal@absl@@QEAAX_KD@Z
-    ?AppendArray@InlineRep@Cord@absl@@QEAAXVstring_view@3@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
+    ?AppendArray@InlineRep@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
     ?AppendLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
     ?AppendPack@str_format_internal@absl@@YAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAV345@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
-    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
-    ?AppendPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
+    ?AppendPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?AppendSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToInlined@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
-    ?ApplySubstitutions@strings_internal@absl@@YAHVstring_view@2@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@56@@Z
+    ?ApplySubstitutions@strings_internal@absl@@YAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@45@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AsciiStrToLower@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AsciiStrToUpper@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AssertHeld@Mutex@absl@@QEBAXXZ
@@ -392,31 +390,31 @@
     ?AsyncSignalSafeWriteToStderr@raw_log_internal@absl@@YAXPEBD_K@Z
     ?At@TimeZone@absl@@QEBA?AUCivilInfo@12@VTime@2@@Z
     ?At@TimeZone@absl@@QEBA?AUTimeInfo@12@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@@Z
-    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@Vstring_view@3@H@Z
+    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?Await@Mutex@absl@@QEAAXAEBVCondition@2@@Z
     ?AwaitCommon@Mutex@absl@@AEAA_NAEBVCondition@2@VKernelTimeout@synchronization_internal@2@@Z
     ?AwaitWithDeadline@Mutex@absl@@QEAA_NAEBVCondition@2@VTime@2@@Z
     ?AwaitWithTimeout@Mutex@absl@@QEAA_NAEBVCondition@2@VDuration@2@@Z
-    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Base64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Base64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?Base64EscapeInternal@strings_internal@absl@@YA_KPEBE_KPEAD1PEBD_N@Z
-    ?Base64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?BindWithPack@str_format_internal@absl@@YA_NPEBUUnboundConversion@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@PEAVBoundConversion@12@@Z
     ?Block@Barrier@absl@@QEAA_NXZ
     ?Block@Mutex@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?BreakTime@TimeZoneInfo@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?BreakTime@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?Build@Header@TimeZoneInfo@cctz@time_internal@absl@@QEAA_NAEBUtzhead@@@Z
-    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?CPUSupportsRandenHwAes@random_internal@absl@@YA_NXZ
-    ?CUnescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@1@Z
+    ?CUnescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@1@Z
     ?CalculateBase64EscapedLenInternal@strings_internal@absl@@YA_K_K_N@Z
     ?CallVoidPtrFunction@Condition@absl@@CA_NPEBV12@@Z
-    ?CancelledError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEVstring_view@2@0E@Z
-    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
+    ?CancelledError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0E@Z
+    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
     ?Ceil@absl@@YA?AVDuration@1@V21@0@Z
     ?CheckInvariants@GraphCycles@synchronization_internal@absl@@QEBA_NXZ
     ?CheckstrcasecmpfalseImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
@@ -436,13 +434,14 @@
     ?CombineContiguousImpl@MixingHashState@hash_internal@absl@@CA_K_KPEBE0U?$integral_constant@H$07@Cr@std@@@Z
     ?CombineLargeContiguousImpl32@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
     ?CombineLargeContiguousImpl64@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
-    ?Compare@Cord@absl@@QEBAHVstring_view@2@@Z
+    ?Compare@Cord@absl@@QEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?CompareImpl@Cord@absl@@AEBAHAEBV12@@Z
     ?CompareSlowPath@Cord@absl@@AEBAHAEBV12@_K1@Z
+    ?CompareSlowPath@Cord@absl@@AEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K1@Z
     ?Compute@CrcNonTemporalMemcpyAVXEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@CrcNonTemporalMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@FallbackCrcMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
-    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@Vstring_view@1@@Z
+    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Concat@CRC@crc_internal@absl@@UEAAXPEAII_K@Z
     ?ConcatCrc32c@absl@@YA?AVcrc32c_t@1@V21@0_K@Z
     ?Consume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
@@ -462,7 +461,7 @@
     ?CopyTo@InlineRep@Cord@absl@@QEBAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyToArraySlowPath@Cord@absl@@AEBAXPEAD@Z
     ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXD_KW4StringType@123@@Z
-    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXVstring_view@3@W4StringType@123@@Z
+    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4StringType@123@@Z
     ?Crash@Helper@internal_statusor@absl@@SAXAEBVStatus@3@@Z
     ?Crc32c@CRC@crc_internal@absl@@SAPEAV123@XZ
     ?CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z
@@ -473,8 +472,8 @@
     ?CreateThreadIdentity@synchronization_internal@absl@@YAPEAUThreadIdentity@base_internal@2@XZ
     ?CurrentThreadIdentityIfPresent@base_internal@absl@@YAPEAUThreadIdentity@12@XZ
     ?DataLength@Header@TimeZoneInfo@cctz@time_internal@absl@@QEBA_K_K@Z
-    ?DataLossError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?DeadlineExceededError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?DataLossError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?DeadlineExceededError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?DecodeFrom@ProtoField@log_internal@absl@@QEAA_NPEAV?$Span@$$CBD@3@@Z
     ?DecodeWaitCycles@SpinLock@base_internal@absl@@KA_JI@Z
     ?DecrementCount@BlockingCounter@absl@@QEAA_NXZ
@@ -501,7 +500,7 @@
     ?Digits10@?$BigUnsigned@$03@strings_internal@absl@@SAHXZ
     ?Digits10@?$BigUnsigned@$0FE@@strings_internal@absl@@SAHXZ
     ?DropDeletesWithoutResize@container_internal@absl@@YAXAEAVCommonFields@12@AEBUPolicyFunctions@12@PEAX@Z
-    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z
+    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@CAXPEBDH000@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@CAXPEBDPEBX@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@CAXPEBDPEBX_J@Z
@@ -509,8 +508,8 @@
     ?DummyFunction@?$AtomicHook@P6AXXZ@base_internal@absl@@CAXXZ
     ?DummyFunction@?$AtomicHook@P6AX_J@Z@base_internal@absl@@CAX_J@Z
     ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
     ?DumpPCAndFrameSizesAndStackTrace@debugging_internal@absl@@YAXQEAXQEBQEAXQEAHHH_NP6AXPEBDPEAX@Z5@Z
     ?DumpStackTrace@debugging_internal@absl@@YAXHH_NP6AXPEBDPEAX@Z2@Z
     ?DurationFromTimespec@absl@@YA?AVDuration@1@Utimespec@@@Z
@@ -534,17 +533,17 @@
     ?EncodeVarint@log_internal@absl@@YA_N_K0PEAV?$Span@D@2@@Z
     ?EncodeWaitCycles@SpinLock@base_internal@absl@@KAI_J0@Z
     ?EndsWith@Cord@absl@@QEBA_NAEBV12@@Z
-    ?EndsWith@Cord@absl@@QEBA_NVstring_view@2@@Z
-    ?EndsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?EqualsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?EndsWith@Cord@absl@@QEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?EndsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?EqualsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?EqualsImpl@Cord@absl@@AEBA_NAEBV12@_K@Z
-    ?EqualsImpl@Cord@absl@@AEBA_NVstring_view@2@_K@Z
+    ?EqualsImpl@Cord@absl@@AEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?EqualsSlow@Status@absl@@CA_NAEBV12@0@Z
     ?EquivTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEBA_NEE@Z
     ?Erase@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@0@Z
     ?EraseMetaOnly@container_internal@absl@@YAXAEAVCommonFields@12@PEAW4ctrl_t@12@_K@Z
-    ?ErasePayload@Status@absl@@QEAA_NVstring_view@2@@Z
-    ?ErrnoToStatus@absl@@YA?AVStatus@1@HVstring_view@1@@Z
+    ?ErasePayload@Status@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ErrnoToStatus@absl@@YA?AVStatus@1@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ErrnoToStatusCode@absl@@YA?AW4StatusCode@1@H@Z
     ?Eval@Condition@absl@@QEBA_NXZ
     ?ExitOnDFatal@log_internal@absl@@YA_NXZ
@@ -553,14 +552,14 @@
     ?ExtendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?ExtendByZeroesImpl@CRC32@crc_internal@absl@@CAXPEAI_KQEBI2@Z
     ?ExtendCrc32cByZeroes@absl@@YA?AVcrc32c_t@1@V21@_K@Z
-    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@Vstring_view@2@@Z
+    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NXZ
     ?ExtractAppendBuffer@CordRepBtree@cord_internal@absl@@SA?AUExtractResult@CordRep@23@PEAV123@_K@Z
     ?ExtractFront@CordRepBtree@cord_internal@absl@@CAPEAUCordRep@23@PEAV123@@Z
     ?FDivDuration@absl@@YANVDuration@1@0@Z
     ?FailQuietly@LogMessage@log_internal@absl@@KAXXZ
     ?FailWithoutStackTrace@LogMessage@log_internal@absl@@KAXXZ
-    ?FailedPreconditionError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?FailedPreconditionError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?FailureSignalToString@debugging_internal@absl@@YAPEBDH@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADHPEAD@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADIPEAD@Z
@@ -575,10 +574,11 @@
     ?FillWordTable@CRCImpl@crc_internal@absl@@SAXIIHPEAY0BAA@I@Z
     ?FillZeroesTable@CRCImpl@crc_internal@absl@@SAHIPEAY0BAA@I@Z
     ?FinalizeEncodingAndFormat@LogMessageData@LogMessage@log_internal@absl@@QEAAXXZ
-    ?Find@ByAnyChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByLength@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByString@absl@@QEBA?AVstring_view@2@V32@_K@Z
+    ?Find@ByAnyChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByLength@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByString@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?FindPath@GraphCycles@synchronization_internal@absl@@QEBAHUGraphId@23@0HQEAU423@@Z
     ?FindSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
     ?FindTailSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
@@ -590,13 +590,14 @@
     ?FlagsToString@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4Flags@12@@Z
     ?FlatOverhead@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?FlatTagToLength@CordTestAccess@strings_internal@absl@@SA_KE@Z
-    ?FlattenSlowPath@Cord@absl@@AEAA?AVstring_view@2@XZ
+    ?FlattenSlowPath@Cord@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Floor@absl@@YA?AVDuration@1@V21@0@Z
+    ?Flush@FormatSinkImpl@str_format_internal@absl@@QEAAXXZ
     ?Flush@LogMessage@log_internal@absl@@IEAAXXZ
     ?Flush@LogSink@absl@@UEAAXXZ
     ?FlushLogSinks@log_internal@absl@@YAXXZ
-    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXVstring_view@absl@@@Z@2@@Z
-    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXVstring_view@absl@@AEBVCord@2@@Z@2@@Z
+    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@2@@Z
+    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@absl@@@Z@2@@Z
     ?ForVar2@CheckOpMessageBuilder@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForgetDeadlockInfo@Mutex@absl@@QEAAXXZ
     ?FormatCivilTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
@@ -612,7 +613,7 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAA@@12@UVoidPtr@12@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAE@@12@PEBDVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@Vstring_view@2@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
+    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@MVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@NVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@OVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
@@ -627,12 +628,12 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_JVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_KVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatDuration@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
-    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IVstring_view@2@HW4PrefixFormat@12@3@Z
-    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IVstring_view@2@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
+    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@HW4PrefixFormat@12@3@Z
+    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
     ?FormatPack@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
+    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@VTime@1@VTimeZone@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@VTimeZone@1@@Z
-    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@VTime@1@VTimeZone@1@@Z
     ?FormatUntyped@str_format_internal@absl@@YA_NVFormatRawSinkImpl@12@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?FprintF@str_format_internal@absl@@YAHPEAU_iobuf@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?Frequency@UnscaledCycleClock@base_internal@absl@@CANXZ
@@ -660,7 +661,7 @@
     ?GetDebugStackTraceHook@debugging_internal@absl@@YAP6AXQEBQEAXHP6AXPEBDPEAX@Z2@ZXZ
     ?GetEstimatedFairShareMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
     ?GetEstimatedMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
-    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAVstring_view@2@@Z
+    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetHashtablezMaxSamples@container_internal@absl@@YA_KXZ
     ?GetHashtablezSampleParameter@container_internal@absl@@YAHXZ
     ?GetId@GraphCycles@synchronization_internal@absl@@QEAA?AUGraphId@23@PEAX@Z
@@ -668,7 +669,7 @@
     ?GetKeys@RandenSlow@random_internal@absl@@SAPEBXXZ
     ?GetParentMethod@CordzInfo@cord_internal@absl@@CA?AW4MethodIdentifier@CordzUpdateTracker@23@PEBV123@@Z
     ?GetParentStack@CordzInfo@cord_internal@absl@@QEBA?AV?$Span@QEAX@3@XZ
-    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@Vstring_view@2@@Z
+    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetPrependBuffer@CordRepRing@cord_internal@absl@@QEAA?AV?$Span@D@3@_K@Z
     ?GetProgramCounter@debugging_internal@absl@@YAPEAXQEAX@Z
     ?GetSaltMaterial@random_internal@absl@@YA?AV?$optional@I@2@XZ
@@ -679,7 +680,7 @@
     ?GetStackTrace@GraphCycles@synchronization_internal@absl@@QEAAHUGraphId@23@PEAPEAPEAX@Z
     ?GetStackTrace@absl@@YAHPEAPEAXHH@Z
     ?GetStackTraceWithContext@absl@@YAHPEAPEAXHHPEBXPEAH@Z
-    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@ZXZ
+    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@ZXZ
     ?GetStride@ExponentialBiased@profiling_internal@absl@@QEAA_J_J@Z
     ?GetTID@base_internal@absl@@YAIXZ
     ?GetTestEngine@CrcMemcpy@crc_internal@absl@@SA?AV?$unique_ptr@VCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@Cr@std@@HH@Z
@@ -695,7 +696,7 @@
     ?HasNode@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@@Z
     ?HasRandenHwAesImplementation@random_internal@absl@@YA_NXZ
     ?Head@CordzInfo@cord_internal@absl@@SAPEAV123@AEBVCordzSnapshot@23@@Z
-    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?IDivDuration@time_internal@absl@@YA_J_NVDuration@2@1PEAV32@@Z
     ?In@Time@absl@@QEBA?AUBreakdown@12@VTimeZone@2@@Z
     ?InMillisecondsFromNow@KernelTimeout@synchronization_internal@absl@@QEBAKXZ
@@ -704,17 +705,18 @@
     ?InitDiscreteDistribution@random_internal@absl@@YA?AV?$vector@U?$pair@N_K@Cr@std@@V?$allocator@U?$pair@N_K@Cr@std@@@23@@Cr@std@@PEAV?$vector@NV?$allocator@N@Cr@std@@@45@@Z
     ?InitFrom@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXAEBV123@@Z
     ?InitTables@CRC32@crc_internal@absl@@UEAAXXZ
+    ?InitTree@ChunkIterator@Cord@absl@@AEAAXPEAUCordRep@cord_internal@3@@Z
     ?InitWhat@BadStatusOrAccess@absl@@AEBAXXZ
     ?Initialize@ExponentialBiased@profiling_internal@absl@@AEAAXXZ
-    ?InitializeCordRepExternal@cord_internal@absl@@YAXVstring_view@2@PEAUCordRepExternal@12@@Z
+    ?InitializeCordRepExternal@cord_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAUCordRepExternal@12@@Z
     ?InitializeSymbolizer@absl@@YAXPEBD@Z
     ?InsertEdge@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@0@Z
     ?InstallFailureSignalHandler@absl@@YAXAEBUFailureSignalHandlerOptions@1@@Z
     ?InternalAttemptToUseMutexInFatalSignalHandler@Mutex@absl@@SAXXZ
     ?InternalCondVarPoke@StdcppWaiter@synchronization_internal@absl@@AEAAXXZ
     ?InternalCondVarPoke@Win32Waiter@synchronization_internal@absl@@AEAAXXZ
-    ?InternalError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?InvalidArgumentError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InternalError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?InvalidArgumentError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsAborted@absl@@YA_NAEBVStatus@1@@Z
     ?IsAlreadyExists@absl@@YA_NAEBVStatus@1@@Z
     ?IsCancelled@absl@@YA_NAEBVStatus@1@@Z
@@ -722,8 +724,8 @@
     ?IsDeadlineExceeded@absl@@YA_NAEBVStatus@1@@Z
     ?IsFailedPrecondition@absl@@YA_NAEBVStatus@1@@Z
     ?IsFatal@LogMessage@log_internal@absl@@AEBA_NXZ
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAVstring_view@3@@Z
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAVstring_view@3@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsHashtablezEnabled@container_internal@absl@@YA_NXZ
     ?IsInitialized@log_internal@absl@@YA_NXZ
     ?IsInternal@absl@@YA_NAEBVStatus@1@@Z
@@ -812,33 +814,33 @@
     ?NominalCPUFrequency@base_internal@absl@@YANXZ
     ?Normalize@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?NormalizedPrefixCrcAtNthChunk@CrcCordState@crc_internal@absl@@QEBA?AUPrefixCrc@123@_K@Z
-    ?NotFoundError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?NotFoundError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Notify@Notification@absl@@QEAAXXZ
     ?Now@CycleClock@base_internal@absl@@SA_JXZ
     ?Now@UnscaledCycleClock@base_internal@absl@@CA_JXZ
     ?Now@absl@@YA?AVTime@1@XZ
     ?NumCPUs@base_internal@absl@@YAHXZ
     ?OneTimeInitThreadIdentity@synchronization_internal@absl@@YAXPEAUThreadIdentity@base_internal@2@@Z
-    ?OutOfRangeError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseDuration@absl@@YA_NVstring_view@1@PEAVDuration@1@@Z
+    ?OutOfRangeError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseDuration@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVDuration@1@PEAV234@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVTime@1@PEAV234@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParsePosixSpec@cctz@time_internal@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAUPosixTimeZone@123@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?PermissionDeniedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?PermissionDeniedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Poison@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?Poke@StdcppWaiter@synchronization_internal@absl@@QEAAXXZ
     ?Poke@Win32Waiter@synchronization_internal@absl@@QEAAXXZ
@@ -848,12 +850,12 @@
     ?PrepareToDie@LogMessage@log_internal@absl@@AEAAXXZ
     ?PrepareToModify@Status@absl@@AEAAXXZ
     ?Prepend@Cord@absl@@QEAAXAEBV12@@Z
-    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?PrependArray@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?PrependArray@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
-    ?PrependPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?PrependPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -865,14 +867,14 @@
     ?Print@Streamable@str_format_internal@absl@@QEBAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV456@@Z
     ?Ptr@GraphCycles@synchronization_internal@absl@@QEAAPEAXUGraphId@23@@Z
     ?PushDead@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAXPEAUHashtablezInfo@container_internal@3@@Z
-    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NVstring_view@3@HH_N@Z
+    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HH_N@Z
     ?RawEnableLogPrefix@log_internal@absl@@YAX_N@Z
     ?RawLog@raw_log_internal@absl@@YAXW4LogSeverity@2@PEBDH1ZZ
     ?RawLoggingFullySupported@raw_log_internal@absl@@YA_NXZ
     ?RawSetMinLogLevel@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?RawSetStderrThreshold@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?Read@CordRepBtreeNavigator@cord_internal@absl@@QEAA?AUReadResult@123@_K0@Z
-    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K0AEAPEAUCordRep@23@@Z
+    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K0AEAPEAUCordRep@23@@Z
     ?ReadDigits@?$BigUnsigned@$03@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadDigits@?$BigUnsigned@$0FE@@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadFloatMantissa@?$BigUnsigned@$03@strings_internal@absl@@QEAAHAEBUParsedFloat@23@H@Z
@@ -918,13 +920,13 @@
     ?RemoveSuffix@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@_K1@Z
     ?ResetToBuiltinUTC@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NAEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?Resize@?$ResizeUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
-    ?ResourceExhaustedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ResourceExhaustedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Rethrow@variant_internal@absl@@YAXXZ
     ?ReverseConsume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
     ?SafeToDelete@CordzHandle@cord_internal@absl@@QEBA_NXZ
     ?SampleSlow@container_internal@absl@@YAPEAUHashtablezInfo@12@AEAUSamplingState@12@_K@Z
     ?Scramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
-    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K@Z
+    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?SendToLog@LogMessage@log_internal@absl@@AEAAXXZ
     ?SetCapacityForTesting@CordRepRing@cord_internal@absl@@QEAAX_K@Z
     ?SetCrcCordState@Cord@absl@@AEAAXVCrcCordState@crc_internal@2@@Z
@@ -940,14 +942,14 @@
     ?SetHashtablezSampleParameter@container_internal@absl@@YAXH@Z
     ?SetHashtablezSampleParameterInternal@container_internal@absl@@YAXH@Z
     ?SetInitialized@log_internal@absl@@YAXXZ
-    ?SetLogBacktraceLocation@absl@@YAXVstring_view@1@H@Z
+    ?SetLogBacktraceLocation@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?SetLoggingGlobalsListener@log_internal@absl@@YAXP6AXXZ@Z
     ?SetMaxFramesInLogStackTrace@log_internal@absl@@YAXH@Z
     ?SetMinLogLevel@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetMutexDeadlockDetectionMode@absl@@YAXW4OnDeadlockCycle@1@@Z
-    ?SetPayload@Status@absl@@QEAAXVstring_view@2@VCord@2@@Z
+    ?SetPayload@Status@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VCord@2@@Z
     ?SetStackUnwinder@absl@@YAXP6AHPEAPEAXPEAHHHPEBX1@Z@Z
-    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@Z@Z
+    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@Z
     ?SetStderrThreshold@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetSuppressSigabortTrace@log_internal@absl@@YA_N_N@Z
     ?SetThreadBlockedCounter@PerThreadSem@synchronization_internal@absl@@SAXPEAU?$atomic@H@Cr@std@@@Z
@@ -961,14 +963,14 @@
     ?ShouldLog@LogEveryNState@log_internal@absl@@QEAA_NH@Z
     ?ShouldLog@LogEveryPow2State@log_internal@absl@@QEAA_NXZ
     ?ShouldLog@LogFirstNState@log_internal@absl@@QEAA_NH@Z
-    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NVstring_view@2@H@Z
+    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?ShouldPrependLogPrefix@absl@@YA_NXZ
     ?ShouldSymbolizeLogStackTrace@log_internal@absl@@YA_NXZ
     ?Signal@CondVar@absl@@QEAAXXZ
     ?SignalAll@CondVar@absl@@QEAAXXZ
-    ?SimpleAtob@absl@@YA_NVstring_view@1@PEA_N@Z
-    ?SimpleAtod@absl@@YA_NVstring_view@1@PEAN@Z
-    ?SimpleAtof@absl@@YA_NVstring_view@1@PEAM@Z
+    ?SimpleAtob@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_N@Z
+    ?SimpleAtod@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAN@Z
+    ?SimpleAtof@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAM@Z
     ?SixDigitsToBuffer@numbers_internal@absl@@YA_KNPEAD@Z
     ?SizeofCordRepExternal@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?SizeofCordRepSubstring@CordTestAccess@strings_internal@absl@@SA_KXZ
@@ -980,7 +982,7 @@
     ?SpinLockWait@base_internal@absl@@YAIPEAU?$atomic@I@Cr@std@@HQEBUSpinLockWaitTransition@12@W4SchedulingMode@12@@Z
     ?SpinLoop@SpinLock@base_internal@absl@@AEAAIXZ
     ?StackTraceWorksForTest@debugging_internal@absl@@YA_NXZ
-    ?StartsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?StartsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?StatusCodeToString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4StatusCode@1@@Z
     ?StderrThreshold@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?SteadyClockNow@KernelTimeout@synchronization_internal@absl@@CA_JXZ
@@ -991,16 +993,16 @@
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@000@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@00@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@D@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ?StrError@base_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@H@Z
-    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
+    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
     ?SubLength@CordRepRing@cord_internal@absl@@AEAAXI_K@Z
     ?SubRing@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@_K11@Z
     ?SubTree@CordRepBtree@cord_internal@absl@@QEAAPEAUCordRep@23@_K0@Z
     ?Subcord@Cord@absl@@QEBA?AV12@_K0@Z
-    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@PEBV62@_K@Z
+    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@PEBV645@_K@Z
     ?Summarize@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?SupportsArmCRC32PMULL@crc_internal@absl@@YA_NXZ
     ?SuppressSigabortTrace@log_internal@absl@@YA_NXZ
@@ -1083,12 +1085,12 @@
     ?TryRemove@Mutex@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?UTC@Impl@time_zone@cctz@time_internal@absl@@SA?AV2345@XZ
     ?UTCImpl@Impl@time_zone@cctz@time_internal@absl@@CAPEBV12345@XZ
-    ?UnauthenticatedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnavailableError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnauthenticatedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnavailableError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UnextendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?UnextendCrc32cByZeroes@crc_internal@absl@@YA?AVcrc32c_t@2@V32@_K@Z
-    ?UnimplementedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnknownError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnimplementedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnknownError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Unlock@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?Unlock@Mutex@absl@@QEAAXXZ
     ?UnlockSlow@Mutex@absl@@AEAAXPEAUSynchWaitParams@2@@Z
@@ -1101,8 +1103,8 @@
     ?Unscramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
     ?Untrack@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?UpdateStackTrace@GraphCycles@synchronization_internal@absl@@QEAAXUGraphId@23@HP6AHPEAPEAXH@Z@Z
-    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?Version@TimeZoneInfo@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@ZoneInfoSource@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
@@ -1118,17 +1120,17 @@
     ?WaitWithTimeout@CondVar@absl@@QEAA_NPEAVMutex@2@VDuration@2@@Z
     ?Wakeup@CondVar@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?Wakeup@Mutex@absl@@AEAAPEAUPerThreadSynch@base_internal@2@PEAU342@@Z
-    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?WebSafeBase64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?WebSafeBase64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?WebSafeBase64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?WebSafeBase64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?WithMetadataFrom@LogMessage@log_internal@absl@@QEAAAEAV123@AEBVLogEntry@3@@Z
     ?WithPerror@LogMessage@log_internal@absl@@QEAAAEAV123@XZ
     ?WithThreadID@LogMessage@log_internal@absl@@QEAAAEAV123@I@Z
     ?WithTimestamp@LogMessage@log_internal@absl@@QEAAAEAV123@VTime@3@@Z
     ?WithVerbosity@LogMessage@log_internal@absl@@QEAAAEAV123@H@Z
-    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?Write@FILERawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?WriteToStderr@log_internal@absl@@YAXVstring_view@2@W4LogSeverity@2@@Z
+    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FILERawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?WriteToStderr@log_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4LogSeverity@2@@Z
     ?__add_back_capacity@?$deque@PEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAX_K@Z
@@ -1159,15 +1161,7 @@
     ?effective_impl@time_zone@cctz@time_internal@absl@@AEBAAEBVImpl@1234@XZ
     ?engines@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@4@PEIAXPEIBX_KV54@_N@Z@4UArchSpecificEngines@234@B
     ?erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@2@PEBU342@@Z
-    ?find@string_view@absl@@QEBA_KD_K@Z
-    ?find@string_view@absl@@QEBA_KV12@_K@Z
     ?find_first_non_full_outofline@container_internal@absl@@YA?AUFindInfo@12@AEBVCommonFields@12@_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KV12@_K@Z
     ?fixed_time_zone@cctz@time_internal@absl@@YA?AVtime_zone@123@AEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?format@detail@cctz@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV567@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@67@AEBV?$duration@_JV?$ratio@$00$0DINHOKEMGIAAA@@Cr@std@@@967@AEBVtime_zone@234@@Z
     ?from_chars@absl@@YA?AUfrom_chars_result@1@PEBD0AEAMW4chars_format@1@@Z
@@ -1231,14 +1225,12 @@
     ?reset@?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QEAAXPEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Z
     ?resize@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
     ?resize@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
-    ?rfind@string_view@absl@@QEBA_KD_K@Z
-    ?rfind@string_view@absl@@QEBA_KV12@_K@Z
-    ?safe_strto128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVint128@2@H@Z
-    ?safe_strto32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAHH@Z
-    ?safe_strto64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_JH@Z
-    ?safe_strtou128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVuint128@2@H@Z
-    ?safe_strtou32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAIH@Z
-    ?safe_strtou64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_KH@Z
+    ?safe_strto128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVint128@2@H@Z
+    ?safe_strto32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAHH@Z
+    ?safe_strto64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_JH@Z
+    ?safe_strtou128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVuint128@2@H@Z
+    ?safe_strtou32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAIH@Z
+    ?safe_strtou64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_KH@Z
     ?set_cordz_mean_interval@cord_internal@absl@@YAXH@Z
     ?set_inline_data@InlineData@cord_internal@absl@@QEAAXPEBD_K@Z
     ?shallow_subcords_enabled@cord_internal@absl@@3U?$atomic@_N@Cr@std@@A

third_party/abseil-cpp/symbols_x64_dbg.def

diff --git a/third_party/abseil-cpp/symbols_x64_dbg.def b/third_party/abseil-cpp/symbols_x64_dbg.def
index 9037583..ee7a50e 100644
--- a/third_party/abseil-cpp/symbols_x64_dbg.def
+++ b/third_party/abseil-cpp/symbols_x64_dbg.def
@@ -40,7 +40,6 @@
     ??$?0$$TX@?$__compressed_pair_elem@PEAVFormatArgImpl@str_format_internal@absl@@$0A@$0A@@Cr@std@@QEAA@$$QEA$$T@Z
     ??$?0$$V@?$__temp_value@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@AEAV?$allocator@UTransition@cctz@time_internal@absl@@@12@@Z
     ??$?0$$V@?$__temp_value@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@AEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@@Z
-    ??$?0$$Y_And@Cr@std@@$0A@@?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@QEAA@AEBVstring_view@absl@@AEBH@Z
     ??$?0$00X@?$__compressed_pair@U?$__hash_node_base@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@23@@Cr@std@@QEAA@XZ
     ??$?0$00X@?$unique_ptr@$$BY0A@PEAU?$__hash_node_base@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@V?$__bucket_list_deallocator@V?$allocator@PEAU?$__hash_node_base@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@Cr@std@@@23@@Cr@std@@QEAA@XZ
     ??$?0$00X@?$unique_ptr@$$CBVImpl@time_zone@cctz@time_internal@absl@@U?$default_delete@$$CBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@PEBVImpl@time_zone@cctz@time_internal@absl@@@Z
@@ -57,7 +56,6 @@
     ??$?0$00X@?$unique_ptr@VTimeZoneInfo@cctz@time_internal@absl@@U?$default_delete@VTimeZoneInfo@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@PEAVTimeZoneInfo@cctz@time_internal@absl@@@Z
     ??$?0$00X@?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@$$T@Z
     ??$?0$00X@?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA@PEAVZoneInfoSource@cctz@time_internal@absl@@@Z
-    ??$?0$0A@$00$$ZAEBVstring_view@absl@@AEBH$$Z$S$$Z$$V$$ZAEBV01@AEBH@?$__tuple_impl@U?$__tuple_indices@$0A@$00@Cr@std@@AEBVstring_view@absl@@AEBH@Cr@std@@QEAA@U?$__tuple_indices@$0A@$00@12@U?$__tuple_types@AEBVstring_view@absl@@AEBH@12@U?$__tuple_indices@$S@12@U?$__tuple_types@$$V@12@AEBVstring_view@absl@@AEBH@Z
     ??$?0AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAPEAPEAPEBV01234@$0A@@?$pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV12345@@Cr@std@@QEAA@AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@0@Z
     ??$?0AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV01234@$0A@@?$pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV12345@@Cr@std@@QEAA@AEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@$$QEAPEAPEAPEBV34567@@Z
     ??$?0AEAPEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@AEAPEAPEAU0123@$0A@@?$pair@PEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@PEAPEAU1234@@Cr@std@@QEAA@AEAPEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@0@Z
@@ -117,7 +115,6 @@
     ??$?0AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$$Z$$V@?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@QEAA@Upiecewise_construct_t@12@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@V?$tuple@$$V@12@@Z
     ??$?0AEBVCord@absl@@$0A@@?$optional@VCord@absl@@@absl@@QEAA@AEBVCord@1@@Z
     ??$?0AEBVCord@absl@@@?$optional_data_dtor_base@VCord@absl@@$0A@@optional_internal@absl@@IEAA@Uin_place_t@2@AEBVCord@2@@Z
-    ??$?0AEBVstring_view@absl@@X@?$__tuple_leaf@$0A@AEBVstring_view@absl@@$0A@@Cr@std@@QEAA@AEBVstring_view@absl@@@Z
     ??$?0D@FormatArgImpl@str_format_internal@absl@@QEAA@AEBD@Z
     ??$?0H@FormatArgImpl@str_format_internal@absl@@QEAA@AEBH@Z
     ??$?0HU__default_init_tag@Cr@std@@@?$__compressed_pair@_KV?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QEAA@$$QEAH$$QEAU__default_init_tag@12@@Z
@@ -210,7 +207,6 @@
     ??$?0V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@AEA_N$0A@@?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@_N@Cr@std@@QEAA@$$QEAV?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@12@AEA_N@Z
     ??$?0V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@Cr@std@@X@?$__compressed_pair_elem@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@Cr@std@@$00$0A@@Cr@std@@QEAA@$$QEAV?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@12@@Z
     ??$?0V?$allocator@D@Cr@std@@@AlphaNum@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ??$?0V?$allocator@D@Cr@std@@@string_view@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$allocator@H@Cr@std@@@?$Storage@V?$allocator@H@Cr@std@@$0A@$00@internal_compressed_tuple@container_internal@absl@@QEAA@Uin_place_t@3@$$QEAV?$allocator@H@Cr@std@@@Z
     ??$?0V?$allocator@H@Cr@std@@I$00@?$CompressedTuple@V?$allocator@H@Cr@std@@_K@container_internal@absl@@QEAA@$$QEAV?$allocator@H@Cr@std@@$$QEAI@Z
     ??$?0V?$allocator@H@Cr@std@@I@?$CompressedTupleImpl@V?$CompressedTuple@V?$allocator@H@Cr@std@@_K@container_internal@absl@@U?$integer_sequence@_K$0A@$00@3@$00@internal_compressed_tuple@container_internal@absl@@QEAA@Uin_place_t@3@$$QEAV?$allocator@H@Cr@std@@$$QEAI@Z
@@ -226,6 +222,8 @@
     ??$?0V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QEAA@PEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAA@$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QEAA@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ??$?0V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@QEAA@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$?0V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XV012@$0A@@?$Span@$$CBD@absl@@QEAA@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$?0V?$reverse_iterator@PEAPEAVCordzHandle@cord_internal@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PEAPEAVCordzHandle@cord_internal@absl@@@Cr@std@@V123@@Cr@std@@QEAA@$$QEAV?$reverse_iterator@PEAPEAVCordzHandle@cord_internal@absl@@@12@0@Z
     ??$?0V?$reverse_iterator@PEAPEAVLogSink@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PEAPEAVLogSink@absl@@@Cr@std@@V123@@Cr@std@@QEAA@$$QEAV?$reverse_iterator@PEAPEAVLogSink@absl@@@12@0@Z
     ??$?0V?$reverse_iterator@PEAPEBVCordzHandle@cord_internal@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PEAPEBVCordzHandle@cord_internal@absl@@@Cr@std@@V123@@Cr@std@@QEAA@$$QEAV?$reverse_iterator@PEAPEBVCordzHandle@cord_internal@absl@@@12@0@Z
@@ -238,8 +236,6 @@
     ??$?0VFILERawSink@str_format_internal@absl@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QEAA@PEAVFILERawSink@12@@Z
     ??$?0VFallbackCrcMemcpyEngine@crc_internal@absl@@@?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@QEAA@AEBU?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@12@PEAX@Z
     ??$?0VFallbackCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@XX@?$unique_ptr@VCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAA@$$QEAV?$unique_ptr@VFallbackCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@12@@Z
-    ??$?0Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@QEAA@AEBVstring_view@2@@Z
-    ??$?0Vstring_view@absl@@XV01@$0A@@?$Span@$$CBD@absl@@QEAA@AEBVstring_view@1@@Z
     ??$?0_J@FormatArgImpl@str_format_internal@absl@@QEAA@AEB_J@Z
     ??$?0_K$0A@@?$optional@_K@absl@@QEAA@$$QEA_K@Z
     ??$?0_K@?$optional_data_dtor_base@_K$00@optional_internal@absl@@IEAA@Uin_place_t@2@$$QEA_K@Z
@@ -280,7 +276,6 @@
     ??$?9PEAUViableSubstitution@strings_internal@absl@@PEAU012@@Cr@std@@YA_NAEBV?$reverse_iterator@PEAUViableSubstitution@strings_internal@absl@@@01@0@Z
     ??$?9PEBQEAVLogSink@absl@@PEAPEAV01@@Cr@std@@YA_NAEBV?$__wrap_iter@PEBQEAVLogSink@absl@@@01@AEBV?$__wrap_iter@PEAPEAVLogSink@absl@@@01@@Z
     ??$?9PEBUConversionItem@ParsedFormatBase@str_format_internal@absl@@@Cr@std@@YA_NAEBV?$__wrap_iter@PEBUConversionItem@ParsedFormatBase@str_format_internal@absl@@@01@0@Z
-    ??$?BV?$allocator@D@Cr@std@@@string_view@absl@@QEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ??$?DH@absl@@YA?AVDuration@0@HV10@@Z
     ??$?DH@absl@@YA?AVDuration@0@V10@H@Z
     ??$?DN@absl@@YA?AVDuration@0@NV10@@Z
@@ -342,8 +337,8 @@
     ??$?RW4LogSeverity@absl@@AEBQEBDHV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$AtomicHook@P6AXW4LogSeverity@absl@@PEBDHAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z@base_internal@absl@@QEBAX$$QEAW4LogSeverity@2@AEBQEBD$$QEAH$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?VVLogMessage@log_internal@absl@@@Voidify@log_internal@absl@@QEHBAXAEBVLogMessage@12@@Z
     ??$?XH$0A@@Duration@absl@@QEAAAEAV01@H@Z
-    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@Vstring_view@1@@Z
-    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@AEBVstring_view@3@AEBH@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$AbslHashValue@VMixingHashState@hash_internal@absl@@AEB_K@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEB_K@Cr@std@@@Z
     ??$AbslStringify@VStringifySink@strings_internal@absl@@@absl@@YAXAEAVStringifySink@strings_internal@0@UHex@0@@Z
     ??$Add@$00@CordRepBtree@cord_internal@absl@@AEAAXPEAUCordRep@12@@Z
@@ -352,10 +347,10 @@
     ??$Add@$0A@@CordRepBtree@cord_internal@absl@@AEAAXV?$Span@QEAUCordRep@cord_internal@absl@@@2@@Z
     ??$AddCordRep@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
     ??$AddCordRep@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$AddEdge@$00@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$AddEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
@@ -378,8 +373,8 @@
     ??$ArgumentToConv@PEBD@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@UVoidPtr@str_format_internal@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
+    ??$ArgumentToConv@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@Vint128@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
-    ??$ArgumentToConv@Vstring_view@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@Vuint128@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@_J@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@_K@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
@@ -429,8 +424,8 @@
     ??$Dispatch@PEBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
+    ??$Dispatch@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
-    ??$Dispatch@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
@@ -451,7 +446,7 @@
     ??$ExtractCharSet@$0IAAAE@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0IAAAE@@01@@Z
     ??$ExtractCharSet@$0JPOAA@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0JPOAA@@01@@Z
     ??$ExtractCharSet@$0JPPPL@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0JPPPL@@01@@Z
-    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AVstring_view@1@AEAVStringifySink@01@AEBUHex@1@@Z
+    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAVStringifySink@01@AEBUHex@1@@Z
     ??$FastIntToBuffer@C@numbers_internal@absl@@YAPEADCPEAD@Z
     ??$FastIntToBuffer@D@numbers_internal@absl@@YAPEADDPEAD@Z
     ??$FastIntToBuffer@E@numbers_internal@absl@@YAPEADEPEAD@Z
@@ -463,11 +458,11 @@
     ??$Fill@$0A@@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
     ??$FindBinary@$00@CordRepRing@cord_internal@absl@@AEBAIII_K@Z
     ??$FindBinary@$0A@@CordRepRing@cord_internal@absl@@AEBAIII_K@Z
-    ??$FindSubstitutions@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@Vstring_view@1@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
+    ??$FindSubstitutions@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV234@II@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$Fill@$00@012@AEAAXPEBV012@II@Z@@Z
@@ -480,15 +475,15 @@
     ??$FromInt64@$0DLJKMKAA@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0DLJKMKAA@@Cr@std@@@Z
     ??$FromInt64@$0DOI@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0DOI@@Cr@std@@@Z
     ??$FromInt64@$0PECEA@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0PECEA@@Cr@std@@@Z
+    ??$GenericCompare@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@HVCord@absl@@@absl@@YAHAEBVCord@0@0_K@Z
-    ??$GenericCompare@HVstring_view@absl@@@absl@@YAHAEBVCord@0@AEBVstring_view@0@_K@Z
+    ??$GenericCompare@_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YA_NAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@_NVCord@absl@@@absl@@YA_NAEBVCord@0@0_K@Z
-    ??$GenericCompare@_NVstring_view@absl@@@absl@@YA_NAEBVCord@0@AEBVstring_view@0@_K@Z
     ??$GetData@$$CBV?$Span@D@absl@@@span_internal@absl@@YAPEADAEBV?$Span@D@1@@Z
     ??$GetData@$$CBV?$Span@I@absl@@@span_internal@absl@@YAPEAIAEBV?$Span@I@1@@Z
     ??$GetData@$$CBV?$Span@VFormatArgImpl@str_format_internal@absl@@@absl@@@span_internal@absl@@YAPEAVFormatArgImpl@str_format_internal@1@AEBV?$Span@VFormatArgImpl@str_format_internal@absl@@@1@@Z
+    ??$GetData@$$CBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBDAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$GetData@$$CBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBVFormatArgImpl@str_format_internal@1@AEBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@Z
-    ??$GetData@$$CBVstring_view@absl@@@span_internal@absl@@YAPEBDAEBVstring_view@1@@Z
     ??$GetData@U?$array@D$0DKJI@@Cr@std@@@span_internal@absl@@YAPEADAEAU?$array@D$0DKJI@@Cr@std@@@Z
     ??$GetData@V?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@absl@@@span_internal@absl@@YAPEAPEAVLogSink@1@AEAV?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@1@@Z
     ??$GetData@V?$Span@D@absl@@@span_internal@absl@@YAPEADAEAV?$Span@D@1@@Z
@@ -497,14 +492,14 @@
     ??$GetDataImpl@$$CBV?$Span@D@absl@@@span_internal@absl@@YAPEADAEBV?$Span@D@1@D@Z
     ??$GetDataImpl@$$CBV?$Span@I@absl@@@span_internal@absl@@YAPEAIAEBV?$Span@I@1@D@Z
     ??$GetDataImpl@$$CBV?$Span@VFormatArgImpl@str_format_internal@absl@@@absl@@@span_internal@absl@@YAPEAVFormatArgImpl@str_format_internal@1@AEBV?$Span@VFormatArgImpl@str_format_internal@absl@@@1@D@Z
+    ??$GetDataImpl@$$CBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBDAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ??$GetDataImpl@$$CBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEBVFormatArgImpl@str_format_internal@1@AEBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@D@Z
-    ??$GetDataImpl@$$CBVstring_view@absl@@@span_internal@absl@@YAPEBDAEBVstring_view@1@D@Z
     ??$GetDataImpl@U?$array@D$0DKJI@@Cr@std@@@span_internal@absl@@YAPEADAEAU?$array@D$0DKJI@@Cr@std@@D@Z
     ??$GetDataImpl@V?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@absl@@@span_internal@absl@@YAPEAPEAVLogSink@1@AEAV?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@1@D@Z
     ??$GetDataImpl@V?$Span@D@absl@@@span_internal@absl@@YAPEADAEAV?$Span@D@1@D@Z
     ??$GetDataImpl@V?$Span@I@absl@@@span_internal@absl@@YAPEAIAEAV?$Span@I@1@D@Z
     ??$GetDataImpl@V?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPEAPEAVLogSink@1@AEAV?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@D@Z
-    ??$HashOf@$S$$ZVstring_view@absl@@H@absl@@YA_KAEBVstring_view@0@AEBH@Z
+    ??$HashOf@$S$$ZV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@absl@@YA_KAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Z
     ??$HashOf@$S$$Z_K@absl@@YA_KAEB_K@Z
     ??$HidePtr@$$CBX@base_internal@absl@@YA_KPEBX@Z
     ??$HidePtr@U?$atomic@_J@Cr@std@@@base_internal@absl@@YA_KPEAU?$atomic@_J@Cr@std@@@Z
@@ -515,20 +510,20 @@
     ??$Init@H@FormatArgImpl@str_format_internal@absl@@AEAAXAEBH@Z
     ??$Init@I@FormatArgImpl@str_format_internal@absl@@AEAAXAEBI@Z
     ??$Init@PEBD@FormatArgImpl@str_format_internal@absl@@AEAAXAEBQEBD@Z
-    ??$Init@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@AEAAXAEBVstring_view@2@@Z
+    ??$Init@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@AEAAXAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$Init@_J@FormatArgImpl@str_format_internal@absl@@AEAAXAEB_J@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@H@UniquelyRepresentedProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBH@Z
-    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@AEB_K@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBV?$tuple@AEB_K@Cr@std@@@Z
-    ??$Invoke@VMixingHashState@hash_internal@absl@@Vstring_view@3@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEBVstring_view@3@@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@_K@UniquelyRepresentedProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@AEB_K@Z
-    ??$InvokeFlush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@Vstring_view@1@@Z
-    ??$InvokeFlush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ??$InvokeFlush@VBufferRawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVBufferRawSink@01@Vstring_view@1@@Z
-    ??$InvokeFlush@VFILERawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVFILERawSink@01@Vstring_view@1@@Z
+    ??$InvokeFlush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ??$InvokeFlush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ??$InvokeFlush@VBufferRawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVBufferRawSink@01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$InvokeFlush@VFILERawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPEAVFILERawSink@01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$LowLevelCallOnce@A6AXXZ$$V@base_internal@absl@@YAXPEAVonce_flag@1@A6AXXZ@Z
     ??$MakeCheckOpString@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV234@0PEBD@Z
-    ??$MakeCheckOpString@AEBVstring_view@absl@@AEBV12@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVstring_view@1@0PEBD@Z
+    ??$MakeCheckOpString@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@0PEBD@Z
     ??$MakeCheckOpString@DD@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@DDPEBD@Z
     ??$MakeCheckOpString@EE@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@EEPEBD@Z
     ??$MakeCheckOpString@MM@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@MMPEBD@Z
@@ -546,7 +541,7 @@
     ??$MakeCheckOpValueString@PEBD@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBQEBD@Z
     ??$MakeCheckOpValueString@PEBE@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBQEBE@Z
     ??$MakeCheckOpValueString@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
-    ??$MakeCheckOpValueString@Vstring_view@absl@@@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVstring_view@1@@Z
+    ??$MakeCheckOpValueString@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ??$MakeCheckOpValueString@_J@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEB_J@Z
     ??$MakeCheckOpValueString@_K@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEB_K@Z
     ??$MakeCheckOpValueString@_N@log_internal@absl@@YAXAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEB_N@Z
@@ -578,8 +573,8 @@
     ??$Nanoseconds@_J$0A@@absl@@YA?AVDuration@0@_J@Z
     ??$NewImpl@$0BAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
     ??$NewImpl@$0EAAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
-    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
-    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
+    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@$00$01@absl@@U45@@internal_layout@container_internal@absl@@QEBA_KXZ
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@$00@absl@@U?$integer_sequence@_K$0A@$00$01@5@@internal_layout@container_internal@absl@@QEBA_KXZ
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@@absl@@U?$integer_sequence@_K$0A@$00@5@@internal_layout@container_internal@absl@@QEBA_KXZ
@@ -591,7 +586,7 @@
     ??$Offset@$0A@$0A@@?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$S@absl@@U?$integer_sequence@_K$0A@@5@@internal_layout@container_internal@absl@@QEBA_KXZ
     ??$ParseFloat@$09@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
     ??$ParseFloat@$0BA@@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
-    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NVstring_view@1@UParsedFormatConsumer@ParsedFormatBase@01@@Z
+    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@UParsedFormatConsumer@ParsedFormatBase@01@@Z
     ??$Partial@$$V@?$Layout@_KPEAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$S@absl@@U?$integer_sequence@_K$0A@@5@@internal_layout@12@XZ
     ??$Partial@AEAI@?$Layout@_KPEAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@@absl@@U?$integer_sequence@_K$0A@$00@5@@internal_layout@12@AEAI@Z
     ??$Partial@AEAIAEAI@?$Layout@_KPEAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@_KPEAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@_K$0A@$00@absl@@U?$integer_sequence@_K$0A@$00$01@5@@internal_layout@12@AEAI0@Z
@@ -619,8 +614,8 @@
     ??$Seconds@_J$0A@@absl@@YA?AVDuration@0@_J@Z
     ??$SetEdge@$00@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
+    ??$SharedCompareImpl@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$SharedCompareImpl@VCord@absl@@@absl@@YAHAEBVCord@0@0@Z
-    ??$SharedCompareImpl@Vstring_view@absl@@@absl@@YAHAEBVCord@0@AEBVstring_view@0@@Z
     ??$SmallMemmove@$00@cord_internal@absl@@YAXPEADPEBD_K@Z
     ??$SmallMemmove@$0A@@cord_internal@absl@@YAXPEADPEBD_K@Z
     ??$StoreCallback@P6A_NPEAUSynchEvent@absl@@@Z@Condition@absl@@AEAAXP6A_NPEAUSynchEvent@1@@Z@Z
@@ -628,9 +623,9 @@
     ??$StoreCallback@P6A_NPEBU?$atomic@_N@Cr@std@@@Z@Condition@absl@@AEAAXP6A_NPEBU?$atomic@_N@Cr@std@@@Z@Z
     ??$StrAppend@$$V@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@0@1111@Z
     ??$StrCat@$$BY01D@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@0@0000AEAY01$$CBD@Z
-    ??$StrFormat@DHHHHH_JIVstring_view@absl@@HPEBDV12@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBVstring_view@0@2AEBQEBD5@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@0@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@3@@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
+    ??$StrFormat@DHHHHH_JIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HPEBDV123@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@2AEBQEBD5@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@3@@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
     ??$ToChronoDuration@V?$duration@JV?$ratio@$0DM@$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0DM@$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$ToChronoDuration@V?$duration@JV?$ratio@$0OBA@$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0OBA@$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$ToChronoDuration@V?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
@@ -652,9 +647,9 @@
     ??$ToInt@PEBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
+    ??$ToInt@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@VFormatArgImpl@str_format_internal@absl@@@FormatArgImplFriend@str_format_internal@absl@@SA_NVFormatArgImpl@12@PEAH@Z
     ??$ToInt@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
-    ??$ToInt@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$00@Cr@std@@U?$integral_constant@_N$0A@@56@@Z
     ??$ToInt@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PEAHU?$integral_constant@_N$00@Cr@std@@U?$integral_constant@_N$0A@@56@@Z
@@ -694,7 +689,7 @@
     ??$__construct_node_hash@AEBUpiecewise_construct_t@Cr@std@@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AEAA?AV?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@@12@_KAEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QEAV?$tuple@$$V@12@@Z
     ??$__construct_one_at_end@$$V@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ??$__construct_one_at_end@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
-    ??$__construct_one_at_end@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__construct_one_at_end@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__construct_one_at_end@AEBQEAVCordzHandle@cord_internal@absl@@@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVCordzHandle@cord_internal@absl@@@Z
     ??$__construct_one_at_end@AEBQEAVLogSink@absl@@@?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVLogSink@absl@@@Z
     ??$__construct_one_at_end@AEBQEBVCordzHandle@cord_internal@absl@@@?$vector@PEBVCordzHandle@cord_internal@absl@@V?$allocator@PEBVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEBVCordzHandle@cord_internal@absl@@@Z
@@ -796,7 +791,7 @@
     ??$__distance@V?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YA_JV?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@01@0Urandom_access_iterator_tag@01@@Z
     ??$__distance@V?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YA_JV?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@01@0Urandom_access_iterator_tag@01@@Z
     ??$__do_rehash@$00@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AEAAX_K@Z
-    ??$__emplace_back_slow_path@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__emplace_back_slow_path@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__emplace_unique_key_args@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBUpiecewise_construct_t@23@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AU?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@_N@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@AEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QEAV?$tuple@$$V@12@@Z
     ??$__invoke@AEAUByCivilTime@Transition@cctz@time_internal@absl@@AEBU2345@AEBU2345@@Cr@std@@YA_NAEAUByCivilTime@Transition@cctz@time_internal@absl@@AEBU3456@1@Z
     ??$__invoke@AEAUByUnixTime@Transition@cctz@time_internal@absl@@AEBU2345@AEBU2345@@Cr@std@@YA_NAEAUByUnixTime@Transition@cctz@time_internal@absl@@AEBU3456@1@Z
@@ -959,9 +954,9 @@
     ??$assign@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$optional_data_base@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@optional_internal@absl@@IEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$call_once@A6AXXZ$$V@absl@@YAXAEAVonce_flag@0@A6AXXZ@Z
     ??$combine@H$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBH@Z
-    ??$combine@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$combine@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Z
+    ??$combine@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$combine@V?$tuple@AEB_K@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBV?$tuple@AEB_K@Cr@std@@@Z
-    ??$combine@Vstring_view@absl@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEBVstring_view@2@AEBH@Z
     ??$combine@_K$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@AEB_K@Z
     ??$combine_contiguous@D@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@PEBD_K@Z
     ??$construct@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEBQEAPEBV12345@XX@?$allocator_traits@V?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@12@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEBQEAPEBV45678@@Z
@@ -987,7 +982,7 @@
     ??$construct@UTransition@cctz@time_internal@absl@@U1234@XX@?$allocator_traits@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UTransition@cctz@time_internal@absl@@@12@PEAUTransition@cctz@time_internal@absl@@$$QEAU4567@@Z
     ??$construct@UTransitionType@cctz@time_internal@absl@@$$VXX@?$allocator_traits@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@PEAUTransitionType@cctz@time_internal@absl@@@Z
     ??$construct@UTransitionType@cctz@time_internal@absl@@U1234@XX@?$allocator_traits@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@PEAUTransitionType@cctz@time_internal@absl@@$$QEAU4567@@Z
-    ??$construct@UViableSubstitution@strings_internal@absl@@AEAVstring_view@3@AEBV43@AEA_KXX@?$allocator_traits@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UViableSubstitution@strings_internal@absl@@@12@PEAUViableSubstitution@strings_internal@absl@@AEAVstring_view@6@AEBV76@AEA_K@Z
+    ??$construct@UViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV456@AEA_KXX@?$allocator_traits@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@SAXAEAV?$allocator@UViableSubstitution@strings_internal@absl@@@12@PEAUViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV712@AEA_K@Z
     ??$construct@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$optional_data_base@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@optional_internal@absl@@IEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$construct_at@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEBQEAPEBV12345@PEAPEAPEBV12345@@Cr@std@@YAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV23456@AEBQEAPEBV23456@@Z
     ??$construct_at@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEBV12345@PEAPEAPEBV12345@@Cr@std@@YAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEAPEBV23456@$$QEAPEAPEBV23456@@Z
@@ -1012,7 +1007,7 @@
     ??$construct_at@UTransition@cctz@time_internal@absl@@U1234@PEAU1234@@Cr@std@@YAPEAUTransition@cctz@time_internal@absl@@PEAU2345@$$QEAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@$$VPEAU1234@@Cr@std@@YAPEAUTransitionType@cctz@time_internal@absl@@PEAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@U1234@PEAU1234@@Cr@std@@YAPEAUTransitionType@cctz@time_internal@absl@@PEAU2345@$$QEAU2345@@Z
-    ??$construct_at@UViableSubstitution@strings_internal@absl@@AEAVstring_view@3@AEBV43@AEA_KPEAU123@@Cr@std@@YAPEAUViableSubstitution@strings_internal@absl@@PEAU234@AEAVstring_view@4@AEBV54@AEA_K@Z
+    ??$construct_at@UViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV456@AEA_KPEAU123@@Cr@std@@YAPEAUViableSubstitution@strings_internal@absl@@PEAU234@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@01@AEBV501@AEA_K@Z
     ??$copy@PEBVFormatArgImpl@str_format_internal@absl@@PEAV123@@Cr@std@@YAPEAVFormatArgImpl@str_format_internal@absl@@PEBV234@0PEAV234@@Z
     ??$copy@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@Cr@std@@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@23@@Cr@std@@YA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@01@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@01@0V201@@Z
     ??$countl_zero@I@absl@@YAHI@Z
@@ -1059,7 +1054,7 @@
     ??$emplace@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAUTransitionType@cctz@time_internal@absl@@@12@V?$__wrap_iter@PEBUTransitionType@cctz@time_internal@absl@@@12@@Z
     ??$emplace_back@$$V@?$__split_buffer@UTransition@cctz@time_internal@absl@@AEAV?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXXZ
     ??$emplace_back@$$V@?$__split_buffer@UTransitionType@cctz@time_internal@absl@@AEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXXZ
-    ??$emplace_back@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@AEAVstring_view@5@AEBV65@AEA_K@Z
+    ??$emplace_back@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV612@AEA_K@Z
     ??$emplace_back@AEBQEAUCordRep@cord_internal@absl@@@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAAEAPEAUCordRep@cord_internal@1@AEBQEAU231@@Z
     ??$emplace_back@AEBQEAVLogSink@absl@@@?$InlinedVector@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@absl@@QEAAAEAPEAVLogSink@1@AEBQEAV21@@Z
     ??$emplace_back@HVcrc32c_t@absl@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUPrefixCrc@CrcCordState@crc_internal@absl@@$$QEAH$$QEAVcrc32c_t@6@@Z
@@ -1095,8 +1090,6 @@
     ??$get@$00@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGAAAEA_KXZ
     ??$get@$00@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGBAAEB_KXZ
     ??$get@$00@?$CompressedTuple@_KVHashtablezInfoHandle@container_internal@absl@@@container_internal@absl@@QEGAAAEAVHashtablezInfoHandle@12@XZ
-    ??$get@$00AEBVstring_view@absl@@AEBH@Cr@std@@YAAEBHAEBV?$tuple@AEBVstring_view@absl@@AEBH@01@@Z
-    ??$get@$00Vstring_view@absl@@V12@@Cr@std@@YAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@01@@Z
     ??$get@$0A@@?$CompressedTuple@V?$allocator@H@Cr@std@@_K@container_internal@absl@@QEGAAAEAV?$allocator@H@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@PEAPEAUCordRep@cord_internal@absl@@@container_internal@absl@@QEGAAAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGAAAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@XZ
@@ -1106,16 +1099,12 @@
     ??$get@$0A@@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGAAAEAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@_K@container_internal@absl@@QEGBAAEBV?$allocator@UPayload@status_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@_KVHashtablezInfoHandle@container_internal@absl@@@container_internal@absl@@QEGAAAEA_KXZ
-    ??$get@$0A@AEBVstring_view@absl@@AEBH@Cr@std@@YAAEBVstring_view@absl@@AEBV?$tuple@AEBVstring_view@absl@@AEBH@01@@Z
-    ??$get@$0A@Vstring_view@absl@@V12@@Cr@std@@YAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@01@@Z
-    ??$get@Vstring_view@absl@@V12@@?$__get_pair@$00@Cr@std@@SAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@12@@Z
-    ??$get@Vstring_view@absl@@V12@@?$__get_pair@$0A@@Cr@std@@SAAEBVstring_view@absl@@AEBU?$pair@Vstring_view@absl@@V12@@12@@Z
-    ??$hash@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SA_KAEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??$hash@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SA_KAEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??$hash@V?$tuple@AEB_K@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SA_KAEBV?$tuple@AEB_K@Cr@std@@@Z
     ??$hash_bytes@VMixingHashState@hash_internal@absl@@H@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBH@Z
     ??$hash_bytes@VMixingHashState@hash_internal@absl@@_K@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEB_K@Z
     ??$hash_range_or_bytes@VMixingHashState@hash_internal@absl@@D@hash_internal@absl@@YA?AVMixingHashState@01@V201@PEBD_K@Z
-    ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@$0A@$00@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@U?$integer_sequence@_K$0A@$00@1@@Z
+    ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@$0A@$00@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@U?$integer_sequence@_K$0A@$00@1@@Z
     ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@AEB_K@Cr@std@@$0A@@hash_internal@absl@@YA?AVMixingHashState@01@V201@AEBV?$tuple@AEB_K@Cr@std@@U?$integer_sequence@_K$0A@@1@@Z
     ??$launder@$$CBU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAPEBU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@01@PEBU201@@Z
     ??$launder@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAPEAU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@01@PEAU201@@Z
@@ -1205,17 +1194,15 @@
     ??$swap@PEAUViableSubstitution@strings_internal@absl@@@Cr@std@@YAXAEAPEAUViableSubstitution@strings_internal@absl@@0@Z
     ??$swap@PEBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@YAXAEAPEBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@0@Z
     ??$swap@UViableSubstitution@strings_internal@absl@@@Cr@std@@YAXAEAUViableSubstitution@strings_internal@absl@@0@Z
-    ??$swap@Vstring_view@absl@@@Cr@std@@YAXAEAVstring_view@absl@@0@Z
-    ??$tie@$$CBVstring_view@absl@@$$CBH@Cr@std@@YA?AV?$tuple@AEBVstring_view@absl@@AEBH@01@AEBVstring_view@absl@@AEBH@Z
     ??$upper_bound@PEBUTransition@cctz@time_internal@absl@@U1234@UByCivilTime@1234@@Cr@std@@YAPEBUTransition@cctz@time_internal@absl@@PEBU2345@0AEBU2345@UByCivilTime@2345@@Z
     ??$upper_bound@PEBUTransition@cctz@time_internal@absl@@U1234@UByUnixTime@1234@@Cr@std@@YAPEBUTransition@cctz@time_internal@absl@@PEBU2345@0AEBU2345@UByUnixTime@2345@@Z
     ??0?$AllocationTransaction@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAA@AEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@Z
     ??0?$AllocationTransaction@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAA@AEAV?$allocator@PEAVLogSink@absl@@@Cr@std@@@Z
     ??0?$AllocationTransaction@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAA@AEAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@@Z
-    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@_K@Z
-    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@_K@Z
     ??0?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@absl@@QEAA@PEBD@Z
@@ -1444,7 +1431,7 @@
     ??0?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@QEAA@XZ
     ??0AlphaNum@absl@@QEAA@H@Z
     ??0AlphaNum@absl@@QEAA@PEBD@Z
-    ??0AlphaNum@absl@@QEAA@Vstring_view@1@@Z
+    ??0AlphaNum@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0AlphaNum@absl@@QEAA@_J@Z
     ??0AlphaNum@absl@@QEAA@_K@Z
     ??0Arena@LowLevelAlloc@base_internal@absl@@QEAA@I@Z
@@ -1458,9 +1445,9 @@
     ??0BoundConversion@str_format_internal@absl@@QEAA@XZ
     ??0Breakdown@Time@absl@@QEAA@XZ
     ??0BufferRawSink@str_format_internal@absl@@QEAA@PEAD_K@Z
-    ??0ByAnyChar@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByAnyChar@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0ByLength@absl@@QEAA@_J@Z
-    ??0ByString@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByString@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0CRC32@crc_internal@absl@@QEAA@XZ
     ??0CRC@crc_internal@absl@@IEAA@XZ
     ??0CRCImpl@crc_internal@absl@@QEAA@XZ
@@ -1472,7 +1459,7 @@
     ??0CivilInfo@TimeZone@absl@@QEAA@XZ
     ??0Condition@absl@@QEAA@P6A_NPEAX@Z0@Z
     ??0Condition@absl@@QEAA@PEB_N@Z
-    ??0Cord@absl@@AEAA@Vstring_view@1@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
+    ??0Cord@absl@@AEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
     ??0Cord@absl@@QEAA@$$QEAV01@@Z
     ??0Cord@absl@@QEAA@AEBV01@@Z
     ??0Cord@absl@@QEAA@XZ
@@ -1527,9 +1514,9 @@
     ??0LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@2@@Z
     ??0LogMessageData@LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@3@VTime@3@@Z
     ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogSink@absl@@QEAA@XZ
     ??0Long@Rep@CordBuffer@absl@@QEAA@PEAUCordRepFlat@cord_internal@3@@Z
     ??0MixingHashState@hash_internal@absl@@AEAA@XZ
@@ -1539,7 +1526,7 @@
     ??0NodeCounts@CordzStatistics@cord_internal@absl@@QEAA@XZ
     ??0OstreamView@LogMessage@log_internal@absl@@QEAA@AEAULogMessageData@123@@Z
     ??0ParsedFloat@strings_internal@absl@@QEAA@XZ
-    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@Vstring_view@2@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@std@@@Z
+    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@5@@Z
     ??0ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA@PEAV123@@Z
     ??0Payload@status_internal@absl@@QEAA@$$QEAU012@@Z
     ??0Payload@status_internal@absl@@QEAA@AEBU012@@Z
@@ -1567,8 +1554,8 @@
     ??0SpinLockHolder@base_internal@absl@@QEAA@PEAVSpinLock@12@@Z
     ??0Status@absl@@QEAA@$$QEAV01@@Z
     ??0Status@absl@@QEAA@AEBV01@@Z
-    ??0Status@absl@@QEAA@W4StatusCode@1@Vstring_view@1@@Z
-    ??0StatusRep@status_internal@absl@@QEAA@W4StatusCode@2@Vstring_view@2@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@@Z
+    ??0Status@absl@@QEAA@W4StatusCode@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0StatusRep@status_internal@absl@@QEAA@W4StatusCode@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@56@@Z
     ??0StdcppWaiter@synchronization_internal@absl@@QEAA@XZ
     ??0Streamable@str_format_internal@absl@@QEAA@AEBVUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ??0StringifySink@strings_internal@absl@@QEAA@XZ
@@ -1585,9 +1572,9 @@
     ??0Transition@cctz@time_internal@absl@@QEAA@XZ
     ??0TransitionType@cctz@time_internal@absl@@QEAA@XZ
     ??0UnboundConversion@str_format_internal@absl@@QEAA@XZ
-    ??0UntypedFormatSpec@absl@@QEAA@Vstring_view@1@@Z
-    ??0UntypedFormatSpecImpl@str_format_internal@absl@@QEAA@Vstring_view@2@@Z
-    ??0ViableSubstitution@strings_internal@absl@@QEAA@Vstring_view@2@0_K@Z
+    ??0UntypedFormatSpec@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0UntypedFormatSpecImpl@str_format_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0ViableSubstitution@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0_K@Z
     ??0Win32Waiter@synchronization_internal@absl@@QEAA@XZ
     ??0WriterMutexLock@absl@@QEAA@PEAVMutex@1@@Z
     ??0ZoneInfoSource@cctz@time_internal@absl@@QEAA@XZ
@@ -1623,10 +1610,6 @@
     ??0int128@absl@@QEAA@N@Z
     ??0int128@absl@@QEAA@O@Z
     ??0once_flag@absl@@QEAA@XZ
-    ??0string_view@absl@@AEAA@PEBD_KUSkipCheckLengthTag@01@@Z
-    ??0string_view@absl@@QEAA@PEBD@Z
-    ??0string_view@absl@@QEAA@PEBD_K@Z
-    ??0string_view@absl@@QEAA@XZ
     ??0time_zone@cctz@time_internal@absl@@AEAA@PEBVImpl@0123@@Z
     ??0time_zone@cctz@time_internal@absl@@QEAA@XZ
     ??0uint128@absl@@AEAA@_K0@Z
@@ -1764,7 +1747,7 @@
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@$$QEAV01@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@AEBV01@@Z
     ??4Cord@absl@@QEAAAEAV01@$$QEAV01@@Z
-    ??4Cord@absl@@QEAAAEAV01@Vstring_view@1@@Z
+    ??4Cord@absl@@QEAAAEAV01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??4CordzUpdateTracker@cord_internal@absl@@QEAAAEAV012@AEBV012@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@$$QEAV012@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@AEBV012@@Z
@@ -1783,13 +1766,12 @@
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@H@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV345@@Z@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAVios_base@Cr@std@@AEAV345@@Z@Z
-    ??6LogMessage@log_internal@absl@@QEAAAEAV012@Vstring_view@2@@Z
+    ??6LogMessage@log_internal@absl@@QEAAAEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??6absl@@YA?AVuint128@0@V10@H@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVCord@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVStatus@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vcrc32c_t@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vint128@0@@Z
-    ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vstring_view@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vuint128@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverity@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverityAtLeast@0@@Z
@@ -1823,7 +1805,6 @@
     ??8absl@@YA_NVDuration@0@0@Z
     ??8absl@@YA_NVTime@0@0@Z
     ??8absl@@YA_NVint128@0@0@Z
-    ??8absl@@YA_NVstring_view@0@0@Z
     ??8absl@@YA_NVuint128@0@0@Z
     ??8cord_internal@absl@@YA_NAEBVInlineData@01@0@Z
     ??9ChunkIterator@Cord@absl@@QEBA_NAEBV012@@Z
@@ -1837,7 +1818,6 @@
     ??9GraphId@synchronization_internal@absl@@QEBA_NAEBU012@@Z
     ??9absl@@YA_NAEBVCord@0@0@Z
     ??9absl@@YA_NVint128@0@0@Z
-    ??9absl@@YA_NVstring_view@0@0@Z
     ??9absl@@YA_NVuint128@0@0@Z
     ??A?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAAEAUPayload@status_internal@1@_K@Z
     ??A?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEBAAEBUPayload@status_internal@1@_K@Z
@@ -1854,7 +1834,6 @@
     ??A?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAAEBUTransitionType@cctz@time_internal@absl@@_K@Z
     ??A?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUViableSubstitution@strings_internal@absl@@_K@Z
     ??ACord@absl@@QEBAD_K@Z
-    ??Astring_view@absl@@QEBAAEBD_K@Z
     ??B?$NonIterableBitMask@I$0BA@$0A@@container_internal@absl@@QEBA_NXZ
     ??B?$__atomic_base@PEAVCordzHandle@cord_internal@absl@@$0A@@Cr@std@@QEBAPEAVCordzHandle@cord_internal@absl@@XZ
     ??B?$optional@_K@absl@@QEBA_NXZ
@@ -1883,7 +1862,7 @@
     ??C?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QEBAPEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@XZ
     ??C?$unique_ptr@VTimeZoneIf@cctz@time_internal@absl@@U?$default_delete@VTimeZoneIf@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAPEAVTimeZoneIf@cctz@time_internal@absl@@XZ
     ??C?$unique_ptr@VTimeZoneInfo@cctz@time_internal@absl@@U?$default_delete@VTimeZoneInfo@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAPEAVTimeZoneInfo@cctz@time_internal@absl@@XZ
-    ??CChunkIterator@Cord@absl@@QEBAPEBVstring_view@2@XZ
+    ??CChunkIterator@Cord@absl@@QEBAPEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ??D?$__deque_iterator@PEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEBV12345@AEAPEBV12345@PEAPEAPEBV12345@_J$0A@@Cr@std@@QEBAAEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ??D?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@Cr@std@@QEBAAEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ??D?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@Cr@std@@QEBAAEBUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
@@ -1910,7 +1889,7 @@
     ??D?$reverse_iterator@PEAUViableSubstitution@strings_internal@absl@@@Cr@std@@QEBAAEAUViableSubstitution@strings_internal@absl@@XZ
     ??D?$unique_ptr@ULogMessageData@LogMessage@log_internal@absl@@U?$default_delete@ULogMessageData@LogMessage@log_internal@absl@@@Cr@std@@@Cr@std@@QEBAAEAULogMessageData@LogMessage@log_internal@absl@@XZ
     ??D?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QEBAAEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@XZ
-    ??DChunkIterator@Cord@absl@@QEBA?AVstring_view@2@XZ
+    ??DChunkIterator@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ??D__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AU__deque_block_range@123@XZ
     ??Dabsl@@YA?AVint128@0@V10@0@Z
     ??Dabsl@@YA?AVuint128@0@V10@0@Z
@@ -1991,15 +1970,13 @@
     ??R<lambda_1>@?0???A?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@absl@@QEBAAEBVFormatArgImpl@str_format_internal@2@_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???A?$Span@D@absl@@QEBAAEAD_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???A?$Span@I@absl@@QEBAAEAI_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0???Astring_view@absl@@QEBAAEBD_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0???CChunkIterator@Cord@absl@@QEBAPEBVstring_view@3@XZ@QEBA?A?<auto>@@XZ
+    ??R<lambda_1>@?0???CChunkIterator@Cord@absl@@QEBAPEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???D?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@QEGAAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0???DChunkIterator@Cord@absl@@QEBA?AVstring_view@3@XZ@QEBA?A?<auto>@@XZ
+    ??R<lambda_1>@?0???DChunkIterator@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0???EChunkIterator@Cord@absl@@QEAAAEAV123@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??Append@FormatSinkImpl@str_format_internal@absl@@QEAAX_KD@Z@QEBA?A?<auto>@@0@Z
-    ??R<lambda_1>@?0??CheckLengthInternal@string_view@absl@@CA_K_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHAEBV23@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAVstring_view@3@@Z
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHVstring_view@3@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAV43@@Z
+    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHAEBV23@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAV456@@Z
     ??R<lambda_1>@?0??InitFrom@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXAEBV234@@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??SetLength@CordBuffer@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??SubtractSize@?$Storage@H$0CP@V?$allocator@H@Cr@std@@@inlined_vector_internal@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
@@ -2010,17 +1987,14 @@
     ??R<lambda_1>@?0??back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAAEAPEAUCordRep@cord_internal@3@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$0CP@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAAEAPEAUCordRep@cord_internal@3@XZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??front@string_view@absl@@QEBAAEBDXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??inline_size@Rep@InlineData@cord_internal@absl@@QEBA_KXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@H$0CP@V?$allocator@H@Cr@std@@@absl@@QEAAXXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAXXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@PEAUCordRep@cord_internal@absl@@$0CP@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QEAAXXZ@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_prefix@?$Span@$$CBD@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_prefix@?$Span@D@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??remove_prefix@string_view@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_suffix@?$Span@$$CBD@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_suffix@?$Span@D@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
-    ??R<lambda_1>@?0??remove_suffix@string_view@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??set_inline_data@InlineData@cord_internal@absl@@QEAAXPEBD_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_1>@?0??set_inline_size@Rep@InlineData@cord_internal@absl@@QEAAX_K@Z@QEBA?A?<auto>@@XZ
     ??R<lambda_2>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@0_K1@Z@QEBA?A?<auto>@@I@Z
@@ -2028,9 +2002,9 @@
     ??R<lambda_2>@?0??erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@@Z@QEBA?A?<auto>@@XZ
     ??R?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@absl@@QEBAXPEAUCordRep@cord_internal@1@_K1@Z
     ??R?$FunctionRef@$$A6AXV?$Span@I@absl@@@Z@absl@@QEBAXV?$Span@I@1@@Z
-    ??R?$FunctionRef@$$A6AXVstring_view@absl@@@Z@absl@@QEBAXVstring_view@1@@Z
-    ??R?$FunctionRef@$$A6AXVstring_view@absl@@AEBVCord@2@@Z@absl@@QEBAXVstring_view@1@AEBVCord@1@@Z
-    ??R?$HashImpl@V?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@hash_internal@absl@@QEBA_KAEBV?$tuple@AEBVstring_view@absl@@AEBH@Cr@std@@@Z
+    ??R?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@absl@@QEBAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??R?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@absl@@@Z@absl@@QEBAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@1@@Z
+    ??R?$HashImpl@V?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@hash_internal@absl@@QEBA_KAEBV?$tuple@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBH@Cr@std@@@Z
     ??R?$HashImpl@V?$tuple@AEB_K@Cr@std@@@hash_internal@absl@@QEBA_KAEBV?$tuple@AEB_K@Cr@std@@@Z
     ??R?$RandenPool@E@random_internal@absl@@QEAAEXZ
     ??R?$RandenPool@G@random_internal@absl@@QEAAGXZ
@@ -2089,20 +2063,20 @@
     ??_4uint128@absl@@QEAAAEAV01@V01@@Z
     ??_5uint128@absl@@QEAAAEAV01@V01@@Z
     ??_6uint128@absl@@QEAAAEAV01@V01@@Z
-    ?AbortedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AbortedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?AbsDuration@absl@@YA?AVDuration@1@V21@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVBufferRawSink@12@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVFILERawSink@12@Vstring_view@2@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVBufferRawSink@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPEAVFILERawSink@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?AbslUnparseFlag@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@@Z
@@ -2144,34 +2118,34 @@
     ?AllocatedSize@CordRepFlat@cord_internal@absl@@QEBA_KXZ
     ?AllocatedSizeToTag@cord_internal@absl@@YAE_K@Z
     ?AllocatedSizeToTagUnchecked@cord_internal@absl@@YAE_K@Z
-    ?AlreadyExistsError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AlreadyExistsError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@?$AppendUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
     ?Append@Cord@absl@@QEAAX$$QEAV12@@Z
     ?Append@Cord@absl@@QEAAXAEBV12@@Z
-    ?Append@Cord@absl@@QEAAXVstring_view@2@@Z
+    ?Append@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAX_KD@Z
-    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NVstring_view@4@@Z
-    ?Append@StringifySink@strings_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Append@StringifySink@strings_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@StringifySink@strings_internal@absl@@QEAAX_KD@Z
-    ?AppendArray@InlineRep@Cord@absl@@QEAAXVstring_view@3@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
+    ?AppendArray@InlineRep@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
     ?AppendLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
     ?AppendPack@str_format_internal@absl@@YAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAV345@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
-    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
-    ?AppendPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
+    ?AppendPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?AppendSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?AppendText@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_KVstring_view@4@@Z
+    ?AppendText@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_KV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?AppendTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToInlined@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTruncated@log_internal@absl@@YA_KD_KAEAV?$Span@D@2@@Z
-    ?AppendTruncated@log_internal@absl@@YA_KVstring_view@2@AEAV?$Span@D@2@@Z
-    ?ApplySubstitutions@strings_internal@absl@@YAHVstring_view@2@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@56@@Z
+    ?AppendTruncated@log_internal@absl@@YA_KV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV?$Span@D@2@@Z
+    ?ApplySubstitutions@strings_internal@absl@@YAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@45@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AsciiStrToLower@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AsciiStrToUpper@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AssertHeld@CordzInfo@cord_internal@absl@@QEAAXXZ
@@ -2186,16 +2160,16 @@
     ?AsyncSignalSafeWriteToStderr@raw_log_internal@absl@@YAXPEBD_K@Z
     ?At@TimeZone@absl@@QEBA?AUCivilInfo@12@VTime@2@@Z
     ?At@TimeZone@absl@@QEBA?AUTimeInfo@12@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@@Z
-    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@Vstring_view@3@H@Z
+    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?Avail@FormatSinkImpl@str_format_internal@absl@@AEBA_KXZ
     ?Await@Mutex@absl@@QEAAXAEBVCondition@2@@Z
     ?AwaitCommon@Mutex@absl@@AEAA_NAEBVCondition@2@VKernelTimeout@synchronization_internal@2@@Z
     ?AwaitWithDeadline@Mutex@absl@@QEAA_NAEBVCondition@2@VTime@2@@Z
     ?AwaitWithTimeout@Mutex@absl@@QEAA_NAEBVCondition@2@VDuration@2@@Z
-    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Base64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Base64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?Base64EscapeInternal@strings_internal@absl@@YA_KPEBE_KPEAD1PEBD_N@Z
-    ?Base64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?BindWithPack@str_format_internal@absl@@YA_NPEBUUnboundConversion@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@PEAVBoundConversion@12@@Z
     ?BitCastToSigned@int128_internal@absl@@YA_J_K@Z
     ?Block@Barrier@absl@@QEAA_NXZ
@@ -2205,22 +2179,21 @@
     ?BreakTime@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?BufferSizeFor@log_internal@absl@@YA_KXZ
     ?Build@Header@TimeZoneInfo@cctz@time_internal@absl@@QEAA_NAEBUtzhead@@@Z
-    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?CPUSupportsRandenHwAes@random_internal@absl@@YA_NXZ
-    ?CUnescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@1@Z
+    ?CUnescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@1@Z
     ?CalculateBase64EscapedLenInternal@strings_internal@absl@@YA_K_K_N@Z
     ?CallVoidPtrFunction@Condition@absl@@CA_NPEBV12@@Z
-    ?CancelledError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?CancelledError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Capacity@CordRepFlat@cord_internal@absl@@QEBA_KXZ
     ?CapacityToGrowth@container_internal@absl@@YA_K_K@Z
-    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEVstring_view@2@0E@Z
-    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
+    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0E@Z
+    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
     ?Ceil@absl@@YA?AVDuration@1@V21@0@Z
     ?CheckFastPathSetting@str_format_internal@absl@@YA_NAEBUUnboundConversion@12@@Z
     ?CheckInvariants@GraphCycles@synchronization_internal@absl@@QEBA_NXZ
-    ?CheckLengthInternal@string_view@absl@@CA_K_K@Z
     ?CheckstrcasecmpfalseImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
     ?CheckstrcasecmptrueImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
     ?CheckstrcmpfalseImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
@@ -2241,15 +2214,15 @@
     ?CombineLargeContiguousImpl32@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
     ?CombineLargeContiguousImpl64@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
     ?CommitTree@InlineRep@Cord@absl@@QEAAXPEBUCordRep@cord_internal@3@PEAU453@AEBVCordzUpdateScope@53@W4MethodIdentifier@CordzUpdateTracker@53@@Z
-    ?Compare@Cord@absl@@QEBAHVstring_view@2@@Z
+    ?Compare@Cord@absl@@QEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?CompareImpl@Cord@absl@@AEBAHAEBV12@@Z
     ?CompareSlowPath@Cord@absl@@AEBAHAEBV12@_K1@Z
-    ?CompareSlowPath@Cord@absl@@AEBAHVstring_view@2@_K1@Z
+    ?CompareSlowPath@Cord@absl@@AEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K1@Z
     ?Compute@CrcNonTemporalMemcpyAVXEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@CrcNonTemporalMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@FallbackCrcMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?ComputeCapacity@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@SA_K_K0@Z
-    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@Vstring_view@1@@Z
+    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Concat@CRC@crc_internal@absl@@UEAAXPEAII_K@Z
     ?ConcatCrc32c@absl@@YA?AVcrc32c_t@1@V21@0_K@Z
     ?ConstructNext@?$IteratorValueAdapter@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@V?$move_iterator@PEAPEAUCordRep@cord_internal@absl@@@23@@inlined_vector_internal@absl@@QEAAXAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@PEAPEAUCordRep@cord_internal@3@@Z
@@ -2258,7 +2231,7 @@
     ?ConstructNext@?$IteratorValueAdapter@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@V?$move_iterator@PEAUPayload@status_internal@absl@@@23@@inlined_vector_internal@absl@@QEAAXAEAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@PEAUPayload@status_internal@3@@Z
     ?Consume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
     ?ConsumeBeginTo@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@_K1@Z
-    ?ConsumePrefix@absl@@YA_NPEAVstring_view@1@V21@@Z
+    ?ConsumePrefix@absl@@YA_NPEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
     ?ConsumeUnboundConversion@str_format_internal@absl@@YAPEBDPEBD0PEAUUnboundConversion@12@PEAH@Z
     ?ConsumeUnboundConversionNoInline@str_format_internal@absl@@YAPEBDPEBD0PEAUUnboundConversion@12@PEAH@Z
     ?Contains@str_format_internal@absl@@YA_NW4FormatConversionCharSet@2@D@Z
@@ -2270,7 +2243,7 @@
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NMAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NNAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NOAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@Vstring_view@4@@Z
+    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ConvertSpecialToEmptyAndFullToDeleted@GroupSse2Impl@container_internal@absl@@QEBAXPEAW4ctrl_t@23@@Z
     ?Copy@CordRepBtree@cord_internal@absl@@AEBAPEAV123@XZ
     ?Copy@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@II_K@Z
@@ -2282,14 +2255,14 @@
     ?CopyTo@InlineRep@Cord@absl@@QEBAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyToArraySlowPath@Cord@absl@@AEBAXPEAD@Z
     ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXD_KW4StringType@123@@Z
-    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXVstring_view@3@W4StringType@123@@Z
+    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4StringType@123@@Z
     ?CopyToEndFrom@CordRepBtree@cord_internal@absl@@AEBAPEAV123@_K0@Z
     ?Crash@Helper@internal_statusor@absl@@SAXAEBVStatus@3@@Z
     ?Crc32CAndCopy@crc_internal@absl@@YA?AVcrc32c_t@2@PEIAXPEIBX_KV32@_N@Z
     ?Crc32c@CRC@crc_internal@absl@@SAPEAV123@XZ
     ?CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z
     ?Create@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAUCordRep@23@@Z
-    ?Create@CordRepFlat@cord_internal@absl@@SAPEAU123@Vstring_view@3@_K@Z
+    ?Create@CordRepFlat@cord_internal@absl@@SAPEAU123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Create@CordRepRing@cord_internal@absl@@SAPEAV123@PEAUCordRep@23@_K@Z
     ?CreateFromLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAUCordRep@23@_K11@Z
     ?CreateSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAUCordRep@23@@Z
@@ -2299,12 +2272,12 @@
     ?CreateWithDefaultLimit@CordBuffer@absl@@SA?AV12@_K@Z
     ?Current@CordRepBtreeNavigator@cord_internal@absl@@QEBAPEAUCordRep@23@XZ
     ?CurrentThreadIdentityIfPresent@base_internal@absl@@YAPEAUThreadIdentity@12@XZ
-    ?Data@CordRepBtree@cord_internal@absl@@QEBA?AVstring_view@3@_K@Z
+    ?Data@CordRepBtree@cord_internal@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Data@CordRepFlat@cord_internal@absl@@QEAAPEADXZ
     ?Data@CordRepFlat@cord_internal@absl@@QEBAPEBDXZ
     ?DataLength@Header@TimeZoneInfo@cctz@time_internal@absl@@QEBA_K_K@Z
-    ?DataLossError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?DeadlineExceededError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?DataLossError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?DeadlineExceededError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@H@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAEAV?$allocator@H@Cr@std@@PEAH_K@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAEAV?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@PEAPEAUCordRep@cord_internal@3@_K@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@PEAVLogSink@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAEAV?$allocator@PEAVLogSink@absl@@@Cr@std@@PEAPEAVLogSink@3@_K@Z
@@ -2353,7 +2326,7 @@
     ?Digits10@?$BigUnsigned@$0FE@@strings_internal@absl@@SAHXZ
     ?DisableRescheduling@SchedulingGuard@base_internal@absl@@CA_NXZ
     ?Distance@CordRepRing@cord_internal@absl@@SA_K_K0@Z
-    ?DoLoad@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@AEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@ZXZ
+    ?DoLoad@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@AEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@AEBAP6AXPEBDH000@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@AEBAP6AXPEBDPEBX@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@AEBAP6AXPEBDPEBX_J@ZXZ
@@ -2363,7 +2336,7 @@
     ?DoLoad@?$AtomicHook@P6AX_J@Z@base_internal@absl@@AEBAP6AX_J@ZXZ
     ?DoLoad@?$AtomicHook@P6A_NPEBXPEADH@Z@base_internal@absl@@AEBAP6A_NPEBXPEADH@ZXZ
     ?DoLoad@?$AtomicHook@P6A_NW4LogSeverity@absl@@PEBDHPEAPEADPEAH@Z@base_internal@absl@@AEBAP6A_NW4LogSeverity@3@PEBDHPEAPEADPEAH@ZXZ
-    ?DoStore@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@AEAA_NP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z@Z
+    ?DoStore@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@AEAA_NP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z@Z
     ?DoStore@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@AEAA_NP6AXPEBDH000@Z@Z
     ?DoStore@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@AEAA_NP6AXPEBDPEBX@Z@Z
     ?DoStore@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@AEAA_NP6AXPEBDPEBX_J@Z@Z
@@ -2374,7 +2347,7 @@
     ?DoStore@?$AtomicHook@P6A_NPEBXPEADH@Z@base_internal@absl@@AEAA_NP6A_NPEBXPEADH@Z@Z
     ?DoStore@?$AtomicHook@P6A_NW4LogSeverity@absl@@PEBDHPEAPEADPEAH@Z@base_internal@absl@@AEAA_NP6A_NW4LogSeverity@3@PEBDHPEAPEADPEAH@Z@Z
     ?DropDeletesWithoutResize@container_internal@absl@@YAXAEAVCommonFields@12@AEBUPolicyFunctions@12@PEAX@Z
-    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z
+    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@CAXPEBDH000@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@CAXPEBDPEBX@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@CAXPEBDPEBX_J@Z
@@ -2382,15 +2355,15 @@
     ?DummyFunction@?$AtomicHook@P6AXXZ@base_internal@absl@@CAXXZ
     ?DummyFunction@?$AtomicHook@P6AX_J@Z@base_internal@absl@@CAX_J@Z
     ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
     ?DumpPCAndFrameSizesAndStackTrace@debugging_internal@absl@@YAXQEAXQEBQEAXQEAHHH_NP6AXPEBDPEAX@Z5@Z
     ?DumpStackTrace@debugging_internal@absl@@YAXHH_NP6AXPEBDPEAX@Z2@Z
     ?DurationFromTimespec@absl@@YA?AVDuration@1@Utimespec@@@Z
     ?DurationFromTimeval@absl@@YA?AVDuration@1@Utimeval@@@Z
     ?Edge@CordRepBtree@cord_internal@absl@@QEBAPEAUCordRep@23@W4EdgeType@123@@Z
     ?Edge@CordRepBtree@cord_internal@absl@@QEBAPEAUCordRep@23@_K@Z
-    ?EdgeData@cord_internal@absl@@YA?AVstring_view@2@PEBUCordRep@12@@Z
+    ?EdgeData@cord_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEBUCordRep@12@@Z
     ?Edges@CordRepBtree@cord_internal@absl@@QEBA?AV?$Span@QEAUCordRep@cord_internal@absl@@@3@XZ
     ?Edges@CordRepBtree@cord_internal@absl@@QEBA?AV?$Span@QEAUCordRep@cord_internal@absl@@@3@_K0@Z
     ?EmplaceTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@AEBVInlineData@53@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -2412,22 +2385,22 @@
     ?EncodeBytesTruncate@log_internal@absl@@YA_N_KV?$Span@$$CBD@2@PEAV?$Span@D@2@@Z
     ?EncodeMessageLength@log_internal@absl@@YAXV?$Span@D@2@PEBV32@@Z
     ?EncodeMessageStart@log_internal@absl@@YA?AV?$Span@D@2@_K0PEAV32@@Z
-    ?EncodeStringTruncate@log_internal@absl@@YA_N_KVstring_view@2@PEAV?$Span@D@2@@Z
+    ?EncodeStringTruncate@log_internal@absl@@YA_N_KV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$Span@D@2@@Z
     ?EncodeUTF8Char@strings_internal@absl@@YA_KPEAD_U@Z
     ?EncodeVarint@log_internal@absl@@YA_N_K0PEAV?$Span@D@2@@Z
     ?EncodeWaitCycles@SpinLock@base_internal@absl@@KAI_J0@Z
     ?EndsWith@Cord@absl@@QEBA_NAEBV12@@Z
-    ?EndsWith@Cord@absl@@QEBA_NVstring_view@2@@Z
-    ?EndsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?EqualsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?EndsWith@Cord@absl@@QEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?EndsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?EqualsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?EqualsImpl@Cord@absl@@AEBA_NAEBV12@_K@Z
-    ?EqualsImpl@Cord@absl@@AEBA_NVstring_view@2@_K@Z
+    ?EqualsImpl@Cord@absl@@AEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?EqualsSlow@Status@absl@@CA_NAEBV12@0@Z
     ?EquivTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEBA_NEE@Z
     ?Erase@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@0@Z
     ?EraseMetaOnly@container_internal@absl@@YAXAEAVCommonFields@12@PEAW4ctrl_t@12@_K@Z
-    ?ErasePayload@Status@absl@@QEAA_NVstring_view@2@@Z
-    ?ErrnoToStatus@absl@@YA?AVStatus@1@HVstring_view@1@@Z
+    ?ErasePayload@Status@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ErrnoToStatus@absl@@YA?AVStatus@1@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ErrnoToStatusCode@absl@@YA?AW4StatusCode@1@H@Z
     ?Eval@Condition@absl@@QEBA_NXZ
     ?Excess@str_format_internal@absl@@YA_K_K0@Z
@@ -2436,17 +2409,17 @@
     ?Extend@CRC32@crc_internal@absl@@UEBAXPEAIPEBX_K@Z
     ?ExtendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?ExtendByZeroesImpl@CRC32@crc_internal@absl@@CAXPEAI_KQEBI2@Z
-    ?ExtendCrc32c@absl@@YA?AVcrc32c_t@1@V21@Vstring_view@1@@Z
+    ?ExtendCrc32c@absl@@YA?AVcrc32c_t@1@V21@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendCrc32cByZeroes@absl@@YA?AVcrc32c_t@1@V21@_K@Z
     ?ExtendCrc32cInline@crc_internal@absl@@YA_NPEAIPEBD_K@Z
-    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@Vstring_view@2@@Z
+    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NXZ
     ?ExtractAppendBuffer@CordRepBtree@cord_internal@absl@@SA?AUExtractResult@CordRep@23@PEAV123@_K@Z
     ?ExtractFront@CordRepBtree@cord_internal@absl@@CAPEAUCordRep@23@PEAV123@@Z
     ?FDivDuration@absl@@YANVDuration@1@0@Z
     ?FailQuietly@LogMessage@log_internal@absl@@KAXXZ
     ?FailWithoutStackTrace@LogMessage@log_internal@absl@@KAXXZ
-    ?FailedPreconditionError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?FailedPreconditionError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?FailureSignalToString@debugging_internal@absl@@YAPEBDH@Z
     ?FastHexToBufferZeroPad16@numbers_internal@absl@@YA_K_KPEAD@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADHPEAD@Z
@@ -2462,12 +2435,12 @@
     ?FillWordTable@CRCImpl@crc_internal@absl@@SAXIIHPEAY0BAA@I@Z
     ?FillZeroesTable@CRCImpl@crc_internal@absl@@SAHIPEAY0BAA@I@Z
     ?FinalizeEncodingAndFormat@LogMessageData@LogMessage@log_internal@absl@@QEAAXXZ
-    ?Find@ByAnyChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByLength@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByString@absl@@QEBA?AVstring_view@2@V32@_K@Z
+    ?Find@ByAnyChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByLength@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByString@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
     ?Find@CordRepRing@cord_internal@absl@@QEBA?AUPosition@123@_K@Z
-    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AVstring_view@3@XZ
+    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?FindPath@GraphCycles@synchronization_internal@absl@@QEBAHUGraphId@23@0HQEAU423@@Z
     ?FindSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
     ?FindTail@CordRepRing@cord_internal@absl@@QEBA?AUPosition@123@I_K@Z
@@ -2483,15 +2456,15 @@
     ?FlagsToString@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4Flags@12@@Z
     ?FlatOverhead@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?FlatTagToLength@CordTestAccess@strings_internal@absl@@SA_KE@Z
-    ?FlattenSlowPath@Cord@absl@@AEAA?AVstring_view@2@XZ
+    ?FlattenSlowPath@Cord@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Floor@absl@@YA?AVDuration@1@V21@0@Z
     ?Flush@FormatSinkImpl@str_format_internal@absl@@QEAAXXZ
     ?Flush@LogMessage@log_internal@absl@@IEAAXXZ
     ?Flush@LogSink@absl@@UEAAXXZ
     ?FlushLogSinks@absl@@YAXXZ
     ?FlushLogSinks@log_internal@absl@@YAXXZ
-    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXVstring_view@absl@@@Z@2@@Z
-    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXVstring_view@absl@@AEBVCord@2@@Z@2@@Z
+    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@2@@Z
+    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@absl@@@Z@2@@Z
     ?ForVar1@CheckOpMessageBuilder@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForVar2@CheckOpMessageBuilder@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForgetDeadlockInfo@Mutex@absl@@QEAAXXZ
@@ -2513,7 +2486,7 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAA@@12@UVoidPtr@12@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAE@@12@PEBDVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@Vstring_view@2@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
+    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@MVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@NVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@OVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
@@ -2528,12 +2501,12 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_JVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_KVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatDuration@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
-    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IVstring_view@2@HW4PrefixFormat@12@3@Z
-    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IVstring_view@2@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
+    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@HW4PrefixFormat@12@3@Z
+    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
     ?FormatPack@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
+    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@VTime@1@VTimeZone@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@VTimeZone@1@@Z
-    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@VTime@1@VTimeZone@1@@Z
     ?FormatUntyped@str_format_internal@absl@@YA_NVFormatRawSinkImpl@12@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?FprintF@str_format_internal@absl@@YAHPEAU_iobuf@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?Frequency@CycleClock@base_internal@absl@@SANXZ
@@ -2598,9 +2571,9 @@
     ?GetDebugStackTraceHook@debugging_internal@absl@@YAP6AXQEBQEAXHP6AXPEBDPEAX@Z2@ZXZ
     ?GetEstimatedFairShareMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
     ?GetEstimatedMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
-    ?GetFirstChunk@Cord@absl@@CA?AVstring_view@2@AEBV12@@Z
-    ?GetFirstChunk@Cord@absl@@CA?AVstring_view@2@V32@@Z
-    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAVstring_view@2@@Z
+    ?GetFirstChunk@Cord@absl@@CA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV12@@Z
+    ?GetFirstChunk@Cord@absl@@CA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@@Z
+    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetHashtablezMaxSamples@container_internal@absl@@YA_KXZ
     ?GetHashtablezSampleParameter@container_internal@absl@@YAHXZ
     ?GetId@GraphCycles@synchronization_internal@absl@@QEAA?AUGraphId@23@PEAX@Z
@@ -2626,7 +2599,7 @@
     ?GetOrCreateCurrentThreadIdentity@synchronization_internal@absl@@YAPEAUThreadIdentity@base_internal@2@XZ
     ?GetParentMethod@CordzInfo@cord_internal@absl@@CA?AW4MethodIdentifier@CordzUpdateTracker@23@PEBV123@@Z
     ?GetParentStack@CordzInfo@cord_internal@absl@@QEBA?AV?$Span@QEAX@3@XZ
-    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@Vstring_view@2@@Z
+    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetPayloads@Status@absl@@AEAAPEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@2@XZ
     ?GetPayloads@Status@absl@@AEBAPEBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@2@XZ
     ?GetPrependBuffer@CordRepRing@cord_internal@absl@@QEAA?AV?$Span@D@3@_K@Z
@@ -2657,7 +2630,7 @@
     ?GetStackTrace@GraphCycles@synchronization_internal@absl@@QEAAHUGraphId@23@PEAPEAPEAX@Z
     ?GetStackTrace@absl@@YAHPEAPEAXHH@Z
     ?GetStackTraceWithContext@absl@@YAHPEAPEAXHHPEBXPEAH@Z
-    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@ZXZ
+    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@ZXZ
     ?GetStride@ExponentialBiased@profiling_internal@absl@@QEAA_J_J@Z
     ?GetTID@base_internal@absl@@YAIXZ
     ?GetTagForChar@str_format_internal@absl@@YA?AVConvTag@12@D@Z
@@ -2688,7 +2661,7 @@
     ?Guard@?$NullGuard@PEBE@log_internal@absl@@SAPEBEPEBE@Z
     ?Guard@?$NullGuard@PEBX@log_internal@absl@@SAAEBQEBXAEBQEBX@Z
     ?Guard@?$NullGuard@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@log_internal@absl@@SAAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV456@@Z
-    ?Guard@?$NullGuard@Vstring_view@absl@@@log_internal@absl@@SAAEBVstring_view@3@AEBV43@@Z
+    ?Guard@?$NullGuard@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@log_internal@absl@@SAAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV456@@Z
     ?Guard@?$NullGuard@_J@log_internal@absl@@SAAEB_JAEB_J@Z
     ?Guard@?$NullGuard@_K@log_internal@absl@@SAAEB_KAEB_K@Z
     ?Guard@?$NullGuard@_N@log_internal@absl@@SAAEB_NAEB_N@Z
@@ -2700,7 +2673,7 @@
     ?HasNode@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@@Z
     ?HasRandenHwAesImplementation@random_internal@absl@@YA_NXZ
     ?Head@CordzInfo@cord_internal@absl@@SAPEAV123@AEBVCordzSnapshot@23@@Z
-    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?HideMask@base_internal@absl@@YA_KXZ
     ?HighestBitSet@?$NonIterableBitMask@I$0BA@$0A@@container_internal@absl@@QEBAIXZ
     ?IDivDuration@absl@@YA_JVDuration@1@0PEAV21@@Z
@@ -2717,7 +2690,7 @@
     ?InfiniteDuration@absl@@YA?AVDuration@1@XZ
     ?InfiniteFuture@absl@@YA?AVTime@1@XZ
     ?InfinitePast@absl@@YA?AVTime@1@XZ
-    ?Init@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@PEAVCordRepBtree@23@@Z
+    ?Init@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVCordRepBtree@23@@Z
     ?Init@PerThreadSem@synchronization_internal@absl@@CAXPEAUThreadIdentity@base_internal@3@@Z
     ?InitDiscreteDistribution@random_internal@absl@@YA?AV?$vector@U?$pair@N_K@Cr@std@@V?$allocator@U?$pair@N_K@Cr@std@@@23@@Cr@std@@PEAV?$vector@NV?$allocator@N@Cr@std@@@45@@Z
     ?InitFirst@CordRepBtreeNavigator@cord_internal@absl@@QEAAPEAUCordRep@23@PEAVCordRepBtree@23@@Z
@@ -2727,7 +2700,7 @@
     ?InitTree@ChunkIterator@Cord@absl@@AEAAXPEAUCordRep@cord_internal@3@@Z
     ?InitWhat@BadStatusOrAccess@absl@@AEBAXXZ
     ?Initialize@ExponentialBiased@profiling_internal@absl@@AEAAXXZ
-    ?InitializeCordRepExternal@cord_internal@absl@@YAXVstring_view@2@PEAUCordRepExternal@12@@Z
+    ?InitializeCordRepExternal@cord_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAUCordRepExternal@12@@Z
     ?InitializeSymbolizer@absl@@YAXPEBD@Z
     ?InlinedRepToCode@Status@absl@@CA?AW4StatusCode@2@_K@Z
     ?InsertEdge@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@0@Z
@@ -2739,9 +2712,9 @@
     ?InternalAttemptToUseMutexInFatalSignalHandler@Mutex@absl@@SAXXZ
     ?InternalCondVarPoke@StdcppWaiter@synchronization_internal@absl@@AEAAXXZ
     ?InternalCondVarPoke@Win32Waiter@synchronization_internal@absl@@AEAAXXZ
-    ?InternalError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InternalError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?InternalStream@LogMessage@log_internal@absl@@QEAAAEAV123@XZ
-    ?InvalidArgumentError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InvalidArgumentError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?InvalidGraphId@synchronization_internal@absl@@YA?AUGraphId@12@XZ
     ?IsAborted@absl@@YA_NAEBVStatus@1@@Z
     ?IsAlreadyExists@absl@@YA_NAEBVStatus@1@@Z
@@ -2759,8 +2732,8 @@
     ?IsFailedPrecondition@absl@@YA_NAEBVStatus@1@@Z
     ?IsFatal@LogMessage@log_internal@absl@@AEBA_NXZ
     ?IsFlat@CordRep@cord_internal@absl@@QEBA_NXZ
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAVstring_view@3@@Z
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAVstring_view@3@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsFull@container_internal@absl@@YA_NW4ctrl_t@12@@Z
     ?IsHashtablezEnabled@container_internal@absl@@YA_NXZ
     ?IsImmortal@RefcountAndFlags@cord_internal@absl@@QEBA_NXZ
@@ -2796,7 +2769,7 @@
     ?Load16@big_endian@absl@@YAGPEBX@Z
     ?Load32@big_endian@absl@@YAIPEBX@Z
     ?Load32@little_endian@absl@@YAIPEBX@Z
-    ?Load@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@QEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@ZXZ
+    ?Load@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@QEBAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@ZXZ
     ?Load@?$AtomicHook@P6AXXZ@base_internal@absl@@QEBAP6AXXZXZ
     ?Load@TimeZoneIf@cctz@time_internal@absl@@SA?AV?$unique_ptr@VTimeZoneIf@cctz@time_internal@absl@@U?$default_delete@VTimeZoneIf@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@67@@Z
     ?Load@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NPEAVZoneInfoSource@234@@Z
@@ -2860,7 +2833,6 @@
     ?MaybeTrackCordImpl@CordzInfo@cord_internal@absl@@CAXAEAVInlineData@23@AEBV423@W4MethodIdentifier@CordzUpdateTracker@23@@Z
     ?MemcpyCrc32c@absl@@YA?AVcrc32c_t@1@PEAXPEBX_KV21@@Z
     ?MergeTrees@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@0@Z
-    ?Min@string_view@absl@@CA_K_K0@Z
     ?MinLogLevel@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?MixIntoSeedMaterial@random_internal@absl@@YAXV?$Span@$$CBI@2@V?$Span@I@2@@Z
     ?MovedFromRep@Status@absl@@CA_KXZ
@@ -2894,7 +2866,7 @@
     ?NewInternal@CRCImpl@crc_internal@absl@@SAPEAV123@XZ
     ?NewString@CheckOpMessageBuilder@log_internal@absl@@QEAAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Next@CordRepBtreeNavigator@cord_internal@absl@@QEAAPEAUCordRep@23@XZ
-    ?Next@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@XZ
+    ?Next@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Next@CordzInfo@cord_internal@absl@@QEBAPEAV123@AEBVCordzSnapshot@23@@Z
     ?NextCapacity@?$Storage@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@SA_K_K@Z
     ?NextCapacity@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@SA_K_K@Z
@@ -2910,13 +2882,13 @@
     ?Normalize@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?NormalizeLogSeverity@absl@@YA?AW4LogSeverity@1@W421@@Z
     ?NormalizedPrefixCrcAtNthChunk@CrcCordState@crc_internal@absl@@QEBA?AUPrefixCrc@123@_K@Z
-    ?NotFoundError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?NotFoundError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Notify@Notification@absl@@QEAAXXZ
     ?Now@CycleClock@base_internal@absl@@SA_JXZ
     ?Now@UnscaledCycleClock@base_internal@absl@@CA_JXZ
     ?Now@UnscaledCycleClockWrapperForGetCurrentTime@time_internal@absl@@SA_JXZ
     ?Now@absl@@YA?AVTime@1@XZ
-    ?NullSafeStringView@absl@@YA?AVstring_view@1@PEBD@Z
+    ?NullSafeStringView@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEBD@Z
     ?NumCPUs@base_internal@absl@@YAHXZ
     ?NumChunks@CrcCordState@crc_internal@absl@@QEBA_KXZ
     ?NumClonedBytes@container_internal@absl@@YA_KXZ
@@ -2925,29 +2897,29 @@
     ?OccursBefore@ViableSubstitution@strings_internal@absl@@QEBA_NAEBU123@@Z
     ?OneTimeInitThreadIdentity@synchronization_internal@absl@@YAXPEAUThreadIdentity@base_internal@2@@Z
     ?OppositeInfinity@time_internal@absl@@YA?AVDuration@2@V32@@Z
-    ?OutOfRangeError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?OutOfRangeError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParseDigits@str_format_internal@absl@@YAHAEADAEAPEBDQEBD@Z
-    ?ParseDuration@absl@@YA_NVstring_view@1@PEAVDuration@1@@Z
+    ?ParseDuration@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVDuration@1@PEAV234@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVTime@1@PEAV234@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParsePosixSpec@cctz@time_internal@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAUPosixTimeZone@123@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?PerTableSalt@container_internal@absl@@YA_KPEBW4ctrl_t@12@@Z
-    ?PermissionDeniedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?Piece@AlphaNum@absl@@QEBA?AVstring_view@2@XZ
+    ?PermissionDeniedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Piece@AlphaNum@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?PiecewiseChunkSize@hash_internal@absl@@YA_KXZ
     ?PointerToRep@Status@absl@@CA_KPEAUStatusRep@status_internal@2@@Z
     ?Poison@CrcCordState@crc_internal@absl@@QEAAXXZ
@@ -2961,14 +2933,14 @@
     ?PrepareToDie@LogMessage@log_internal@absl@@AEAAXXZ
     ?PrepareToModify@Status@absl@@AEAAXXZ
     ?Prepend@Cord@absl@@QEAAXAEBV12@@Z
-    ?Prepend@Cord@absl@@QEAAXVstring_view@2@@Z
+    ?Prepend@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?PrependArray@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?PrependArray@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
-    ?PrependPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?PrependPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -2982,7 +2954,7 @@
     ?Ptr@GraphCycles@synchronization_internal@absl@@QEAAPEAXUGraphId@23@@Z
     ?PushDead@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAXPEAUHashtablezInfo@container_internal@3@@Z
     ?PushNew@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAXPEAUHashtablezInfo@container_internal@3@@Z
-    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NVstring_view@3@HH_N@Z
+    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HH_N@Z
     ?PutTwoDigits@numbers_internal@absl@@YAX_KPEAD@Z
     ?RawAbsNanos@KernelTimeout@synchronization_internal@absl@@AEBA_JXZ
     ?RawEnableLogPrefix@log_internal@absl@@YAX_N@Z
@@ -2994,7 +2966,7 @@
     ?Read4To8@MixingHashState@hash_internal@absl@@CA_KPEBE_K@Z
     ?Read9To16@MixingHashState@hash_internal@absl@@CA?AU?$pair@_K_K@Cr@std@@PEBE_K@Z
     ?Read@CordRepBtreeNavigator@cord_internal@absl@@QEAA?AUReadResult@123@_K0@Z
-    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K0AEAPEAUCordRep@23@@Z
+    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K0AEAPEAUCordRep@23@@Z
     ?ReadDigits@?$BigUnsigned@$03@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadDigits@?$BigUnsigned@$0FE@@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadFloatMantissa@?$BigUnsigned@$03@strings_internal@absl@@QEAAHAEBUParsedFloat@23@H@Z
@@ -3061,7 +3033,7 @@
     ?ResetToBuiltinUTC@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NAEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?ResetToEmpty@InlineRep@Cord@absl@@AEAAXXZ
     ?Resize@?$ResizeUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
-    ?ResourceExhaustedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ResourceExhaustedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Rethrow@variant_internal@absl@@YAXXZ
     ?ReverseConsume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
     ?RoundUp@cord_internal@absl@@YA_K_K0@Z
@@ -3073,7 +3045,7 @@
     ?SanitizerUnpoisonMemoryRegion@container_internal@absl@@YAXPEBX_K@Z
     ?Scramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
     ?Seek@CordRepBtreeNavigator@cord_internal@absl@@QEAA?AUPosition@123@_K@Z
-    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K@Z
+    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?SendToLog@LogMessage@log_internal@absl@@AEAAXXZ
     ?SetAllocation@?$Storage@PEAUCordRep@cord_internal@absl@@$01V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXU?$Allocation@V?$allocator@PEAUCordRep@cord_internal@absl@@@Cr@std@@@23@@Z
     ?SetAllocation@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXU?$Allocation@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@23@@Z
@@ -3103,16 +3075,16 @@
     ?SetIsAllocated@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXXZ
     ?SetIsAllocated@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAXXZ
     ?SetLength@CordBuffer@absl@@QEAAX_K@Z
-    ?SetLogBacktraceLocation@absl@@YAXVstring_view@1@H@Z
+    ?SetLogBacktraceLocation@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?SetLoggingGlobalsListener@log_internal@absl@@YAXP6AXXZ@Z
     ?SetMaxFramesInLogStackTrace@log_internal@absl@@YAXH@Z
     ?SetMaxSamples@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@QEAAX_K@Z
     ?SetMinLogLevel@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetMutexDeadlockDetectionMode@absl@@YAXW4OnDeadlockCycle@1@@Z
-    ?SetPayload@Status@absl@@QEAAXVstring_view@2@VCord@2@@Z
+    ?SetPayload@Status@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VCord@2@@Z
     ?SetPrecision@FormatConversionSpecImplFriend@str_format_internal@absl@@SAXHPEAVFormatConversionSpecImpl@23@@Z
     ?SetStackUnwinder@absl@@YAXP6AHPEAPEAXPEAHHHPEBX1@Z@Z
-    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@Z@Z
+    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@Z
     ?SetStderrThreshold@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetSuppressSigabortTrace@log_internal@absl@@YA_N_N@Z
     ?SetThreadBlockedCounter@PerThreadSem@synchronization_internal@absl@@SAXPEAU?$atomic@H@Cr@std@@@Z
@@ -3125,7 +3097,7 @@
     ?SetValue@?$Manager@H$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBH@Z
     ?SetValue@?$Manager@I$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBI@Z
     ?SetValue@?$Manager@PEBD$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBQEBD@Z
-    ?SetValue@?$Manager@Vstring_view@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBVstring_view@4@@Z
+    ?SetValue@?$Manager@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?SetValue@?$Manager@_J$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AEB_J@Z
     ?SetWidth@FormatConversionSpecImplFriend@str_format_internal@absl@@SAXHPEAVFormatConversionSpecImpl@23@@Z
     ?ShiftLeft@?$BigUnsigned@$03@strings_internal@absl@@QEAAXH@Z
@@ -3135,16 +3107,16 @@
     ?ShouldLog@LogEveryNState@log_internal@absl@@QEAA_NH@Z
     ?ShouldLog@LogEveryPow2State@log_internal@absl@@QEAA_NXZ
     ?ShouldLog@LogFirstNState@log_internal@absl@@QEAA_NH@Z
-    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NVstring_view@2@H@Z
+    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?ShouldPrependLogPrefix@absl@@YA_NXZ
     ?ShouldSymbolizeLogStackTrace@log_internal@absl@@YA_NXZ
     ?Signal@CondVar@absl@@QEAAXXZ
     ?SignalAll@CondVar@absl@@QEAAXXZ
     ?SignedAddResult@int128_internal@absl@@YA?AVint128@2@V32@0@Z
     ?SignedSubstructResult@int128_internal@absl@@YA?AVint128@2@V32@00@Z
-    ?SimpleAtob@absl@@YA_NVstring_view@1@PEA_N@Z
-    ?SimpleAtod@absl@@YA_NVstring_view@1@PEAN@Z
-    ?SimpleAtof@absl@@YA_NVstring_view@1@PEAM@Z
+    ?SimpleAtob@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_N@Z
+    ?SimpleAtod@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAN@Z
+    ?SimpleAtof@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAM@Z
     ?SixDigitsToBuffer@numbers_internal@absl@@YA_KNPEAD@Z
     ?SizeofCordRepExternal@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?SizeofCordRepSubstring@CordTestAccess@strings_internal@absl@@SA_KXZ
@@ -3161,12 +3133,12 @@
     ?SpinLockWake@base_internal@absl@@YAXPEAU?$atomic@I@Cr@std@@_N@Z
     ?SpinLoop@SpinLock@base_internal@absl@@AEAAIXZ
     ?StackTraceWorksForTest@debugging_internal@absl@@YA_NXZ
-    ?StartsWith@absl@@YA_NVstring_view@1@0@Z
-    ?StartsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?StartsWith@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StartsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?StatusCodeToString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4StatusCode@1@@Z
     ?StderrThreshold@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?SteadyClockNow@KernelTimeout@synchronization_internal@absl@@CA_JXZ
-    ?Store@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@QEAAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z@Z
+    ?Store@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@QEAAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z@Z
     ?Store@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@QEAAXP6AXPEBDH000@Z@Z
     ?Store@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@QEAAXP6AXPEBDPEBX@Z@Z
     ?Store@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@QEAAXP6AXPEBDPEBX_J@Z@Z
@@ -3184,21 +3156,20 @@
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@00@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@0@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@@Z
-    ?StrContains@absl@@YA_NVstring_view@1@D@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@D@Z
+    ?StrContains@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ?StrError@base_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@H@Z
-    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
-    ?StripAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StripLeadingAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StripTrailingAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StrlenInternal@string_view@absl@@CA_KPEBD@Z
+    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
+    ?StripAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
+    ?StripLeadingAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
+    ?StripTrailingAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
     ?SubLength@CordRepRing@cord_internal@absl@@AEAAXI_K@Z
     ?SubRing@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@_K11@Z
     ?SubTree@CordRepBtree@cord_internal@absl@@QEAAPEAUCordRep@23@_K0@Z
     ?Subcord@Cord@absl@@QEBA?AV12@_K0@Z
-    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@PEBV62@_K@Z
+    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@PEBV645@_K@Z
     ?Substring@CordRepSubstring@cord_internal@absl@@SAPEAUCordRep@23@PEAU423@_K1@Z
     ?SubstructResult@int128_internal@absl@@YA?AVuint128@2@V32@00@Z
     ?SubtractSize@?$Storage@H$0CP@V?$allocator@H@Cr@std@@@inlined_vector_internal@absl@@QEAAX_K@Z
@@ -3315,13 +3286,13 @@
     ?UnalignedLoad16@base_internal@absl@@YAGPEBX@Z
     ?UnalignedLoad32@base_internal@absl@@YAIPEBX@Z
     ?UnalignedLoad64@base_internal@absl@@YA_KPEBX@Z
-    ?UnauthenticatedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnavailableError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnauthenticatedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnavailableError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UnextendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?UnextendCrc32cByZeroes@crc_internal@absl@@YA?AVcrc32c_t@2@V32@_K@Z
-    ?UnimplementedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnimplementedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UniversalEpoch@absl@@YA?AVTime@1@XZ
-    ?UnknownError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnknownError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Unlock@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?Unlock@Mutex@absl@@QEAAXXZ
     ?Unlock@SpinLock@base_internal@absl@@QEAAXXZ
@@ -3340,8 +3311,8 @@
     ?Unscramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
     ?Untrack@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?UpdateStackTrace@GraphCycles@synchronization_internal@absl@@QEAAXUGraphId@23@HP6AHPEAPEAXH@Z@Z
-    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?Validate@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEBDH@Z
     ?Value@?$Manager@C$01@FormatArgImpl@str_format_internal@absl@@SACTData@234@@Z
     ?Value@?$Manager@D$01@FormatArgImpl@str_format_internal@absl@@SADTData@234@@Z
@@ -3358,8 +3329,8 @@
     ?Value@?$Manager@PEBD$01@FormatArgImpl@str_format_internal@absl@@SAPEBDTData@234@@Z
     ?Value@?$Manager@UVoidPtr@str_format_internal@absl@@$01@FormatArgImpl@str_format_internal@absl@@SA?AUVoidPtr@34@TData@234@@Z
     ?Value@?$Manager@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@TData@234@@Z
+    ?Value@?$Manager@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@TData@234@@Z
     ?Value@?$Manager@Vint128@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBVint128@4@TData@234@@Z
-    ?Value@?$Manager@Vstring_view@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBVstring_view@4@TData@234@@Z
     ?Value@?$Manager@Vuint128@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAAEBVuint128@4@TData@234@@Z
     ?Value@?$Manager@_J$01@FormatArgImpl@str_format_internal@absl@@SA_JTData@234@@Z
     ?Value@?$Manager@_K$01@FormatArgImpl@str_format_internal@absl@@SA_KTData@234@@Z
@@ -3383,18 +3354,18 @@
     ?WaitWithTimeout@CondVar@absl@@QEAA_NPEAVMutex@2@VDuration@2@@Z
     ?Wakeup@CondVar@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?Wakeup@Mutex@absl@@AEAAPEAUPerThreadSynch@base_internal@2@PEAU342@@Z
-    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?WebSafeBase64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?WebSafeBase64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?WebSafeBase64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?WebSafeBase64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?WithMetadataFrom@LogMessage@log_internal@absl@@QEAAAEAV123@AEBVLogEntry@3@@Z
     ?WithPerror@LogMessage@log_internal@absl@@QEAAAEAV123@XZ
     ?WithThreadID@LogMessage@log_internal@absl@@QEAAAEAV123@I@Z
     ?WithTimestamp@LogMessage@log_internal@absl@@QEAAAEAV123@VTime@3@@Z
     ?WithVerbosity@LogMessage@log_internal@absl@@QEAAAEAV123@H@Z
-    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?Write@FILERawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?Write@FormatRawSinkImpl@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?WriteToStderr@log_internal@absl@@YAXVstring_view@2@W4LogSeverity@2@@Z
+    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FILERawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FormatRawSinkImpl@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?WriteToStderr@log_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4LogSeverity@2@@Z
     ?WriterLock@Mutex@absl@@QEAAXXZ
     ?WriterUnlock@Mutex@absl@@QEAAXXZ
     ?ZeroDuration@absl@@YA?AVDuration@1@XZ
@@ -3869,9 +3840,7 @@
     ?begin@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBAPEBQEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?begin@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@23@XZ
     ?begin@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@23@XZ
-    ?begin@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QEBAPEBU?$pair@Vstring_view@absl@@V12@@Cr@2@XZ
     ?begin@?$initializer_list@VFormatArgImpl@str_format_internal@absl@@@std@@QEBAPEBVFormatArgImpl@str_format_internal@absl@@XZ
-    ?begin@?$initializer_list@Vstring_view@absl@@@std@@QEBAPEBVstring_view@absl@@XZ
     ?begin@?$initializer_list@W4FormatConversionCharSet@absl@@@std@@QEBAPEBW4FormatConversionCharSet@absl@@XZ
     ?begin@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_map_iterator@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@XZ
     ?begin@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAPEAVCordzHandle@cord_internal@absl@@@23@XZ
@@ -3883,7 +3852,6 @@
     ?begin@ChunkRange@Cord@absl@@QEBA?AVChunkIterator@23@XZ
     ?begin@CordRepBtree@cord_internal@absl@@QEBA_KXZ
     ?begin@__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AU1234@XZ
-    ?begin@string_view@absl@@QEBAPEBDXZ
     ?btree@CordRep@cord_internal@absl@@QEAAPEAVCordRepBtree@23@XZ
     ?btree@CordRep@cord_internal@absl@@QEBAPEBVCordRepBtree@23@XZ
     ?btree@CordRepBtreeNavigator@cord_internal@absl@@QEBAPEAVCordRepBtree@23@XZ
@@ -3979,7 +3947,6 @@
     ?data@CordBuffer@absl@@QEAAPEADXZ
     ?data@InlineRep@Cord@absl@@QEBAPEBDXZ
     ?data@Rep@CordBuffer@absl@@QEAAPEADXZ
-    ?data@string_view@absl@@QEBAPEBDXZ
     ?day@?$civil_time@Uday_tag@detail@cctz@time_internal@absl@@@detail@cctz@time_internal@absl@@QEBAHXZ
     ?day@?$civil_time@Usecond_tag@detail@cctz@time_internal@absl@@@detail@cctz@time_internal@absl@@QEBAHXZ
     ?day@?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@absl@@QEBAHXZ
@@ -4042,7 +4009,6 @@
     ?empty@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBA_NXZ
     ?empty@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QEBA_NXZ
     ?empty@Cord@absl@@QEBA_NXZ
-    ?empty@string_view@absl@@QEBA_NXZ
     ?end@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@2@XZ
     ?end@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEBAPEBUPayload@status_internal@2@XZ
     ?end@?$Span@$$CBI@absl@@QEBAPEBIXZ
@@ -4056,8 +4022,6 @@
     ?end@?$deque@PEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__deque_iterator@PEBVImpl@time_zone@cctz@time_internal@absl@@PEAPEBV12345@AEAPEBV12345@PEAPEAPEBV12345@_J$0A@@23@XZ
     ?end@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEAU1234@AEAU1234@PEAPEAU1234@_J$0A@@23@XZ
     ?end@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@23@XZ
-    ?end@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QEBAPEBU?$pair@Vstring_view@absl@@V12@@Cr@2@XZ
-    ?end@?$initializer_list@Vstring_view@absl@@@std@@QEBAPEBVstring_view@absl@@XZ
     ?end@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_map_iterator@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@XZ
     ?end@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAPEAVCordzHandle@cord_internal@absl@@@23@XZ
     ?end@?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@QEAA?AV?$__wrap_iter@PEAPEAVLogSink@absl@@@23@XZ
@@ -4067,7 +4031,6 @@
     ?end@ChunkRange@Cord@absl@@QEBA?AVChunkIterator@23@XZ
     ?end@CordRepBtree@cord_internal@absl@@QEBA_KXZ
     ?end@__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA?AU1234@XZ
-    ?end@string_view@absl@@QEBAPEBDXZ
     ?engines@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@4@PEIAXPEIBX_KV54@_N@Z@4UArchSpecificEngines@234@B
     ?entries@CordRepRing@cord_internal@absl@@QEBAIII@Z
     ?entries@CordRepRing@cord_internal@absl@@QEBAIXZ
@@ -4088,19 +4051,7 @@
     ?external@CordRep@cord_internal@absl@@QEBAPEBUCordRepExternal@23@XZ
     ?fetch_add_end@CordRepBtree@cord_internal@absl@@AEAA_K_K@Z
     ?find@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_map_iterator@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@23@@Z
-    ?find@string_view@absl@@QEBA_KD_K@Z
-    ?find@string_view@absl@@QEBA_KV12@_K@Z
     ?find_first_non_full_outofline@container_internal@absl@@YA?AUFindInfo@12@AEBVCommonFields@12@_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KPEBD_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KPEBD_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KV12@_K@Z
     ?first@?$__compressed_pair@MV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QEAAAEAMXZ
     ?first@?$__compressed_pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAPEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?first@?$__compressed_pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBAAEBQEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
@@ -4179,7 +4130,6 @@
     ?front@?$__split_buffer@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?front@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?front@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUTransition@cctz@time_internal@absl@@XZ
-    ?front@string_view@absl@@QEBAAEBDXZ
     ?gbswap_16@absl@@YAGG@Z
     ?gbswap_32@absl@@YAII@Z
     ?gbswap_64@absl@@YA_K_K@Z
@@ -4197,7 +4147,6 @@
     ?get@?$Storage@_K$0A@$0A@@internal_compressed_tuple@container_internal@absl@@QEGAAAEA_KXZ
     ?get@?$__temp_value@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUTransition@cctz@time_internal@absl@@XZ
     ?get@?$__temp_value@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUTransitionType@cctz@time_internal@absl@@XZ
-    ?get@?$__tuple_leaf@$0A@AEBVstring_view@absl@@$0A@@Cr@std@@QEBAAEBVstring_view@absl@@XZ
     ?get@?$unique_ptr@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@V?$__allocator_destructor@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@@Cr@std@@QEBAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?get@?$unique_ptr@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$__allocator_destructor@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@@Cr@std@@QEBAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?get@?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@@23@@Cr@std@@QEBAPEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@23@XZ
@@ -4255,7 +4204,6 @@
     ?key_eq@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAAAEAV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@XZ
     ?length@?$Span@D@absl@@QEBA_KXZ
     ?length@CordRepBtreeReader@cord_internal@absl@@QEBA_KXZ
-    ?length@string_view@absl@@QEBA_KXZ
     ?load@?$__atomic_base@P6AXAEBUHashtablezInfo@container_internal@absl@@@Z$0A@@Cr@std@@QEBAP6AXAEBUHashtablezInfo@container_internal@absl@@@ZW4memory_order@23@@Z
     ?load@?$__atomic_base@PEAUHashtablezInfo@container_internal@absl@@$0A@@Cr@std@@QEBAPEAUHashtablezInfo@container_internal@absl@@W4memory_order@23@@Z
     ?load@?$__atomic_base@PEAVCordzHandle@cord_internal@absl@@$0A@@Cr@std@@QEBAPEAVCordzHandle@cord_internal@absl@@W4memory_order@23@@Z
@@ -4294,7 +4242,7 @@
     ?mempbrk@strings_internal@absl@@YAPEADPEBD_K0@Z
     ?memrchr@strings_internal@absl@@YAPEADPEBDH_K@Z
     ?memspn@strings_internal@absl@@YA_KPEBD_K0@Z
-    ?message@Status@absl@@QEBA?AVstring_view@2@XZ
+    ?message@Status@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?min@?$RandenPool@E@random_internal@absl@@SAEXZ
     ?min@?$RandenPool@G@random_internal@absl@@SAGXZ
     ?min@?$RandenPool@I@random_internal@absl@@SAIXZ
@@ -4369,7 +4317,6 @@
     ?push_front@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@AEAV?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAXAEBQEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Z
     ?push_front@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAX$$QEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Z
     ?raw_code@Status@absl@@QEBAHXZ
-    ?rbegin@string_view@absl@@QEBA?AV?$reverse_iterator@PEBD@Cr@std@@XZ
     ?reduce_size@InlineRep@Cord@absl@@QEAAX_K@Z
     ?reference@?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@AEAAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?reference@?$optional@_K@absl@@AEAAAEA_KXZ
@@ -4384,11 +4331,8 @@
     ?remove_prefix@?$Span@$$CBD@absl@@QEAAX_K@Z
     ?remove_prefix@?$Span@D@absl@@QEAAX_K@Z
     ?remove_prefix@InlineRep@Cord@absl@@QEAAX_K@Z
-    ?remove_prefix@string_view@absl@@QEAAX_K@Z
     ?remove_suffix@?$Span@$$CBD@absl@@QEAAX_K@Z
     ?remove_suffix@?$Span@D@absl@@QEAAX_K@Z
-    ?remove_suffix@string_view@absl@@QEAAX_K@Z
-    ?rend@string_view@absl@@QEBA?AV?$reverse_iterator@PEBD@Cr@std@@XZ
     ?rep@CrcCordState@crc_internal@absl@@QEBAAEBURep@123@XZ
     ?rep@Rep@CordBuffer@absl@@QEBAPEAUCordRepFlat@cord_internal@3@XZ
     ?reserve@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
@@ -4409,16 +4353,14 @@
     ?resize@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
     ?retreat@CordRepRing@cord_internal@absl@@QEBAII@Z
     ?retreat@CordRepRing@cord_internal@absl@@QEBAIII@Z
-    ?rfind@string_view@absl@@QEBA_KD_K@Z
-    ?rfind@string_view@absl@@QEBA_KV12@_K@Z
     ?ring@CordRep@cord_internal@absl@@QEAAPEAVCordRepRing@23@XZ
     ?ring@CordRep@cord_internal@absl@@QEBAPEBVCordRepRing@23@XZ
-    ?safe_strto128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVint128@2@H@Z
-    ?safe_strto32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAHH@Z
-    ?safe_strto64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_JH@Z
-    ?safe_strtou128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVuint128@2@H@Z
-    ?safe_strtou32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAIH@Z
-    ?safe_strtou64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_KH@Z
+    ?safe_strto128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVint128@2@H@Z
+    ?safe_strto32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAHH@Z
+    ?safe_strto64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_JH@Z
+    ?safe_strtou128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVuint128@2@H@Z
+    ?safe_strtou32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAIH@Z
+    ?safe_strtou64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_KH@Z
     ?scale_add@impl@detail@cctz@time_internal@absl@@YA_J_J00@Z
     ?second@?$__compressed_pair@MV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QEAAAEAV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@XZ
     ?second@?$__compressed_pair@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@23@XZ
@@ -4515,7 +4457,6 @@
     ?size@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
     ?size@?$deque@PEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
     ?size@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
-    ?size@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QEBA_KXZ
     ?size@?$initializer_list@VFormatArgImpl@str_format_internal@absl@@@std@@QEBA_KXZ
     ?size@?$initializer_list@W4FormatConversionCharSet@absl@@@std@@QEBA_KXZ
     ?size@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QEBA_KXZ
@@ -4530,10 +4471,9 @@
     ?size@Cord@absl@@QEBA_KXZ
     ?size@CordRepBtree@cord_internal@absl@@QEBA_KXZ
     ?size@InlineRep@Cord@absl@@QEBA_KXZ
-    ?size@string_view@absl@@QEBA_KXZ
-    ?source_basename@LogEntry@absl@@QEBA?AVstring_view@2@XZ
+    ?source_basename@LogEntry@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?source_line@LogEntry@absl@@QEBAHXZ
-    ?stacktrace@LogEntry@absl@@QEBA?AVstring_view@2@XZ
+    ?stacktrace@LogEntry@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?status@BadStatusOrAccess@absl@@QEBAAEBVStatus@2@XZ
     ?step@detail@cctz@time_internal@absl@@YA?AUfields@1234@Uday_tag@1234@U51234@_J@Z
     ?step@detail@cctz@time_internal@absl@@YA?AUfields@1234@Usecond_tag@1234@U51234@_J@Z
@@ -4541,19 +4481,18 @@
     ?store@?$__atomic_base@PEAVCordzInfo@cord_internal@absl@@$0A@@Cr@std@@QEAAXPEAVCordzInfo@cord_internal@absl@@W4memory_order@23@@Z
     ?store@?$__atomic_base@W4OnDeadlockCycle@absl@@$0A@@Cr@std@@QEAAXW4OnDeadlockCycle@absl@@W4memory_order@23@@Z
     ?store@?$__atomic_base@W4State@PerThreadSynch@base_internal@absl@@$0A@@Cr@std@@QEAAXW4State@PerThreadSynch@base_internal@absl@@W4memory_order@23@@Z
-    ?str@UntypedFormatSpecImpl@str_format_internal@absl@@QEBA?AVstring_view@3@XZ
+    ?str@UntypedFormatSpecImpl@str_format_internal@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?stream@OstreamView@LogMessage@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
-    ?string_value@ProtoField@log_internal@absl@@QEBA?AVstring_view@3@XZ
+    ?string_value@ProtoField@log_internal@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?sub_fetch_begin@CordRepBtree@cord_internal@absl@@AEAA_K_K@Z
     ?subspan@?$Span@$$CBD@absl@@QEBA?AV12@_K0@Z
     ?subspan@?$Span@D@absl@@QEBA?AV12@_K0@Z
-    ?substr@string_view@absl@@QEBA?AV12@_K0@Z
     ?substring@CordRep@cord_internal@absl@@QEAAPEAUCordRepSubstring@23@XZ
     ?substring@CordRep@cord_internal@absl@@QEBAPEBUCordRepSubstring@23@XZ
     ?tag@ProtoField@log_internal@absl@@QEBA_KXZ
     ?tag@Rep@InlineData@cord_internal@absl@@QEBACXZ
     ?tail@CordRepRing@cord_internal@absl@@QEBAIXZ
-    ?text_message_with_prefix_and_newline@LogEntry@absl@@QEBA?AVstring_view@2@XZ
+    ?text_message_with_prefix_and_newline@LogEntry@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?text_message_with_prefix_and_newline_c_str@LogEntry@absl@@QEBAPEBDXZ
     ?thread_identity@PerThreadSynch@base_internal@absl@@QEAAPEAUThreadIdentity@23@XZ
     ?throw_bad_optional_access@optional_internal@absl@@YAXXZ

third_party/abseil-cpp/symbols_x64_rel.def

diff --git a/third_party/abseil-cpp/symbols_x64_rel.def b/third_party/abseil-cpp/symbols_x64_rel.def
index 97358aa..70a0585 100644
--- a/third_party/abseil-cpp/symbols_x64_rel.def
+++ b/third_party/abseil-cpp/symbols_x64_rel.def
@@ -1,6 +1,7 @@
 EXPORTS
     ?$TSS0@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z@4HA
     ??$?0AEBVCord@absl@@@?$optional_data_dtor_base@VCord@absl@@$0A@@optional_internal@absl@@IEAA@Uin_place_t@2@AEBVCord@2@@Z
+    ??$?0V?$allocator@D@Cr@std@@@AlphaNum@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAA@$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?6C$0A@@LogMessage@log_internal@absl@@QEAAAEAV012@AEBC@Z
     ??$?6D$0A@@LogMessage@log_internal@absl@@QEAAAEAV012@AEBD@Z
@@ -26,10 +27,10 @@
     ??$AbslStringify@VStringifySink@strings_internal@absl@@@absl@@YAXAEAVStringifySink@strings_internal@0@UHex@0@@Z
     ??$AddCordRep@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
     ??$AddCordRep@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
     ??$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
     ??$Append@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -70,8 +71,8 @@
     ??$Dispatch@PEBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
+    ??$Dispatch@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
-    ??$Dispatch@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
@@ -82,13 +83,14 @@
     ??$EmplaceBack@UPayload@status_internal@absl@@@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAAEAUPayload@status_internal@2@$$QEAU342@@Z
     ??$EmplaceBackSlow@AEBQEAVLogSink@absl@@@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@AEAAAEAPEAVLogSink@2@AEBQEAV32@@Z
     ??$EmplaceBackSlow@UPayload@status_internal@absl@@@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@AEAAAEAUPayload@status_internal@2@$$QEAU342@@Z
+    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAVStringifySink@01@AEBUHex@1@@Z
     ??$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
     ??$Fill@$0A@@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
-    ??$FindSubstitutions@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@Vstring_view@1@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
+    ??$FindSubstitutions@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV234@II@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$Fill@$00@012@AEAAXPEBV012@II@Z@@Z
@@ -96,12 +98,12 @@
     ??$ForEach@V<lambda_2>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_2>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_2>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_2>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$FormatConvertImpl@_N$0A@@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@01@_NVFormatConversionSpecImpl@01@PEAVFormatSinkImpl@01@@Z
+    ??$GenericCompare@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@HVCord@absl@@@absl@@YAHAEBVCord@0@0_K@Z
-    ??$GenericCompare@HVstring_view@absl@@@absl@@YAHAEBVCord@0@AEBVstring_view@0@_K@Z
+    ??$GenericCompare@_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YA_NAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@_NVCord@absl@@@absl@@YA_NAEBVCord@0@0_K@Z
-    ??$GenericCompare@_NVstring_view@absl@@@absl@@YA_NAEBVCord@0@AEBVstring_view@0@_K@Z
     ??$MakeCheckOpString@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV234@0PEBD@Z
-    ??$MakeCheckOpString@AEBVstring_view@absl@@AEBV12@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVstring_view@1@0PEBD@Z
+    ??$MakeCheckOpString@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@0PEBD@Z
     ??$MakeCheckOpString@DD@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@DDPEBD@Z
     ??$MakeCheckOpString@EE@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@EEPEBD@Z
     ??$MakeCheckOpString@MM@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@MMPEBD@Z
@@ -117,11 +119,11 @@
     ??$Merge@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@0@Z
     ??$NewImpl@$0BAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
     ??$NewImpl@$0EAAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
-    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
-    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
+    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$ParseFloat@$09@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
     ??$ParseFloat@$0BA@@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
-    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NVstring_view@1@UParsedFormatConsumer@ParsedFormatBase@01@@Z
+    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@UParsedFormatConsumer@ParsedFormatBase@01@@Z
     ??$PopDead@_J_K@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAPEAUHashtablezInfo@container_internal@2@_J_K@Z
     ??$Prepend@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$Register@AEB_JAEA_K@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@QEAAPEAUHashtablezInfo@container_internal@2@AEB_JAEA_K@Z
@@ -129,19 +131,19 @@
     ??$STLStringResizeUninitializedAmortized@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
     ??$SetEdge@$00@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
-    ??$StrFormat@DHHHHH_JIVstring_view@absl@@HPEBDV12@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBVstring_view@0@2AEBQEBD5@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@0@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@3@@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
+    ??$StrFormat@DHHHHH_JIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HPEBDV123@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@2AEBQEBD5@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@3@@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
     ??$__append@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@Cr@std@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAXV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@12@0PEAX@Z
     ??$__construct_at_end@V?$move_iterator@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@?$__split_buffer@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@@12@0@Z
     ??$__construct_at_end@V?$move_iterator@PEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@AEAV?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@@12@0@Z
     ??$__construct_at_end@V?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@Cr@std@@@?$__split_buffer@UTransition@cctz@time_internal@absl@@AEAV?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@12@0@Z
     ??$__construct_at_end@V?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@Cr@std@@@?$__split_buffer@UTransitionType@cctz@time_internal@absl@@AEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@12@0@Z
-    ??$__construct_one_at_end@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__construct_one_at_end@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__destroy_at@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@$0A@@Cr@std@@YAXPEAU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@01@@Z
     ??$__destroy_at@UPayload@status_internal@absl@@$0A@@Cr@std@@YAXPEAUPayload@status_internal@absl@@@Z
     ??$__do_rehash@$00@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AEAAX_K@Z
-    ??$__emplace_back_slow_path@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__emplace_back_slow_path@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__emplace_unique_key_args@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBUpiecewise_construct_t@23@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AU?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@_N@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@AEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QEAV?$tuple@$$V@12@@Z
     ??$__push_back_slow_path@AEBQEAVCordzHandle@cord_internal@absl@@@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVCordzHandle@cord_internal@absl@@@Z
     ??$__push_back_slow_path@AEBQEAVLogSink@absl@@@?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVLogSink@absl@@@Z
@@ -165,10 +167,10 @@
     ??$emplace_back@HVcrc32c_t@absl@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUPrefixCrc@CrcCordState@crc_internal@absl@@$$QEAH$$QEAVcrc32c_t@6@@Z
     ??$find@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@@Z
     ??$find_first_non_full@X@container_internal@absl@@YA?AUFindInfo@01@AEBVCommonFields@01@_K@Z
-    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@_K@Z
-    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@_K@Z
     ??0?$RandenPool@E@random_internal@absl@@QEAA@XZ
@@ -191,15 +193,16 @@
     ??0BadStatusOrAccess@absl@@QEAA@AEBV01@@Z
     ??0BadStatusOrAccess@absl@@QEAA@VStatus@1@@Z
     ??0BlockingCounter@absl@@QEAA@H@Z
-    ??0ByAnyChar@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByAnyChar@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0ByLength@absl@@QEAA@_J@Z
-    ??0ByString@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByString@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0CRC@crc_internal@absl@@IEAA@XZ
     ??0CheckOpMessageBuilder@log_internal@absl@@QEAA@PEBD@Z
+    ??0ChunkIterator@Cord@absl@@AEAA@PEAUCordRep@cord_internal@2@@Z
     ??0ChunkIterator@Cord@absl@@AEAA@PEBV12@@Z
     ??0Condition@absl@@QEAA@P6A_NPEAX@Z0@Z
     ??0Condition@absl@@QEAA@PEB_N@Z
-    ??0Cord@absl@@AEAA@Vstring_view@1@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
+    ??0Cord@absl@@AEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
     ??0Cord@absl@@QEAA@AEBV01@@Z
     ??0CordzHandle@cord_internal@absl@@IEAA@_N@Z
     ??0CordzInfo@cord_internal@absl@@AEAA@PEAUCordRep@12@PEBV012@W4MethodIdentifier@CordzUpdateTracker@12@@Z
@@ -214,18 +217,17 @@
     ??0LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@2@@Z
     ??0LogMessageData@LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@3@VTime@3@@Z
     ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0OstreamView@LogMessage@log_internal@absl@@QEAA@AEAULogMessageData@123@@Z
-    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@Vstring_view@2@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@std@@@Z
+    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@5@@Z
     ??0Randen@random_internal@absl@@QEAA@XZ
     ??0Rep@GraphCycles@synchronization_internal@absl@@QEAA@XZ
     ??0ScopedMinLogLevel@log_internal@absl@@QEAA@W4LogSeverityAtLeast@2@@Z
     ??0ScopedStderrThreshold@absl@@QEAA@W4LogSeverityAtLeast@1@@Z
     ??0SpinLock@base_internal@absl@@QEAA@W4SchedulingMode@12@@Z
-    ??0Status@absl@@QEAA@W4StatusCode@1@Vstring_view@1@@Z
-    ??0StatusRep@status_internal@absl@@QEAA@W4StatusCode@2@Vstring_view@2@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@@Z
+    ??0Status@absl@@QEAA@W4StatusCode@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0StdcppWaiter@synchronization_internal@absl@@QEAA@XZ
     ??0Streamable@str_format_internal@absl@@QEAA@AEBVUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ??0TimeZoneLibC@cctz@time_internal@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -233,7 +235,6 @@
     ??0int128@absl@@QEAA@M@Z
     ??0int128@absl@@QEAA@N@Z
     ??0int128@absl@@QEAA@O@Z
-    ??0string_view@absl@@QEAA@PEBD@Z
     ??0uint128@absl@@QEAA@M@Z
     ??0uint128@absl@@QEAA@N@Z
     ??0uint128@absl@@QEAA@O@Z
@@ -265,17 +266,16 @@
     ??4?$optional_data@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@optional_internal@absl@@IEAAAEAV012@$$QEAV012@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@$$QEAV01@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@AEBV01@@Z
-    ??4Cord@absl@@QEAAAEAV01@Vstring_view@1@@Z
+    ??4Cord@absl@@QEAAAEAV01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@$$QEAV012@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@AEBV012@@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV345@@Z@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAVios_base@Cr@std@@AEAV345@@Z@Z
-    ??6LogMessage@log_internal@absl@@QEAAAEAV012@Vstring_view@2@@Z
+    ??6LogMessage@log_internal@absl@@QEAAAEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVCord@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVStatus@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vint128@0@@Z
-    ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vstring_view@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vuint128@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverity@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverityAtLeast@0@@Z
@@ -300,6 +300,7 @@
     ??ACord@absl@@QEBAD_K@Z
     ??BCord@absl@@QEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ??Bint128@absl@@QEBANXZ
+    ??EChunkIterator@Cord@absl@@QEAAAEAV012@XZ
     ??Gdetail@cctz@time_internal@absl@@YA?AV?$civil_time@Uday_tag@detail@cctz@time_internal@absl@@@0123@V40123@_J@Z
     ??Gdetail@cctz@time_internal@absl@@YA?AV?$civil_time@Usecond_tag@detail@cctz@time_internal@absl@@@0123@V40123@_J@Z
     ??Gdetail@cctz@time_internal@absl@@YA_JV?$civil_time@Usecond_tag@detail@cctz@time_internal@absl@@@0123@0@Z
@@ -308,8 +309,6 @@
     ??Kabsl@@YA?AVuint128@0@V10@0@Z
     ??Labsl@@YA?AVint128@0@V10@0@Z
     ??Labsl@@YA?AVuint128@0@V10@0@Z
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHAEBV23@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAVstring_view@3@@Z
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@AEBAHVstring_view@3@_K1@Z@QEBA?A?<auto>@@PEAVChunkIterator@23@PEAV43@@Z
     ??R?$RandenPool@E@random_internal@absl@@QEAAEXZ
     ??R?$RandenPool@G@random_internal@absl@@QEAAGXZ
     ??R?$RandenPool@I@random_internal@absl@@QEAAIXZ
@@ -325,15 +324,15 @@
     ??_0Duration@absl@@QEAAAEAV01@N@Z
     ??_0Duration@absl@@QEAAAEAV01@_J@Z
     ??_1Duration@absl@@QEAAAEAV01@V01@@Z
-    ?AbortedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?AbortedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?AbslUnparseFlag@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@@Z
@@ -354,29 +353,29 @@
     ?AdvanceAndReadBytes@ChunkIterator@Cord@absl@@AEAA?AV23@_K@Z
     ?AdvanceBytesBtree@ChunkIterator@Cord@absl@@AEAAX_K@Z
     ?AllocWithArena@LowLevelAlloc@base_internal@absl@@SAPEAX_KPEAUArena@123@@Z
-    ?AlreadyExistsError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AlreadyExistsError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@?$AppendUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
     ?Append@Cord@absl@@QEAAX$$QEAV12@@Z
     ?Append@Cord@absl@@QEAAXAEBV12@@Z
-    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAX_KD@Z
-    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NVstring_view@4@@Z
-    ?Append@StringifySink@strings_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Append@StringifySink@strings_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@StringifySink@strings_internal@absl@@QEAAX_KD@Z
-    ?AppendArray@InlineRep@Cord@absl@@QEAAXVstring_view@3@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
+    ?AppendArray@InlineRep@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
     ?AppendLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
     ?AppendPack@str_format_internal@absl@@YAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAV345@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
-    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
-    ?AppendPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
+    ?AppendPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?AppendSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToInlined@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
-    ?ApplySubstitutions@strings_internal@absl@@YAHVstring_view@2@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@56@@Z
+    ?ApplySubstitutions@strings_internal@absl@@YAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@45@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AsciiStrToLower@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AsciiStrToUpper@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AssertHeld@Mutex@absl@@QEBAXXZ
@@ -388,31 +387,31 @@
     ?AsyncSignalSafeWriteToStderr@raw_log_internal@absl@@YAXPEBD_K@Z
     ?At@TimeZone@absl@@QEBA?AUCivilInfo@12@VTime@2@@Z
     ?At@TimeZone@absl@@QEBA?AUTimeInfo@12@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@@Z
-    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@Vstring_view@3@H@Z
+    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?Await@Mutex@absl@@QEAAXAEBVCondition@2@@Z
     ?AwaitCommon@Mutex@absl@@AEAA_NAEBVCondition@2@VKernelTimeout@synchronization_internal@2@@Z
     ?AwaitWithDeadline@Mutex@absl@@QEAA_NAEBVCondition@2@VTime@2@@Z
     ?AwaitWithTimeout@Mutex@absl@@QEAA_NAEBVCondition@2@VDuration@2@@Z
-    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Base64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Base64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?Base64EscapeInternal@strings_internal@absl@@YA_KPEBE_KPEAD1PEBD_N@Z
-    ?Base64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?BindWithPack@str_format_internal@absl@@YA_NPEBUUnboundConversion@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@PEAVBoundConversion@12@@Z
     ?Block@Barrier@absl@@QEAA_NXZ
     ?Block@Mutex@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?BreakTime@TimeZoneInfo@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?BreakTime@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?Build@Header@TimeZoneInfo@cctz@time_internal@absl@@QEAA_NAEBUtzhead@@@Z
-    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?CPUSupportsRandenHwAes@random_internal@absl@@YA_NXZ
-    ?CUnescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@1@Z
+    ?CUnescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@1@Z
     ?CalculateBase64EscapedLenInternal@strings_internal@absl@@YA_K_K_N@Z
     ?CallVoidPtrFunction@Condition@absl@@CA_NPEBV12@@Z
-    ?CancelledError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEVstring_view@2@0E@Z
-    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
+    ?CancelledError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0E@Z
+    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
     ?Ceil@absl@@YA?AVDuration@1@V21@0@Z
     ?CheckInvariants@GraphCycles@synchronization_internal@absl@@QEBA_NXZ
     ?CheckstrcasecmpfalseImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
@@ -432,13 +431,14 @@
     ?CombineContiguousImpl@MixingHashState@hash_internal@absl@@CA_K_KPEBE0U?$integral_constant@H$07@Cr@std@@@Z
     ?CombineLargeContiguousImpl32@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
     ?CombineLargeContiguousImpl64@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
-    ?Compare@Cord@absl@@QEBAHVstring_view@2@@Z
+    ?Compare@Cord@absl@@QEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?CompareImpl@Cord@absl@@AEBAHAEBV12@@Z
     ?CompareSlowPath@Cord@absl@@AEBAHAEBV12@_K1@Z
+    ?CompareSlowPath@Cord@absl@@AEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K1@Z
     ?Compute@CrcNonTemporalMemcpyAVXEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@CrcNonTemporalMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@FallbackCrcMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
-    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@Vstring_view@1@@Z
+    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Concat@CRC@crc_internal@absl@@UEAAXPEAII_K@Z
     ?ConcatCrc32c@absl@@YA?AVcrc32c_t@1@V21@0_K@Z
     ?Consume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
@@ -451,7 +451,7 @@
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NMAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NNAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NOAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@Vstring_view@4@@Z
+    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Copy@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@II_K@Z
     ?CopyCordToString@absl@@YAXAEBVCord@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyPrefix@CordRepBtree@cord_internal@absl@@AEAA?AUCopyResult@123@_K_N@Z
@@ -459,7 +459,7 @@
     ?CopyTo@InlineRep@Cord@absl@@QEBAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyToArraySlowPath@Cord@absl@@AEBAXPEAD@Z
     ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXD_KW4StringType@123@@Z
-    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXVstring_view@3@W4StringType@123@@Z
+    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4StringType@123@@Z
     ?Crash@Helper@internal_statusor@absl@@SAXAEBVStatus@3@@Z
     ?Crc32c@CRC@crc_internal@absl@@SAPEAV123@XZ
     ?CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z
@@ -470,8 +470,8 @@
     ?CreateThreadIdentity@synchronization_internal@absl@@YAPEAUThreadIdentity@base_internal@2@XZ
     ?CurrentThreadIdentityIfPresent@base_internal@absl@@YAPEAUThreadIdentity@12@XZ
     ?DataLength@Header@TimeZoneInfo@cctz@time_internal@absl@@QEBA_K_K@Z
-    ?DataLossError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?DeadlineExceededError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?DataLossError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?DeadlineExceededError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?DecodeFrom@ProtoField@log_internal@absl@@QEAA_NPEAV?$Span@$$CBD@3@@Z
     ?DecodeWaitCycles@SpinLock@base_internal@absl@@KA_JI@Z
     ?DecrementCount@BlockingCounter@absl@@QEAA_NXZ
@@ -498,7 +498,7 @@
     ?Digits10@?$BigUnsigned@$03@strings_internal@absl@@SAHXZ
     ?Digits10@?$BigUnsigned@$0FE@@strings_internal@absl@@SAHXZ
     ?DropDeletesWithoutResize@container_internal@absl@@YAXAEAVCommonFields@12@AEBUPolicyFunctions@12@PEAX@Z
-    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z
+    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@CAXPEBDH000@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@CAXPEBDPEBX@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@CAXPEBDPEBX_J@Z
@@ -506,8 +506,8 @@
     ?DummyFunction@?$AtomicHook@P6AXXZ@base_internal@absl@@CAXXZ
     ?DummyFunction@?$AtomicHook@P6AX_J@Z@base_internal@absl@@CAX_J@Z
     ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
     ?DumpPCAndFrameSizesAndStackTrace@debugging_internal@absl@@YAXQEAXQEBQEAXQEAHHH_NP6AXPEBDPEAX@Z5@Z
     ?DumpStackTrace@debugging_internal@absl@@YAXHH_NP6AXPEBDPEAX@Z2@Z
     ?DurationFromTimespec@absl@@YA?AVDuration@1@Utimespec@@@Z
@@ -531,17 +531,17 @@
     ?EncodeVarint@log_internal@absl@@YA_N_K0PEAV?$Span@D@2@@Z
     ?EncodeWaitCycles@SpinLock@base_internal@absl@@KAI_J0@Z
     ?EndsWith@Cord@absl@@QEBA_NAEBV12@@Z
-    ?EndsWith@Cord@absl@@QEBA_NVstring_view@2@@Z
-    ?EndsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?EqualsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?EndsWith@Cord@absl@@QEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?EndsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?EqualsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?EqualsImpl@Cord@absl@@AEBA_NAEBV12@_K@Z
-    ?EqualsImpl@Cord@absl@@AEBA_NVstring_view@2@_K@Z
+    ?EqualsImpl@Cord@absl@@AEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?EqualsSlow@Status@absl@@CA_NAEBV12@0@Z
     ?EquivTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEBA_NEE@Z
     ?Erase@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@0@Z
     ?EraseMetaOnly@container_internal@absl@@YAXAEAVCommonFields@12@PEAW4ctrl_t@12@_K@Z
-    ?ErasePayload@Status@absl@@QEAA_NVstring_view@2@@Z
-    ?ErrnoToStatus@absl@@YA?AVStatus@1@HVstring_view@1@@Z
+    ?ErasePayload@Status@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ErrnoToStatus@absl@@YA?AVStatus@1@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ErrnoToStatusCode@absl@@YA?AW4StatusCode@1@H@Z
     ?Eval@Condition@absl@@QEBA_NXZ
     ?ExitOnDFatal@log_internal@absl@@YA_NXZ
@@ -550,14 +550,14 @@
     ?ExtendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?ExtendByZeroesImpl@CRC32@crc_internal@absl@@CAXPEAI_KQEBI2@Z
     ?ExtendCrc32cByZeroes@absl@@YA?AVcrc32c_t@1@V21@_K@Z
-    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@Vstring_view@2@@Z
+    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NXZ
     ?ExtractAppendBuffer@CordRepBtree@cord_internal@absl@@SA?AUExtractResult@CordRep@23@PEAV123@_K@Z
     ?ExtractFront@CordRepBtree@cord_internal@absl@@CAPEAUCordRep@23@PEAV123@@Z
     ?FDivDuration@absl@@YANVDuration@1@0@Z
     ?FailQuietly@LogMessage@log_internal@absl@@KAXXZ
     ?FailWithoutStackTrace@LogMessage@log_internal@absl@@KAXXZ
-    ?FailedPreconditionError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?FailedPreconditionError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?FailureSignalToString@debugging_internal@absl@@YAPEBDH@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADHPEAD@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADIPEAD@Z
@@ -572,10 +572,11 @@
     ?FillWordTable@CRCImpl@crc_internal@absl@@SAXIIHPEAY0BAA@I@Z
     ?FillZeroesTable@CRCImpl@crc_internal@absl@@SAHIPEAY0BAA@I@Z
     ?FinalizeEncodingAndFormat@LogMessageData@LogMessage@log_internal@absl@@QEAAXXZ
-    ?Find@ByAnyChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByLength@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByString@absl@@QEBA?AVstring_view@2@V32@_K@Z
+    ?Find@ByAnyChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByLength@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByString@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?FindPath@GraphCycles@synchronization_internal@absl@@QEBAHUGraphId@23@0HQEAU423@@Z
     ?FindSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
     ?FindTailSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
@@ -587,13 +588,13 @@
     ?FlagsToString@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4Flags@12@@Z
     ?FlatOverhead@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?FlatTagToLength@CordTestAccess@strings_internal@absl@@SA_KE@Z
-    ?FlattenSlowPath@Cord@absl@@AEAA?AVstring_view@2@XZ
+    ?FlattenSlowPath@Cord@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Floor@absl@@YA?AVDuration@1@V21@0@Z
     ?Flush@LogMessage@log_internal@absl@@IEAAXXZ
     ?Flush@LogSink@absl@@UEAAXXZ
     ?FlushLogSinks@log_internal@absl@@YAXXZ
-    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXVstring_view@absl@@@Z@2@@Z
-    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXVstring_view@absl@@AEBVCord@2@@Z@2@@Z
+    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@2@@Z
+    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@absl@@@Z@2@@Z
     ?ForVar2@CheckOpMessageBuilder@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForgetDeadlockInfo@Mutex@absl@@QEAAXXZ
     ?FormatCivilTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
@@ -609,7 +610,7 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAA@@12@UVoidPtr@12@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAE@@12@PEBDVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@Vstring_view@2@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
+    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@MVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@NVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@OVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
@@ -624,12 +625,12 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_JVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_KVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatDuration@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
-    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IVstring_view@2@HW4PrefixFormat@12@3@Z
-    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IVstring_view@2@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
+    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@HW4PrefixFormat@12@3@Z
+    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
     ?FormatPack@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
+    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@VTime@1@VTimeZone@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@VTimeZone@1@@Z
-    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@VTime@1@VTimeZone@1@@Z
     ?FormatUntyped@str_format_internal@absl@@YA_NVFormatRawSinkImpl@12@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?FprintF@str_format_internal@absl@@YAHPEAU_iobuf@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?Frequency@UnscaledCycleClock@base_internal@absl@@CANXZ
@@ -657,7 +658,7 @@
     ?GetDebugStackTraceHook@debugging_internal@absl@@YAP6AXQEBQEAXHP6AXPEBDPEAX@Z2@ZXZ
     ?GetEstimatedFairShareMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
     ?GetEstimatedMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
-    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAVstring_view@2@@Z
+    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetHashtablezMaxSamples@container_internal@absl@@YA_KXZ
     ?GetHashtablezSampleParameter@container_internal@absl@@YAHXZ
     ?GetId@GraphCycles@synchronization_internal@absl@@QEAA?AUGraphId@23@PEAX@Z
@@ -665,7 +666,7 @@
     ?GetKeys@RandenSlow@random_internal@absl@@SAPEBXXZ
     ?GetParentMethod@CordzInfo@cord_internal@absl@@CA?AW4MethodIdentifier@CordzUpdateTracker@23@PEBV123@@Z
     ?GetParentStack@CordzInfo@cord_internal@absl@@QEBA?AV?$Span@QEAX@3@XZ
-    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@Vstring_view@2@@Z
+    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetPrependBuffer@CordRepRing@cord_internal@absl@@QEAA?AV?$Span@D@3@_K@Z
     ?GetProgramCounter@debugging_internal@absl@@YAPEAXQEAX@Z
     ?GetSaltMaterial@random_internal@absl@@YA?AV?$optional@I@2@XZ
@@ -676,7 +677,7 @@
     ?GetStackTrace@GraphCycles@synchronization_internal@absl@@QEAAHUGraphId@23@PEAPEAPEAX@Z
     ?GetStackTrace@absl@@YAHPEAPEAXHH@Z
     ?GetStackTraceWithContext@absl@@YAHPEAPEAXHHPEBXPEAH@Z
-    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@ZXZ
+    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@ZXZ
     ?GetStride@ExponentialBiased@profiling_internal@absl@@QEAA_J_J@Z
     ?GetTID@base_internal@absl@@YAIXZ
     ?GetTestEngine@CrcMemcpy@crc_internal@absl@@SA?AV?$unique_ptr@VCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@Cr@std@@HH@Z
@@ -692,7 +693,7 @@
     ?HasNode@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@@Z
     ?HasRandenHwAesImplementation@random_internal@absl@@YA_NXZ
     ?Head@CordzInfo@cord_internal@absl@@SAPEAV123@AEBVCordzSnapshot@23@@Z
-    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?IDivDuration@time_internal@absl@@YA_J_NVDuration@2@1PEAV32@@Z
     ?In@Time@absl@@QEBA?AUBreakdown@12@VTimeZone@2@@Z
     ?InMillisecondsFromNow@KernelTimeout@synchronization_internal@absl@@QEBAKXZ
@@ -703,15 +704,15 @@
     ?InitTables@CRC32@crc_internal@absl@@UEAAXXZ
     ?InitWhat@BadStatusOrAccess@absl@@AEBAXXZ
     ?Initialize@ExponentialBiased@profiling_internal@absl@@AEAAXXZ
-    ?InitializeCordRepExternal@cord_internal@absl@@YAXVstring_view@2@PEAUCordRepExternal@12@@Z
+    ?InitializeCordRepExternal@cord_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAUCordRepExternal@12@@Z
     ?InitializeSymbolizer@absl@@YAXPEBD@Z
     ?InsertEdge@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@0@Z
     ?InstallFailureSignalHandler@absl@@YAXAEBUFailureSignalHandlerOptions@1@@Z
     ?InternalAttemptToUseMutexInFatalSignalHandler@Mutex@absl@@SAXXZ
     ?InternalCondVarPoke@StdcppWaiter@synchronization_internal@absl@@AEAAXXZ
     ?InternalCondVarPoke@Win32Waiter@synchronization_internal@absl@@AEAAXXZ
-    ?InternalError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?InvalidArgumentError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InternalError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?InvalidArgumentError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsAborted@absl@@YA_NAEBVStatus@1@@Z
     ?IsAlreadyExists@absl@@YA_NAEBVStatus@1@@Z
     ?IsCancelled@absl@@YA_NAEBVStatus@1@@Z
@@ -719,8 +720,8 @@
     ?IsDeadlineExceeded@absl@@YA_NAEBVStatus@1@@Z
     ?IsFailedPrecondition@absl@@YA_NAEBVStatus@1@@Z
     ?IsFatal@LogMessage@log_internal@absl@@AEBA_NXZ
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAVstring_view@3@@Z
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAVstring_view@3@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsHashtablezEnabled@container_internal@absl@@YA_NXZ
     ?IsInitialized@log_internal@absl@@YA_NXZ
     ?IsInternal@absl@@YA_NAEBVStatus@1@@Z
@@ -809,32 +810,32 @@
     ?NominalCPUFrequency@base_internal@absl@@YANXZ
     ?Normalize@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?NormalizedPrefixCrcAtNthChunk@CrcCordState@crc_internal@absl@@QEBA?AUPrefixCrc@123@_K@Z
-    ?NotFoundError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?NotFoundError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Notify@Notification@absl@@QEAAXXZ
     ?Now@CycleClock@base_internal@absl@@SA_JXZ
     ?Now@absl@@YA?AVTime@1@XZ
     ?NumCPUs@base_internal@absl@@YAHXZ
     ?OneTimeInitThreadIdentity@synchronization_internal@absl@@YAXPEAUThreadIdentity@base_internal@2@@Z
-    ?OutOfRangeError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseDuration@absl@@YA_NVstring_view@1@PEAVDuration@1@@Z
+    ?OutOfRangeError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseDuration@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVDuration@1@PEAV234@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVTime@1@PEAV234@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParsePosixSpec@cctz@time_internal@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAUPosixTimeZone@123@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?PermissionDeniedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?PermissionDeniedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Poison@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?Poke@StdcppWaiter@synchronization_internal@absl@@QEAAXXZ
     ?Poke@Win32Waiter@synchronization_internal@absl@@QEAAXXZ
@@ -844,12 +845,12 @@
     ?PrepareToDie@LogMessage@log_internal@absl@@AEAAXXZ
     ?PrepareToModify@Status@absl@@AEAAXXZ
     ?Prepend@Cord@absl@@QEAAXAEBV12@@Z
-    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?PrependArray@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?PrependArray@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
-    ?PrependPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?PrependPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -861,14 +862,14 @@
     ?Print@Streamable@str_format_internal@absl@@QEBAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV456@@Z
     ?Ptr@GraphCycles@synchronization_internal@absl@@QEAAPEAXUGraphId@23@@Z
     ?PushDead@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAXPEAUHashtablezInfo@container_internal@3@@Z
-    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NVstring_view@3@HH_N@Z
+    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HH_N@Z
     ?RawEnableLogPrefix@log_internal@absl@@YAX_N@Z
     ?RawLog@raw_log_internal@absl@@YAXW4LogSeverity@2@PEBDH1ZZ
     ?RawLoggingFullySupported@raw_log_internal@absl@@YA_NXZ
     ?RawSetMinLogLevel@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?RawSetStderrThreshold@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?Read@CordRepBtreeNavigator@cord_internal@absl@@QEAA?AUReadResult@123@_K0@Z
-    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K0AEAPEAUCordRep@23@@Z
+    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K0AEAPEAUCordRep@23@@Z
     ?ReadDigits@?$BigUnsigned@$03@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadDigits@?$BigUnsigned@$0FE@@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadFloatMantissa@?$BigUnsigned@$03@strings_internal@absl@@QEAAHAEBUParsedFloat@23@H@Z
@@ -914,13 +915,13 @@
     ?RemoveSuffix@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@_K1@Z
     ?ResetToBuiltinUTC@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NAEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?Resize@?$ResizeUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
-    ?ResourceExhaustedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ResourceExhaustedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Rethrow@variant_internal@absl@@YAXXZ
     ?ReverseConsume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
     ?SafeToDelete@CordzHandle@cord_internal@absl@@QEBA_NXZ
     ?SampleSlow@container_internal@absl@@YAPEAUHashtablezInfo@12@AEAUSamplingState@12@_K@Z
     ?Scramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
-    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K@Z
+    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?SendToLog@LogMessage@log_internal@absl@@AEAAXXZ
     ?SetCapacityForTesting@CordRepRing@cord_internal@absl@@QEAAX_K@Z
     ?SetCrcCordState@Cord@absl@@AEAAXVCrcCordState@crc_internal@2@@Z
@@ -936,14 +937,14 @@
     ?SetHashtablezSampleParameter@container_internal@absl@@YAXH@Z
     ?SetHashtablezSampleParameterInternal@container_internal@absl@@YAXH@Z
     ?SetInitialized@log_internal@absl@@YAXXZ
-    ?SetLogBacktraceLocation@absl@@YAXVstring_view@1@H@Z
+    ?SetLogBacktraceLocation@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?SetLoggingGlobalsListener@log_internal@absl@@YAXP6AXXZ@Z
     ?SetMaxFramesInLogStackTrace@log_internal@absl@@YAXH@Z
     ?SetMinLogLevel@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetMutexDeadlockDetectionMode@absl@@YAXW4OnDeadlockCycle@1@@Z
-    ?SetPayload@Status@absl@@QEAAXVstring_view@2@VCord@2@@Z
+    ?SetPayload@Status@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VCord@2@@Z
     ?SetStackUnwinder@absl@@YAXP6AHPEAPEAXPEAHHHPEBX1@Z@Z
-    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@Z@Z
+    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@Z
     ?SetStderrThreshold@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetSuppressSigabortTrace@log_internal@absl@@YA_N_N@Z
     ?SetThreadBlockedCounter@PerThreadSem@synchronization_internal@absl@@SAXPEAU?$atomic@H@Cr@std@@@Z
@@ -957,14 +958,14 @@
     ?ShouldLog@LogEveryNState@log_internal@absl@@QEAA_NH@Z
     ?ShouldLog@LogEveryPow2State@log_internal@absl@@QEAA_NXZ
     ?ShouldLog@LogFirstNState@log_internal@absl@@QEAA_NH@Z
-    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NVstring_view@2@H@Z
+    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?ShouldPrependLogPrefix@absl@@YA_NXZ
     ?ShouldSymbolizeLogStackTrace@log_internal@absl@@YA_NXZ
     ?Signal@CondVar@absl@@QEAAXXZ
     ?SignalAll@CondVar@absl@@QEAAXXZ
-    ?SimpleAtob@absl@@YA_NVstring_view@1@PEA_N@Z
-    ?SimpleAtod@absl@@YA_NVstring_view@1@PEAN@Z
-    ?SimpleAtof@absl@@YA_NVstring_view@1@PEAM@Z
+    ?SimpleAtob@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_N@Z
+    ?SimpleAtod@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAN@Z
+    ?SimpleAtof@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAM@Z
     ?SixDigitsToBuffer@numbers_internal@absl@@YA_KNPEAD@Z
     ?SizeofCordRepExternal@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?SizeofCordRepSubstring@CordTestAccess@strings_internal@absl@@SA_KXZ
@@ -976,7 +977,7 @@
     ?SpinLockWait@base_internal@absl@@YAIPEAU?$atomic@I@Cr@std@@HQEBUSpinLockWaitTransition@12@W4SchedulingMode@12@@Z
     ?SpinLoop@SpinLock@base_internal@absl@@AEAAIXZ
     ?StackTraceWorksForTest@debugging_internal@absl@@YA_NXZ
-    ?StartsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?StartsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?StatusCodeToString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4StatusCode@1@@Z
     ?StderrThreshold@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?SteadyClockNow@KernelTimeout@synchronization_internal@absl@@CA_JXZ
@@ -987,16 +988,16 @@
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@000@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@00@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@D@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ?StrError@base_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@H@Z
-    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
+    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
     ?SubLength@CordRepRing@cord_internal@absl@@AEAAXI_K@Z
     ?SubRing@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@_K11@Z
     ?SubTree@CordRepBtree@cord_internal@absl@@QEAAPEAUCordRep@23@_K0@Z
     ?Subcord@Cord@absl@@QEBA?AV12@_K0@Z
-    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@PEBV62@_K@Z
+    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@PEBV645@_K@Z
     ?Summarize@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?SupportsArmCRC32PMULL@crc_internal@absl@@YA_NXZ
     ?SuppressSigabortTrace@log_internal@absl@@YA_NXZ
@@ -1079,12 +1080,12 @@
     ?TryRemove@Mutex@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?UTC@Impl@time_zone@cctz@time_internal@absl@@SA?AV2345@XZ
     ?UTCImpl@Impl@time_zone@cctz@time_internal@absl@@CAPEBV12345@XZ
-    ?UnauthenticatedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnavailableError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnauthenticatedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnavailableError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UnextendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?UnextendCrc32cByZeroes@crc_internal@absl@@YA?AVcrc32c_t@2@V32@_K@Z
-    ?UnimplementedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnknownError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnimplementedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnknownError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Unlock@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?Unlock@Mutex@absl@@QEAAXXZ
     ?UnlockSlow@Mutex@absl@@AEAAXPEAUSynchWaitParams@2@@Z
@@ -1097,8 +1098,8 @@
     ?Unscramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
     ?Untrack@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?UpdateStackTrace@GraphCycles@synchronization_internal@absl@@QEAAXUGraphId@23@HP6AHPEAPEAXH@Z@Z
-    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?Version@TimeZoneInfo@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@ZoneInfoSource@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
@@ -1114,17 +1115,17 @@
     ?WaitWithTimeout@CondVar@absl@@QEAA_NPEAVMutex@2@VDuration@2@@Z
     ?Wakeup@CondVar@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?Wakeup@Mutex@absl@@AEAAPEAUPerThreadSynch@base_internal@2@PEAU342@@Z
-    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?WebSafeBase64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?WebSafeBase64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?WebSafeBase64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?WebSafeBase64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?WithMetadataFrom@LogMessage@log_internal@absl@@QEAAAEAV123@AEBVLogEntry@3@@Z
     ?WithPerror@LogMessage@log_internal@absl@@QEAAAEAV123@XZ
     ?WithThreadID@LogMessage@log_internal@absl@@QEAAAEAV123@I@Z
     ?WithTimestamp@LogMessage@log_internal@absl@@QEAAAEAV123@VTime@3@@Z
     ?WithVerbosity@LogMessage@log_internal@absl@@QEAAAEAV123@H@Z
-    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?Write@FILERawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?WriteToStderr@log_internal@absl@@YAXVstring_view@2@W4LogSeverity@2@@Z
+    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FILERawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?WriteToStderr@log_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4LogSeverity@2@@Z
     ?__add_back_capacity@?$deque@PEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAX_K@Z
@@ -1155,15 +1156,7 @@
     ?effective_impl@time_zone@cctz@time_internal@absl@@AEBAAEBVImpl@1234@XZ
     ?engines@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@4@PEIAXPEIBX_KV54@_N@Z@4UArchSpecificEngines@234@B
     ?erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@2@PEBU342@@Z
-    ?find@string_view@absl@@QEBA_KD_K@Z
-    ?find@string_view@absl@@QEBA_KV12@_K@Z
     ?find_first_non_full_outofline@container_internal@absl@@YA?AUFindInfo@12@AEBVCommonFields@12@_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KV12@_K@Z
     ?fixed_time_zone@cctz@time_internal@absl@@YA?AVtime_zone@123@AEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?format@detail@cctz@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV567@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@67@AEBV?$duration@_JV?$ratio@$00$0DINHOKEMGIAAA@@Cr@std@@@967@AEBVtime_zone@234@@Z
     ?from_chars@absl@@YA?AUfrom_chars_result@1@PEBD0AEAMW4chars_format@1@@Z
@@ -1221,14 +1214,12 @@
     ?reset@?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QEAAXPEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Z
     ?resize@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
     ?resize@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
-    ?rfind@string_view@absl@@QEBA_KD_K@Z
-    ?rfind@string_view@absl@@QEBA_KV12@_K@Z
-    ?safe_strto128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVint128@2@H@Z
-    ?safe_strto32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAHH@Z
-    ?safe_strto64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_JH@Z
-    ?safe_strtou128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVuint128@2@H@Z
-    ?safe_strtou32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAIH@Z
-    ?safe_strtou64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_KH@Z
+    ?safe_strto128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVint128@2@H@Z
+    ?safe_strto32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAHH@Z
+    ?safe_strto64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_JH@Z
+    ?safe_strtou128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVuint128@2@H@Z
+    ?safe_strtou32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAIH@Z
+    ?safe_strtou64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_KH@Z
     ?set_cordz_mean_interval@cord_internal@absl@@YAXH@Z
     ?set_inline_data@InlineData@cord_internal@absl@@QEAAXPEBD_K@Z
     ?shallow_subcords_enabled@cord_internal@absl@@3U?$atomic@_N@Cr@std@@A

third_party/abseil-cpp/symbols_x64_rel_asan.def

diff --git a/third_party/abseil-cpp/symbols_x64_rel_asan.def b/third_party/abseil-cpp/symbols_x64_rel_asan.def
index fc33e34..1d32ec82 100644
--- a/third_party/abseil-cpp/symbols_x64_rel_asan.def
+++ b/third_party/abseil-cpp/symbols_x64_rel_asan.def
@@ -1,6 +1,7 @@
 EXPORTS
     ?$TSS0@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z@4HA
     ??$?0AEBVCord@absl@@@?$optional_data_dtor_base@VCord@absl@@$0A@@optional_internal@absl@@IEAA@Uin_place_t@2@AEBVCord@2@@Z
+    ??$?0V?$allocator@D@Cr@std@@@AlphaNum@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAA@$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?6C$0A@@LogMessage@log_internal@absl@@QEAAAEAV012@AEBC@Z
     ??$?6D$0A@@LogMessage@log_internal@absl@@QEAAAEAV012@AEBD@Z
@@ -26,10 +27,10 @@
     ??$AbslStringify@VStringifySink@strings_internal@absl@@@absl@@YAXAEAVStringifySink@strings_internal@0@UHex@0@@Z
     ??$AddCordRep@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
     ??$AddCordRep@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@PEAUCordRep@12@@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AVstring_view@2@V32@_K@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@Vstring_view@2@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
     ??$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV012@PEAV012@0_K1@Z
     ??$Append@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -69,8 +70,8 @@
     ??$Dispatch@PEBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
+    ??$Dispatch@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
-    ??$Dispatch@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
     ??$Dispatch@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PEAX@Z
@@ -81,13 +82,14 @@
     ??$EmplaceBack@UPayload@status_internal@absl@@@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAAEAUPayload@status_internal@2@$$QEAU342@@Z
     ??$EmplaceBackSlow@AEBQEAVLogSink@absl@@@?$Storage@PEAVLogSink@absl@@$0BA@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@AEAAAEAPEAVLogSink@2@AEBQEAV32@@Z
     ??$EmplaceBackSlow@UPayload@status_internal@absl@@@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@AEAAAEAUPayload@status_internal@2@$$QEAU342@@Z
+    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAVStringifySink@01@AEBUHex@1@@Z
     ??$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
     ??$Fill@$0A@@CordRepRing@cord_internal@absl@@AEAAXPEBV012@II@Z
-    ??$FindSubstitutions@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@Vstring_view@1@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
-    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXVstring_view@2@@Z
+    ??$FindSubstitutions@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPEAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$00@CordRepRing@cord_internal@absl@@AEAAXPEBV234@II@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_1>@?0???$Fill@$00@012@AEAAXPEBV012@II@Z@@Z
@@ -95,12 +97,12 @@
     ??$ForEach@V<lambda_2>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_2>@?0???$AddRing@$00@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$ForEach@V<lambda_2>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPEAV234@PEAV234@0_K1@Z@@CordRepRing@cord_internal@absl@@QEBAXII$$QEAV<lambda_2>@?0???$AddRing@$0A@@012@CAPEAV012@PEAV012@0_K1@Z@@Z
     ??$FormatConvertImpl@_N$0A@@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@01@_NVFormatConversionSpecImpl@01@PEAVFormatSinkImpl@01@@Z
+    ??$GenericCompare@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@HVCord@absl@@@absl@@YAHAEBVCord@0@0_K@Z
-    ??$GenericCompare@HVstring_view@absl@@@absl@@YAHAEBVCord@0@AEBVstring_view@0@_K@Z
+    ??$GenericCompare@_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YA_NAEBVCord@0@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$GenericCompare@_NVCord@absl@@@absl@@YA_NAEBVCord@0@0_K@Z
-    ??$GenericCompare@_NVstring_view@absl@@@absl@@YA_NAEBVCord@0@AEBVstring_view@0@_K@Z
     ??$MakeCheckOpString@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV234@0PEBD@Z
-    ??$MakeCheckOpString@AEBVstring_view@absl@@AEBV12@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVstring_view@1@0PEBD@Z
+    ??$MakeCheckOpString@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@0PEBD@Z
     ??$MakeCheckOpString@DD@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@DDPEBD@Z
     ??$MakeCheckOpString@EE@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@EEPEBD@Z
     ??$MakeCheckOpString@MM@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@MMPEBD@Z
@@ -116,11 +118,11 @@
     ??$Merge@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@PEAV012@0@Z
     ??$NewImpl@$0BAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
     ??$NewImpl@$0EAAAA@$$V@CordRepFlat@cord_internal@absl@@SAPEAU012@_K@Z
-    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
-    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@Vstring_view@2@_K@Z
+    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ??$ParseFloat@$09@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
     ??$ParseFloat@$0BA@@strings_internal@absl@@YA?AUParsedFloat@01@PEBD0W4chars_format@1@@Z
-    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NVstring_view@1@UParsedFormatConsumer@ParsedFormatBase@01@@Z
+    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@UParsedFormatConsumer@ParsedFormatBase@01@@Z
     ??$PopDead@_J_K@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAPEAUHashtablezInfo@container_internal@2@_J_K@Z
     ??$Prepend@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QEAAX$$QEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$Register@AEB_JAEA_K@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@QEAAPEAUHashtablezInfo@container_internal@2@AEB_JAEA_K@Z
@@ -128,16 +130,16 @@
     ??$SetEdge@$00@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
     ??$SharedCompareImpl@VCord@absl@@@absl@@YAHAEBVCord@0@0@Z
-    ??$StrFormat@DHHHHH_JIVstring_view@absl@@HPEBDV12@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBVstring_view@0@2AEBQEBD5@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@0@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@3@@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
+    ??$StrFormat@DHHHHH_JIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HPEBDV123@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@AEBDAEBH2222AEB_JAEBIAEBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@2AEBQEBD5@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@AEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@3@@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
     ??$__append@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@Cr@std@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAXV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PEBU1234@AEBU1234@PEBQEBU1234@_J$0A@@12@0PEAX@Z
     ??$__construct_at_end@PEBVFormatArgImpl@str_format_internal@absl@@$0A@@?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@AEAAXPEBVFormatArgImpl@str_format_internal@absl@@0_K@Z
     ??$__construct_at_end@V?$move_iterator@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@?$__split_buffer@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@AEAV?$allocator@PEAPEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAPEAPEBVImpl@time_zone@cctz@time_internal@absl@@@12@0@Z
     ??$__construct_at_end@V?$move_iterator@PEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@?$__split_buffer@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@AEAV?$allocator@PEAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAPEAUPrefixCrc@CrcCordState@crc_internal@absl@@@12@0@Z
     ??$__construct_at_end@V?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@Cr@std@@@?$__split_buffer@UTransition@cctz@time_internal@absl@@AEAV?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAUTransition@cctz@time_internal@absl@@@12@0@Z
     ??$__construct_at_end@V?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@Cr@std@@@?$__split_buffer@UTransitionType@cctz@time_internal@absl@@AEAV?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAXV?$move_iterator@PEAUTransitionType@cctz@time_internal@absl@@@12@0@Z
-    ??$__construct_one_at_end@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__construct_one_at_end@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__construct_one_at_end@AEBQEAVCordzHandle@cord_internal@absl@@@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVCordzHandle@cord_internal@absl@@@Z
     ??$__construct_one_at_end@AEBQEAVLogSink@absl@@@?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVLogSink@absl@@@Z
     ??$__construct_one_at_end@AEBQEBVCordzHandle@cord_internal@absl@@@?$vector@PEBVCordzHandle@cord_internal@absl@@V?$allocator@PEBVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEBVCordzHandle@cord_internal@absl@@@Z
@@ -146,7 +148,7 @@
     ??$__destroy_at@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@$0A@@Cr@std@@YAXPEAU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@01@@Z
     ??$__destroy_at@UPayload@status_internal@absl@@$0A@@Cr@std@@YAXPEAUPayload@status_internal@absl@@@Z
     ??$__do_rehash@$00@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AEAAX_K@Z
-    ??$__emplace_back_slow_path@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
+    ??$__emplace_back_slow_path@AEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBV123@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@AEBV312@AEA_K@Z
     ??$__emplace_unique_key_args@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBUpiecewise_construct_t@23@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AU?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@Cr@std@@_N@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@AEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QEAV?$tuple@$$V@12@@Z
     ??$__push_back_slow_path@AEBQEAVCordzHandle@cord_internal@absl@@@?$vector@PEAVCordzHandle@cord_internal@absl@@V?$allocator@PEAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVCordzHandle@cord_internal@absl@@@Z
     ??$__push_back_slow_path@AEBQEAVLogSink@absl@@@?$vector@PEAVLogSink@absl@@V?$allocator@PEAVLogSink@absl@@@Cr@std@@@Cr@std@@AEAAXAEBQEAVLogSink@absl@@@Z
@@ -171,10 +173,10 @@
     ??$emplace_back@HVcrc32c_t@absl@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QEAAAEAUPrefixCrc@CrcCordState@crc_internal@absl@@$$QEAH$$QEAVcrc32c_t@6@@Z
     ??$find@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QEAA?AV?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PEAX@Cr@std@@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@@Z
     ??$find_first_non_full@X@container_internal@absl@@YA?AUFindInfo@01@AEBVCommonFields@01@_K@Z
-    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$03@strings_internal@absl@@QEAA@_K@Z
-    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@XZ
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QEAA@_K@Z
     ??0?$RandenPool@E@random_internal@absl@@QEAA@XZ
@@ -197,15 +199,16 @@
     ??0BadStatusOrAccess@absl@@QEAA@AEBV01@@Z
     ??0BadStatusOrAccess@absl@@QEAA@VStatus@1@@Z
     ??0BlockingCounter@absl@@QEAA@H@Z
-    ??0ByAnyChar@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByAnyChar@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0ByLength@absl@@QEAA@_J@Z
-    ??0ByString@absl@@QEAA@Vstring_view@1@@Z
+    ??0ByString@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0CRC@crc_internal@absl@@IEAA@XZ
     ??0CheckOpMessageBuilder@log_internal@absl@@QEAA@PEBD@Z
+    ??0ChunkIterator@Cord@absl@@AEAA@PEAUCordRep@cord_internal@2@@Z
     ??0ChunkIterator@Cord@absl@@AEAA@PEBV12@@Z
     ??0Condition@absl@@QEAA@P6A_NPEAX@Z0@Z
     ??0Condition@absl@@QEAA@PEB_N@Z
-    ??0Cord@absl@@AEAA@Vstring_view@1@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
+    ??0Cord@absl@@AEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
     ??0Cord@absl@@QEAA@AEBV01@@Z
     ??0CordzHandle@cord_internal@absl@@IEAA@_N@Z
     ??0CordzInfo@cord_internal@absl@@AEAA@PEAUCordRep@12@PEBV012@W4MethodIdentifier@CordzUpdateTracker@12@@Z
@@ -220,19 +223,18 @@
     ??0LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@2@@Z
     ??0LogMessageData@LogMessage@log_internal@absl@@QEAA@PEBDHW4LogSeverity@3@VTime@3@@Z
     ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDH@Z
-    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHVstring_view@2@@Z
+    ??0LogMessageQuietlyFatal@log_internal@absl@@QEAA@PEBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0OstreamView@LogMessage@log_internal@absl@@QEAA@AEAULogMessageData@123@@Z
-    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@Vstring_view@2@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@std@@@Z
+    ??0ParsedFormatBase@str_format_internal@absl@@QEAA@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@5@@Z
     ??0Payload@status_internal@absl@@QEAA@AEBU012@@Z
     ??0Randen@random_internal@absl@@QEAA@XZ
     ??0Rep@GraphCycles@synchronization_internal@absl@@QEAA@XZ
     ??0ScopedMinLogLevel@log_internal@absl@@QEAA@W4LogSeverityAtLeast@2@@Z
     ??0ScopedStderrThreshold@absl@@QEAA@W4LogSeverityAtLeast@1@@Z
     ??0SpinLock@base_internal@absl@@QEAA@W4SchedulingMode@12@@Z
-    ??0Status@absl@@QEAA@W4StatusCode@1@Vstring_view@1@@Z
-    ??0StatusRep@status_internal@absl@@QEAA@W4StatusCode@2@Vstring_view@2@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@@Z
+    ??0Status@absl@@QEAA@W4StatusCode@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0StdcppWaiter@synchronization_internal@absl@@QEAA@XZ
     ??0Streamable@str_format_internal@absl@@QEAA@AEBVUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ??0TimeZoneLibC@cctz@time_internal@absl@@QEAA@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -240,7 +242,6 @@
     ??0int128@absl@@QEAA@M@Z
     ??0int128@absl@@QEAA@N@Z
     ??0int128@absl@@QEAA@O@Z
-    ??0string_view@absl@@QEAA@PEBD@Z
     ??0uint128@absl@@QEAA@M@Z
     ??0uint128@absl@@QEAA@N@Z
     ??0uint128@absl@@QEAA@O@Z
@@ -273,18 +274,17 @@
     ??4?$optional_data@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@optional_internal@absl@@IEAAAEAV012@$$QEAV012@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@$$QEAV01@@Z
     ??4BadStatusOrAccess@absl@@QEAAAEAV01@AEBV01@@Z
-    ??4Cord@absl@@QEAAAEAV01@Vstring_view@1@@Z
+    ??4Cord@absl@@QEAAAEAV01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@$$QEAV012@@Z
     ??4CrcCordState@crc_internal@absl@@QEAAAEAV012@AEBV012@@Z
     ??4InlineData@cord_internal@absl@@QEAAAEAV012@AEBV012@@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV345@@Z@Z
     ??6LogMessage@log_internal@absl@@QEAAAEAV012@P6AAEAVios_base@Cr@std@@AEAV345@@Z@Z
-    ??6LogMessage@log_internal@absl@@QEAAAEAV012@Vstring_view@2@@Z
+    ??6LogMessage@log_internal@absl@@QEAAAEAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVCord@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@AEBVStatus@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vint128@0@@Z
-    ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vstring_view@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@Vuint128@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverity@0@@Z
     ??6absl@@YAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV123@W4LogSeverityAtLeast@0@@Z
@@ -339,15 +339,15 @@
     ??_0Duration@absl@@QEAAAEAV01@N@Z
     ??_0Duration@absl@@QEAAAEAV01@_J@Z
     ??_1Duration@absl@@QEAAAEAV01@V01@@Z
-    ?AbortedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?AbortedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?AbslUnparseFlag@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@@Z
@@ -368,29 +368,29 @@
     ?AdvanceAndReadBytes@ChunkIterator@Cord@absl@@AEAA?AV23@_K@Z
     ?AdvanceBytesBtree@ChunkIterator@Cord@absl@@AEAAX_K@Z
     ?AllocWithArena@LowLevelAlloc@base_internal@absl@@SAPEAX_KPEAUArena@123@@Z
-    ?AlreadyExistsError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AlreadyExistsError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@?$AppendUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
     ?Append@Cord@absl@@QEAAX$$QEAV12@@Z
     ?Append@Cord@absl@@QEAAXAEBV12@@Z
-    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Append@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@FormatSinkImpl@str_format_internal@absl@@QEAAX_KD@Z
-    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NVstring_view@4@@Z
-    ?Append@StringifySink@strings_internal@absl@@QEAAXVstring_view@3@@Z
+    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Append@StringifySink@strings_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@StringifySink@strings_internal@absl@@QEAAX_KD@Z
-    ?AppendArray@InlineRep@Cord@absl@@QEAAXVstring_view@3@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
+    ?AppendArray@InlineRep@Cord@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
     ?AppendLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
     ?AppendPack@str_format_internal@absl@@YAAEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAV345@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
-    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
-    ?AppendPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?AppendPieces@strings_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
+    ?AppendPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?AppendSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?AppendTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToInlined@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
-    ?ApplySubstitutions@strings_internal@absl@@YAHVstring_view@2@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@56@@Z
+    ?ApplySubstitutions@strings_internal@absl@@YAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@45@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AsciiStrToLower@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AsciiStrToUpper@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AssertHeld@Mutex@absl@@QEBAXXZ
@@ -402,31 +402,31 @@
     ?AsyncSignalSafeWriteToStderr@raw_log_internal@absl@@YAXPEBD_K@Z
     ?At@TimeZone@absl@@QEBA?AUCivilInfo@12@VTime@2@@Z
     ?At@TimeZone@absl@@QEBA?AUTimeInfo@12@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@@Z
-    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@Vstring_view@3@H@Z
+    ?AtLocation@LogMessage@log_internal@absl@@QEAAAEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?Await@Mutex@absl@@QEAAXAEBVCondition@2@@Z
     ?AwaitCommon@Mutex@absl@@AEAA_NAEBVCondition@2@VKernelTimeout@synchronization_internal@2@@Z
     ?AwaitWithDeadline@Mutex@absl@@QEAA_NAEBVCondition@2@VTime@2@@Z
     ?AwaitWithTimeout@Mutex@absl@@QEAA_NAEBVCondition@2@VDuration@2@@Z
-    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Base64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Base64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?Base64EscapeInternal@strings_internal@absl@@YA_KPEBE_KPEAD1PEBD_N@Z
-    ?Base64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?BindWithPack@str_format_internal@absl@@YA_NPEBUUnboundConversion@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@PEAVBoundConversion@12@@Z
     ?Block@Barrier@absl@@QEAA_NXZ
     ?Block@Mutex@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?BreakTime@TimeZoneInfo@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?BreakTime@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AUabsolute_lookup@time_zone@234@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?Build@Header@TimeZoneInfo@cctz@time_internal@absl@@QEAA_NAEBUtzhead@@@Z
-    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?CPUSupportsRandenHwAes@random_internal@absl@@YA_NXZ
-    ?CUnescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@1@Z
+    ?CUnescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@1@Z
     ?CalculateBase64EscapedLenInternal@strings_internal@absl@@YA_K_K_N@Z
     ?CallVoidPtrFunction@Condition@absl@@CA_NPEBV12@@Z
-    ?CancelledError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEVstring_view@2@0E@Z
-    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
+    ?CancelledError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0E@Z
+    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
     ?Ceil@absl@@YA?AVDuration@1@V21@0@Z
     ?CheckInvariants@GraphCycles@synchronization_internal@absl@@QEBA_NXZ
     ?CheckstrcasecmpfalseImpl@log_internal@absl@@YAPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEBD00@Z
@@ -446,13 +446,14 @@
     ?CombineContiguousImpl@MixingHashState@hash_internal@absl@@CA_K_KPEBE0U?$integral_constant@H$07@Cr@std@@@Z
     ?CombineLargeContiguousImpl32@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
     ?CombineLargeContiguousImpl64@MixingHashState@hash_internal@absl@@CA_K_KPEBE0@Z
-    ?Compare@Cord@absl@@QEBAHVstring_view@2@@Z
+    ?Compare@Cord@absl@@QEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?CompareImpl@Cord@absl@@AEBAHAEBV12@@Z
     ?CompareSlowPath@Cord@absl@@AEBAHAEBV12@_K1@Z
+    ?CompareSlowPath@Cord@absl@@AEBAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K1@Z
     ?Compute@CrcNonTemporalMemcpyAVXEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@CrcNonTemporalMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
     ?Compute@FallbackCrcMemcpyEngine@crc_internal@absl@@UEBA?AVcrc32c_t@3@PEIAXPEIBX_KV43@@Z
-    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@Vstring_view@1@@Z
+    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Concat@CRC@crc_internal@absl@@UEAAXPEAII_K@Z
     ?ConcatCrc32c@absl@@YA?AVcrc32c_t@1@V21@0_K@Z
     ?Consume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
@@ -465,7 +466,7 @@
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NMAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NNAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NOAEBVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@Vstring_view@4@@Z
+    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QEAA_NAEBUUnboundConversion@34@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Copy@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@II_K@Z
     ?CopyCordToString@absl@@YAXAEBVCord@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyPrefix@CordRepBtree@cord_internal@absl@@AEAA?AUCopyResult@123@_K_N@Z
@@ -473,7 +474,7 @@
     ?CopyTo@InlineRep@Cord@absl@@QEBAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyToArraySlowPath@Cord@absl@@AEBAXPEAD@Z
     ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXD_KW4StringType@123@@Z
-    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXVstring_view@3@W4StringType@123@@Z
+    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4StringType@123@@Z
     ?Crash@Helper@internal_statusor@absl@@SAXAEBVStatus@3@@Z
     ?Crc32c@CRC@crc_internal@absl@@SAPEAV123@XZ
     ?CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PEIAXPEIBX_KV43@_N@Z
@@ -484,8 +485,8 @@
     ?CreateThreadIdentity@synchronization_internal@absl@@YAPEAUThreadIdentity@base_internal@2@XZ
     ?CurrentThreadIdentityIfPresent@base_internal@absl@@YAPEAUThreadIdentity@12@XZ
     ?DataLength@Header@TimeZoneInfo@cctz@time_internal@absl@@QEBA_K_K@Z
-    ?DataLossError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?DeadlineExceededError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?DataLossError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?DeadlineExceededError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?DecodeFrom@ProtoField@log_internal@absl@@QEAA_NPEAV?$Span@$$CBD@3@@Z
     ?DecodeWaitCycles@SpinLock@base_internal@absl@@KA_JI@Z
     ?DecrementCount@BlockingCounter@absl@@QEAA_NXZ
@@ -512,7 +513,7 @@
     ?Digits10@?$BigUnsigned@$03@strings_internal@absl@@SAHXZ
     ?Digits10@?$BigUnsigned@$0FE@@strings_internal@absl@@SAHXZ
     ?DropDeletesWithoutResize@container_internal@absl@@YAXAEAVCommonFields@12@AEBUPolicyFunctions@12@PEAX@Z
-    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@AEBVCord@3@@Z
+    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@3@@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDH000@Z@base_internal@absl@@CAXPEBDH000@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX@Z@base_internal@absl@@CAXPEBDPEBX@Z
     ?DummyFunction@?$AtomicHook@P6AXPEBDPEBX_J@Z@base_internal@absl@@CAXPEBDPEBX_J@Z
@@ -520,8 +521,8 @@
     ?DummyFunction@?$AtomicHook@P6AXXZ@base_internal@absl@@CAXXZ
     ?DummyFunction@?$AtomicHook@P6AX_J@Z@base_internal@absl@@CAX_J@Z
     ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@Vstring_view@3@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPEBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
     ?DumpPCAndFrameSizesAndStackTrace@debugging_internal@absl@@YAXQEAXQEBQEAXQEAHHH_NP6AXPEBDPEAX@Z5@Z
     ?DumpStackTrace@debugging_internal@absl@@YAXHH_NP6AXPEBDPEAX@Z2@Z
     ?DurationFromTimespec@absl@@YA?AVDuration@1@Utimespec@@@Z
@@ -545,17 +546,17 @@
     ?EncodeVarint@log_internal@absl@@YA_N_K0PEAV?$Span@D@2@@Z
     ?EncodeWaitCycles@SpinLock@base_internal@absl@@KAI_J0@Z
     ?EndsWith@Cord@absl@@QEBA_NAEBV12@@Z
-    ?EndsWith@Cord@absl@@QEBA_NVstring_view@2@@Z
-    ?EndsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?EqualsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?EndsWith@Cord@absl@@QEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?EndsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?EqualsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?EqualsImpl@Cord@absl@@AEBA_NAEBV12@_K@Z
-    ?EqualsImpl@Cord@absl@@AEBA_NVstring_view@2@_K@Z
+    ?EqualsImpl@Cord@absl@@AEBA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?EqualsSlow@Status@absl@@CA_NAEBV12@0@Z
     ?EquivTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEBA_NEE@Z
     ?Erase@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QEAAPEAUPayload@status_internal@3@PEBU453@0@Z
     ?EraseMetaOnly@container_internal@absl@@YAXAEAVCommonFields@12@PEAW4ctrl_t@12@_K@Z
-    ?ErasePayload@Status@absl@@QEAA_NVstring_view@2@@Z
-    ?ErrnoToStatus@absl@@YA?AVStatus@1@HVstring_view@1@@Z
+    ?ErasePayload@Status@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ErrnoToStatus@absl@@YA?AVStatus@1@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ErrnoToStatusCode@absl@@YA?AW4StatusCode@1@H@Z
     ?Eval@Condition@absl@@QEBA_NXZ
     ?ExitOnDFatal@log_internal@absl@@YA_NXZ
@@ -564,14 +565,14 @@
     ?ExtendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?ExtendByZeroesImpl@CRC32@crc_internal@absl@@CAXPEAI_KQEBI2@Z
     ?ExtendCrc32cByZeroes@absl@@YA?AVcrc32c_t@1@V21@_K@Z
-    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@Vstring_view@2@@Z
+    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendTransitions@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NXZ
     ?ExtractAppendBuffer@CordRepBtree@cord_internal@absl@@SA?AUExtractResult@CordRep@23@PEAV123@_K@Z
     ?ExtractFront@CordRepBtree@cord_internal@absl@@CAPEAUCordRep@23@PEAV123@@Z
     ?FDivDuration@absl@@YANVDuration@1@0@Z
     ?FailQuietly@LogMessage@log_internal@absl@@KAXXZ
     ?FailWithoutStackTrace@LogMessage@log_internal@absl@@KAXXZ
-    ?FailedPreconditionError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?FailedPreconditionError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?FailureSignalToString@debugging_internal@absl@@YAPEBDH@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADHPEAD@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPEADIPEAD@Z
@@ -586,11 +587,11 @@
     ?FillWordTable@CRCImpl@crc_internal@absl@@SAXIIHPEAY0BAA@I@Z
     ?FillZeroesTable@CRCImpl@crc_internal@absl@@SAHIPEAY0BAA@I@Z
     ?FinalizeEncodingAndFormat@LogMessageData@LogMessage@log_internal@absl@@QEAAXXZ
-    ?Find@ByAnyChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByLength@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?Find@ByString@absl@@QEBA?AVstring_view@2@V32@_K@Z
-    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AVstring_view@3@XZ
+    ?Find@ByAnyChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByChar@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByLength@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?Find@ByString@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@_K@Z
+    ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?FindPath@GraphCycles@synchronization_internal@absl@@QEBAHUGraphId@23@0HQEAU423@@Z
     ?FindSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
     ?FindTailSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
@@ -602,13 +603,13 @@
     ?FlagsToString@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4Flags@12@@Z
     ?FlatOverhead@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?FlatTagToLength@CordTestAccess@strings_internal@absl@@SA_KE@Z
-    ?FlattenSlowPath@Cord@absl@@AEAA?AVstring_view@2@XZ
+    ?FlattenSlowPath@Cord@absl@@AEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Floor@absl@@YA?AVDuration@1@V21@0@Z
     ?Flush@LogMessage@log_internal@absl@@IEAAXXZ
     ?Flush@LogSink@absl@@UEAAXXZ
     ?FlushLogSinks@log_internal@absl@@YAXXZ
-    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXVstring_view@absl@@@Z@2@@Z
-    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXVstring_view@absl@@AEBVCord@2@@Z@2@@Z
+    ?ForEachChunkAux@Cord@absl@@CAXPEAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@2@@Z
+    ?ForEachPayload@Status@absl@@QEBAXV?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@absl@@@Z@2@@Z
     ?ForVar2@CheckOpMessageBuilder@log_internal@absl@@QEAAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForgetDeadlockInfo@Mutex@absl@@QEAAXXZ
     ?FormatCivilTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
@@ -624,7 +625,7 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAA@@12@UVoidPtr@12@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAE@@12@PEBDVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@AEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
-    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@Vstring_view@2@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
+    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@MVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@NVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@OVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
@@ -639,12 +640,12 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_JVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_KVFormatConversionSpecImpl@12@PEAVFormatSinkImpl@12@@Z
     ?FormatDuration@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
-    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IVstring_view@2@HW4PrefixFormat@12@3@Z
-    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IVstring_view@2@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
+    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@HW4PrefixFormat@12@3@Z
+    ?FormatLogPrefix@log_internal@absl@@YA_KW4LogSeverity@2@VTime@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HW4PrefixFormat@12@AEAV?$Span@D@2@@Z
     ?FormatPack@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
+    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@VTime@1@VTimeZone@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@VTimeZone@1@@Z
-    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@VTime@1@VTimeZone@1@@Z
     ?FormatUntyped@str_format_internal@absl@@YA_NVFormatRawSinkImpl@12@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?FprintF@str_format_internal@absl@@YAHPEAU_iobuf@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?Frequency@UnscaledCycleClock@base_internal@absl@@CANXZ
@@ -672,7 +673,7 @@
     ?GetDebugStackTraceHook@debugging_internal@absl@@YAP6AXQEBQEAXHP6AXPEBDPEAX@Z2@ZXZ
     ?GetEstimatedFairShareMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
     ?GetEstimatedMemoryUsage@cord_internal@absl@@YA_KPEBUCordRep@12@@Z
-    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAVstring_view@2@@Z
+    ?GetFlatAux@Cord@absl@@CA_NPEAUCordRep@cord_internal@2@PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetHashtablezMaxSamples@container_internal@absl@@YA_KXZ
     ?GetHashtablezSampleParameter@container_internal@absl@@YAHXZ
     ?GetId@GraphCycles@synchronization_internal@absl@@QEAA?AUGraphId@23@PEAX@Z
@@ -680,7 +681,7 @@
     ?GetKeys@RandenSlow@random_internal@absl@@SAPEBXXZ
     ?GetParentMethod@CordzInfo@cord_internal@absl@@CA?AW4MethodIdentifier@CordzUpdateTracker@23@PEBV123@@Z
     ?GetParentStack@CordzInfo@cord_internal@absl@@QEBA?AV?$Span@QEAX@3@XZ
-    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@Vstring_view@2@@Z
+    ?GetPayload@Status@absl@@QEBA?AV?$optional@VCord@absl@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetPrependBuffer@CordRepRing@cord_internal@absl@@QEAA?AV?$Span@D@3@_K@Z
     ?GetProgramCounter@debugging_internal@absl@@YAPEAXQEAX@Z
     ?GetSaltMaterial@random_internal@absl@@YA?AV?$optional@I@2@XZ
@@ -691,7 +692,7 @@
     ?GetStackTrace@GraphCycles@synchronization_internal@absl@@QEAAHUGraphId@23@PEAPEAPEAX@Z
     ?GetStackTrace@absl@@YAHPEAPEAXHH@Z
     ?GetStackTraceWithContext@absl@@YAHPEAPEAXHHPEBXPEAH@Z
-    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@ZXZ
+    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@ZXZ
     ?GetStride@ExponentialBiased@profiling_internal@absl@@QEAA_J_J@Z
     ?GetTID@base_internal@absl@@YAIXZ
     ?GetTestEngine@CrcMemcpy@crc_internal@absl@@SA?AV?$unique_ptr@VCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@Cr@std@@HH@Z
@@ -707,7 +708,7 @@
     ?HasNode@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@@Z
     ?HasRandenHwAesImplementation@random_internal@absl@@YA_NXZ
     ?Head@CordzInfo@cord_internal@absl@@SAPEAV123@AEBVCordzSnapshot@23@@Z
-    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?IDivDuration@time_internal@absl@@YA_J_NVDuration@2@1PEAV32@@Z
     ?In@Time@absl@@QEBA?AUBreakdown@12@VTimeZone@2@@Z
     ?InMillisecondsFromNow@KernelTimeout@synchronization_internal@absl@@QEBAKXZ
@@ -718,15 +719,15 @@
     ?InitTables@CRC32@crc_internal@absl@@UEAAXXZ
     ?InitWhat@BadStatusOrAccess@absl@@AEBAXXZ
     ?Initialize@ExponentialBiased@profiling_internal@absl@@AEAAXXZ
-    ?InitializeCordRepExternal@cord_internal@absl@@YAXVstring_view@2@PEAUCordRepExternal@12@@Z
+    ?InitializeCordRepExternal@cord_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAUCordRepExternal@12@@Z
     ?InitializeSymbolizer@absl@@YAXPEBD@Z
     ?InsertEdge@GraphCycles@synchronization_internal@absl@@QEAA_NUGraphId@23@0@Z
     ?InstallFailureSignalHandler@absl@@YAXAEBUFailureSignalHandlerOptions@1@@Z
     ?InternalAttemptToUseMutexInFatalSignalHandler@Mutex@absl@@SAXXZ
     ?InternalCondVarPoke@StdcppWaiter@synchronization_internal@absl@@AEAAXXZ
     ?InternalCondVarPoke@Win32Waiter@synchronization_internal@absl@@AEAAXXZ
-    ?InternalError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?InvalidArgumentError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InternalError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?InvalidArgumentError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsAborted@absl@@YA_NAEBVStatus@1@@Z
     ?IsAlreadyExists@absl@@YA_NAEBVStatus@1@@Z
     ?IsCancelled@absl@@YA_NAEBVStatus@1@@Z
@@ -734,8 +735,8 @@
     ?IsDeadlineExceeded@absl@@YA_NAEBVStatus@1@@Z
     ?IsFailedPrecondition@absl@@YA_NAEBVStatus@1@@Z
     ?IsFatal@LogMessage@log_internal@absl@@AEBA_NXZ
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAVstring_view@3@@Z
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAVstring_view@3@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_NPEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QEBA_N_K0PEAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsHashtablezEnabled@container_internal@absl@@YA_NXZ
     ?IsInitialized@log_internal@absl@@YA_NXZ
     ?IsInternal@absl@@YA_NAEBVStatus@1@@Z
@@ -824,32 +825,32 @@
     ?NominalCPUFrequency@base_internal@absl@@YANXZ
     ?Normalize@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?NormalizedPrefixCrcAtNthChunk@CrcCordState@crc_internal@absl@@QEBA?AUPrefixCrc@123@_K@Z
-    ?NotFoundError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?NotFoundError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Notify@Notification@absl@@QEAAXXZ
     ?Now@CycleClock@base_internal@absl@@SA_JXZ
     ?Now@absl@@YA?AVTime@1@XZ
     ?NumCPUs@base_internal@absl@@YAHXZ
     ?OneTimeInitThreadIdentity@synchronization_internal@absl@@YAXPEAUThreadIdentity@base_internal@2@@Z
-    ?OutOfRangeError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseDuration@absl@@YA_NVstring_view@1@PEAVDuration@1@@Z
+    ?OutOfRangeError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseDuration@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVDuration@1@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVDuration@1@PEAV234@@Z
     ?ParseFlag@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAVTime@1@PEAV234@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParsePosixSpec@cctz@time_internal@absl@@YA_NAEBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PEAUPosixTimeZone@123@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?PermissionDeniedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0VTimeZone@1@PEAVTime@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?PermissionDeniedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Poison@CrcCordState@crc_internal@absl@@QEAAXXZ
     ?Poke@StdcppWaiter@synchronization_internal@absl@@QEAAXXZ
     ?Poke@Win32Waiter@synchronization_internal@absl@@QEAAXXZ
@@ -859,12 +860,12 @@
     ?PrepareToDie@LogMessage@log_internal@absl@@AEAAXXZ
     ?PrepareToModify@Status@absl@@AEAAXXZ
     ?Prepend@Cord@absl@@QEAAXAEBV12@@Z
-    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
+    ?Prepend@CordRepBtree@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@PEAUCordRep@23@@Z
-    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@Vstring_view@3@_K@Z
-    ?PrependArray@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?Prepend@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
+    ?PrependArray@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependLeaf@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@_K2@Z
-    ?PrependPrecise@Cord@absl@@AEAAXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?PrependPrecise@Cord@absl@@AEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependSlow@CordRepBtree@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependSlow@CordRepRing@cord_internal@absl@@CAPEAV123@PEAV123@PEAUCordRep@23@@Z
     ?PrependTree@InlineRep@Cord@absl@@QEAAXPEAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -876,14 +877,14 @@
     ?Print@Streamable@str_format_internal@absl@@QEBAAEAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AEAV456@@Z
     ?Ptr@GraphCycles@synchronization_internal@absl@@QEAAPEAXUGraphId@23@@Z
     ?PushDead@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AEAAXPEAUHashtablezInfo@container_internal@3@@Z
-    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NVstring_view@3@HH_N@Z
+    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QEAA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HH_N@Z
     ?RawEnableLogPrefix@log_internal@absl@@YAX_N@Z
     ?RawLog@raw_log_internal@absl@@YAXW4LogSeverity@2@PEBDH1ZZ
     ?RawLoggingFullySupported@raw_log_internal@absl@@YA_NXZ
     ?RawSetMinLogLevel@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?RawSetStderrThreshold@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?Read@CordRepBtreeNavigator@cord_internal@absl@@QEAA?AUReadResult@123@_K0@Z
-    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K0AEAPEAUCordRep@23@@Z
+    ?Read@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K0AEAPEAUCordRep@23@@Z
     ?ReadDigits@?$BigUnsigned@$03@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadDigits@?$BigUnsigned@$0FE@@strings_internal@absl@@AEAAHPEBD0H@Z
     ?ReadFloatMantissa@?$BigUnsigned@$03@strings_internal@absl@@QEAAHAEBUParsedFloat@23@H@Z
@@ -930,14 +931,14 @@
     ?ResetToBuiltinUTC@TimeZoneInfo@cctz@time_internal@absl@@AEAA_NAEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?ResetToEmpty@InlineRep@Cord@absl@@AEAAXXZ
     ?Resize@?$ResizeUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@_K@Z
-    ?ResourceExhaustedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ResourceExhaustedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Rethrow@variant_internal@absl@@YAXXZ
     ?ReverseConsume@cord_internal@absl@@YAXPEAUCordRep@12@V?$FunctionRef@$$A6AXPEAUCordRep@cord_internal@absl@@_K1@Z@2@@Z
     ?SafeToDelete@CordzHandle@cord_internal@absl@@QEBA_NXZ
     ?SampleSlow@container_internal@absl@@YAPEAUHashtablezInfo@12@AEAUSamplingState@12@_K@Z
     ?SanitizerSafeCopy@Rep@InlineData@cord_internal@absl@@QEBA?AU1234@XZ
     ?Scramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
-    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AVstring_view@3@_K@Z
+    ?Seek@CordRepBtreeReader@cord_internal@absl@@QEAA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_K@Z
     ?SendToLog@LogMessage@log_internal@absl@@AEAAXXZ
     ?SetCapacityForTesting@CordRepRing@cord_internal@absl@@QEAAX_K@Z
     ?SetCrcCordState@Cord@absl@@AEAAXVCrcCordState@crc_internal@2@@Z
@@ -954,14 +955,14 @@
     ?SetHashtablezSampleParameter@container_internal@absl@@YAXH@Z
     ?SetHashtablezSampleParameterInternal@container_internal@absl@@YAXH@Z
     ?SetInitialized@log_internal@absl@@YAXXZ
-    ?SetLogBacktraceLocation@absl@@YAXVstring_view@1@H@Z
+    ?SetLogBacktraceLocation@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?SetLoggingGlobalsListener@log_internal@absl@@YAXP6AXXZ@Z
     ?SetMaxFramesInLogStackTrace@log_internal@absl@@YAXH@Z
     ?SetMinLogLevel@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetMutexDeadlockDetectionMode@absl@@YAXW4OnDeadlockCycle@1@@Z
-    ?SetPayload@Status@absl@@QEAAXVstring_view@2@VCord@2@@Z
+    ?SetPayload@Status@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VCord@2@@Z
     ?SetStackUnwinder@absl@@YAXP6AHPEAPEAXPEAHHHPEBX1@Z@Z
-    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@AEBVCord@2@@Z@Z
+    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AEBVCord@2@@Z@Z
     ?SetStderrThreshold@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetSuppressSigabortTrace@log_internal@absl@@YA_N_N@Z
     ?SetThreadBlockedCounter@PerThreadSem@synchronization_internal@absl@@SAXPEAU?$atomic@H@Cr@std@@@Z
@@ -975,14 +976,14 @@
     ?ShouldLog@LogEveryNState@log_internal@absl@@QEAA_NH@Z
     ?ShouldLog@LogEveryPow2State@log_internal@absl@@QEAA_NXZ
     ?ShouldLog@LogFirstNState@log_internal@absl@@QEAA_NH@Z
-    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NVstring_view@2@H@Z
+    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?ShouldPrependLogPrefix@absl@@YA_NXZ
     ?ShouldSymbolizeLogStackTrace@log_internal@absl@@YA_NXZ
     ?Signal@CondVar@absl@@QEAAXXZ
     ?SignalAll@CondVar@absl@@QEAAXXZ
-    ?SimpleAtob@absl@@YA_NVstring_view@1@PEA_N@Z
-    ?SimpleAtod@absl@@YA_NVstring_view@1@PEAN@Z
-    ?SimpleAtof@absl@@YA_NVstring_view@1@PEAM@Z
+    ?SimpleAtob@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_N@Z
+    ?SimpleAtod@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAN@Z
+    ?SimpleAtof@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAM@Z
     ?SixDigitsToBuffer@numbers_internal@absl@@YA_KNPEAD@Z
     ?SizeofCordRepExternal@CordTestAccess@strings_internal@absl@@SA_KXZ
     ?SizeofCordRepSubstring@CordTestAccess@strings_internal@absl@@SA_KXZ
@@ -994,7 +995,7 @@
     ?SpinLockWait@base_internal@absl@@YAIPEAU?$atomic@I@Cr@std@@HQEBUSpinLockWaitTransition@12@W4SchedulingMode@12@@Z
     ?SpinLoop@SpinLock@base_internal@absl@@AEAAIXZ
     ?StackTraceWorksForTest@debugging_internal@absl@@YA_NXZ
-    ?StartsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?StartsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?StatusCodeToString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4StatusCode@1@@Z
     ?StderrThreshold@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?SteadyClockNow@KernelTimeout@synchronization_internal@absl@@CA_JXZ
@@ -1005,16 +1006,16 @@
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@000@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@00@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBVAlphaNum@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@D@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ?StrError@base_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@H@Z
-    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
+    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
     ?SubLength@CordRepRing@cord_internal@absl@@AEAAXI_K@Z
     ?SubRing@CordRepRing@cord_internal@absl@@SAPEAV123@PEAV123@_K11@Z
     ?SubTree@CordRepBtree@cord_internal@absl@@QEAAPEAUCordRep@23@_K0@Z
     ?Subcord@Cord@absl@@QEBA?AV12@_K0@Z
-    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@PEBV62@_K@Z
+    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@PEBV645@_K@Z
     ?Summarize@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?SupportsArmCRC32PMULL@crc_internal@absl@@YA_NXZ
     ?SuppressSigabortTrace@log_internal@absl@@YA_NXZ
@@ -1097,12 +1098,12 @@
     ?TryRemove@Mutex@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?UTC@Impl@time_zone@cctz@time_internal@absl@@SA?AV2345@XZ
     ?UTCImpl@Impl@time_zone@cctz@time_internal@absl@@CAPEBV12345@XZ
-    ?UnauthenticatedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnavailableError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnauthenticatedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnavailableError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UnextendByZeroes@CRC32@crc_internal@absl@@UEBAXPEAI_K@Z
     ?UnextendCrc32cByZeroes@crc_internal@absl@@YA?AVcrc32c_t@2@V32@_K@Z
-    ?UnimplementedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnknownError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnimplementedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnknownError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Unlock@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?Unlock@Mutex@absl@@QEAAXXZ
     ?UnlockSlow@Mutex@absl@@AEAAXPEAUSynchWaitParams@2@@Z
@@ -1115,8 +1116,8 @@
     ?Unscramble@CRC32@crc_internal@absl@@UEBAXPEAI@Z
     ?Untrack@CordzInfo@cord_internal@absl@@QEAAXXZ
     ?UpdateStackTrace@GraphCycles@synchronization_internal@absl@@QEAAXUGraphId@23@HP6AHPEAPEAXH@Z@Z
-    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?Version@TimeZoneInfo@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@TimeZoneLibC@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@ZoneInfoSource@cctz@time_internal@absl@@UEBA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
@@ -1132,17 +1133,17 @@
     ?WaitWithTimeout@CondVar@absl@@QEAA_NPEAVMutex@2@VDuration@2@@Z
     ?Wakeup@CondVar@absl@@AEAAXPEAUPerThreadSynch@base_internal@2@@Z
     ?Wakeup@Mutex@absl@@AEAAPEAUPerThreadSynch@base_internal@2@PEAU342@@Z
-    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?WebSafeBase64Escape@absl@@YAXVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?WebSafeBase64Unescape@absl@@YA_NVstring_view@1@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?WebSafeBase64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?WebSafeBase64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?WithMetadataFrom@LogMessage@log_internal@absl@@QEAAAEAV123@AEBVLogEntry@3@@Z
     ?WithPerror@LogMessage@log_internal@absl@@QEAAAEAV123@XZ
     ?WithThreadID@LogMessage@log_internal@absl@@QEAAAEAV123@I@Z
     ?WithTimestamp@LogMessage@log_internal@absl@@QEAAAEAV123@VTime@3@@Z
     ?WithVerbosity@LogMessage@log_internal@absl@@QEAAAEAV123@H@Z
-    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?Write@FILERawSink@str_format_internal@absl@@QEAAXVstring_view@3@@Z
-    ?WriteToStderr@log_internal@absl@@YAXVstring_view@2@W4LogSeverity@2@@Z
+    ?Write@BufferRawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FILERawSink@str_format_internal@absl@@QEAAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?WriteToStderr@log_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4LogSeverity@2@@Z
     ?__add_back_capacity@?$deque@PEBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PEBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAXXZ
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AEAAX_K@Z
@@ -1210,15 +1211,7 @@
     ?effective_impl@time_zone@cctz@time_internal@absl@@AEBAAEBVImpl@1234@XZ
     ?engines@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@4@PEIAXPEIBX_KV54@_N@Z@4UArchSpecificEngines@234@B
     ?erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QEAAPEAUPayload@status_internal@2@PEBU342@@Z
-    ?find@string_view@absl@@QEBA_KD_K@Z
-    ?find@string_view@absl@@QEBA_KV12@_K@Z
     ?find_first_non_full_outofline@container_internal@absl@@YA?AUFindInfo@12@AEBVCommonFields@12@_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_first_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_first_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KD_K@Z
-    ?find_last_not_of@string_view@absl@@QEBA_KV12@_K@Z
-    ?find_last_of@string_view@absl@@QEBA_KV12@_K@Z
     ?fixed_time_zone@cctz@time_internal@absl@@YA?AVtime_zone@123@AEBV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?format@detail@cctz@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@AEBV567@AEBV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@67@AEBV?$duration@_JV?$ratio@$00$0DINHOKEMGIAAA@@Cr@std@@@967@AEBVtime_zone@234@@Z
     ?from_chars@absl@@YA?AUfrom_chars_result@1@PEBD0AEAMW4chars_format@1@@Z
@@ -1278,14 +1271,12 @@
     ?reset@?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QEAAXPEAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Z
     ?resize@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
     ?resize@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QEAAX_K@Z
-    ?rfind@string_view@absl@@QEBA_KD_K@Z
-    ?rfind@string_view@absl@@QEBA_KV12@_K@Z
-    ?safe_strto128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVint128@2@H@Z
-    ?safe_strto32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAHH@Z
-    ?safe_strto64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_JH@Z
-    ?safe_strtou128_base@numbers_internal@absl@@YA_NVstring_view@2@PEAVuint128@2@H@Z
-    ?safe_strtou32_base@numbers_internal@absl@@YA_NVstring_view@2@PEAIH@Z
-    ?safe_strtou64_base@numbers_internal@absl@@YA_NVstring_view@2@PEA_KH@Z
+    ?safe_strto128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVint128@2@H@Z
+    ?safe_strto32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAHH@Z
+    ?safe_strto64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_JH@Z
+    ?safe_strtou128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAVuint128@2@H@Z
+    ?safe_strtou32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEAIH@Z
+    ?safe_strtou64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PEA_KH@Z
     ?set_cordz_mean_interval@cord_internal@absl@@YAXH@Z
     ?set_inline_data@InlineData@cord_internal@absl@@QEAAXPEBD_K@Z
     ?shallow_subcords_enabled@cord_internal@absl@@3U?$atomic@_N@Cr@std@@A

third_party/abseil-cpp/symbols_x86_dbg.def

diff --git a/third_party/abseil-cpp/symbols_x86_dbg.def b/third_party/abseil-cpp/symbols_x86_dbg.def
index 07e0211c..16343fb 100644
--- a/third_party/abseil-cpp/symbols_x86_dbg.def
+++ b/third_party/abseil-cpp/symbols_x86_dbg.def
@@ -40,7 +40,6 @@
     ??$?0$$TX@?$__compressed_pair_elem@PAVFormatArgImpl@str_format_internal@absl@@$0A@$0A@@Cr@std@@QAE@$$QA$$T@Z
     ??$?0$$V@?$__temp_value@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE@AAV?$allocator@UTransition@cctz@time_internal@absl@@@12@@Z
     ??$?0$$V@?$__temp_value@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE@AAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@@Z
-    ??$?0$$Y_And@Cr@std@@$0A@@?$tuple@ABVstring_view@absl@@ABH@Cr@std@@QAE@ABVstring_view@absl@@ABH@Z
     ??$?0$00X@?$__compressed_pair@U?$__hash_node_base@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@23@@Cr@std@@QAE@XZ
     ??$?0$00X@?$unique_ptr@$$BY0A@PAU?$__hash_node_base@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@V?$__bucket_list_deallocator@V?$allocator@PAU?$__hash_node_base@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@Cr@std@@@23@@Cr@std@@QAE@XZ
     ??$?0$00X@?$unique_ptr@$$CBVImpl@time_zone@cctz@time_internal@absl@@U?$default_delete@$$CBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE@PBVImpl@time_zone@cctz@time_internal@absl@@@Z
@@ -57,7 +56,6 @@
     ??$?0$00X@?$unique_ptr@VTimeZoneInfo@cctz@time_internal@absl@@U?$default_delete@VTimeZoneInfo@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE@PAVTimeZoneInfo@cctz@time_internal@absl@@@Z
     ??$?0$00X@?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE@$$T@Z
     ??$?0$00X@?$unique_ptr@VZoneInfoSource@cctz@time_internal@absl@@U?$default_delete@VZoneInfoSource@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE@PAVZoneInfoSource@cctz@time_internal@absl@@@Z
-    ??$?0$0A@$00$$ZABVstring_view@absl@@ABH$$Z$S$$Z$$V$$ZABV01@ABH@?$__tuple_impl@U?$__tuple_indices@$0A@$00@Cr@std@@ABVstring_view@absl@@ABH@Cr@std@@QAE@U?$__tuple_indices@$0A@$00@12@U?$__tuple_types@ABVstring_view@absl@@ABH@12@U?$__tuple_indices@$S@12@U?$__tuple_types@$$V@12@ABVstring_view@absl@@ABH@Z
     ??$?0AAPAPAPBVImpl@time_zone@cctz@time_internal@absl@@AAPAPAPBV01234@$0A@@?$pair@PAPAPBVImpl@time_zone@cctz@time_internal@absl@@PAPAPBV12345@@Cr@std@@QAE@AAPAPAPBVImpl@time_zone@cctz@time_internal@absl@@0@Z
     ??$?0AAPAPAPBVImpl@time_zone@cctz@time_internal@absl@@PAPAPBV01234@$0A@@?$pair@PAPAPBVImpl@time_zone@cctz@time_internal@absl@@PAPAPBV12345@@Cr@std@@QAE@AAPAPAPBVImpl@time_zone@cctz@time_internal@absl@@$$QAPAPAPBV34567@@Z
     ??$?0AAPAPAUPrefixCrc@CrcCordState@crc_internal@absl@@AAPAPAU0123@$0A@@?$pair@PAPAUPrefixCrc@CrcCordState@crc_internal@absl@@PAPAU1234@@Cr@std@@QAE@AAPAPAUPrefixCrc@CrcCordState@crc_internal@absl@@0@Z
@@ -117,7 +115,6 @@
     ??$?0ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$$Z$$V@?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@QAE@Upiecewise_construct_t@12@V?$tuple@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@V?$tuple@$$V@12@@Z
     ??$?0ABVCord@absl@@$0A@@?$optional@VCord@absl@@@absl@@QAE@ABVCord@1@@Z
     ??$?0ABVCord@absl@@@?$optional_data_dtor_base@VCord@absl@@$0A@@optional_internal@absl@@IAE@Uin_place_t@2@ABVCord@2@@Z
-    ??$?0ABVstring_view@absl@@X@?$__tuple_leaf@$0A@ABVstring_view@absl@@$0A@@Cr@std@@QAE@ABVstring_view@absl@@@Z
     ??$?0D@FormatArgImpl@str_format_internal@absl@@QAE@ABD@Z
     ??$?0H@FormatArgImpl@str_format_internal@absl@@QAE@ABH@Z
     ??$?0HU__default_init_tag@Cr@std@@@?$__compressed_pair@IV?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QAE@$$QAH$$QAU__default_init_tag@12@@Z
@@ -210,7 +207,6 @@
     ??$?0V?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@AA_N$0A@@?$pair@V?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@_N@Cr@std@@QAE@$$QAV?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@12@AA_N@Z
     ??$?0V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@Cr@std@@X@?$__compressed_pair_elem@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@Cr@std@@$00$0A@@Cr@std@@QAE@$$QAV?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@12@@Z
     ??$?0V?$allocator@D@Cr@std@@@AlphaNum@absl@@QAE@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ??$?0V?$allocator@D@Cr@std@@@string_view@absl@@QAE@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$allocator@H@Cr@std@@@?$Storage@V?$allocator@H@Cr@std@@$0A@$00@internal_compressed_tuple@container_internal@absl@@QAE@Uin_place_t@3@$$QAV?$allocator@H@Cr@std@@@Z
     ??$?0V?$allocator@H@Cr@std@@I$00@?$CompressedTuple@V?$allocator@H@Cr@std@@I@container_internal@absl@@QAE@$$QAV?$allocator@H@Cr@std@@$$QAI@Z
     ??$?0V?$allocator@H@Cr@std@@I@?$CompressedTupleImpl@V?$CompressedTuple@V?$allocator@H@Cr@std@@I@container_internal@absl@@U?$integer_sequence@I$0A@$00@3@$00@internal_compressed_tuple@container_internal@absl@@QAE@Uin_place_t@3@$$QAV?$allocator@H@Cr@std@@$$QAI@Z
@@ -226,6 +222,8 @@
     ??$?0V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QAE@PAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QAE@$$QAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QAE@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ??$?0V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@QAE@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$?0V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XV012@$0A@@?$Span@$$CBD@absl@@QAE@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$?0V?$reverse_iterator@PAPAVCordzHandle@cord_internal@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PAPAVCordzHandle@cord_internal@absl@@@Cr@std@@V123@@Cr@std@@QAE@$$QAV?$reverse_iterator@PAPAVCordzHandle@cord_internal@absl@@@12@0@Z
     ??$?0V?$reverse_iterator@PAPAVLogSink@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PAPAVLogSink@absl@@@Cr@std@@V123@@Cr@std@@QAE@$$QAV?$reverse_iterator@PAPAVLogSink@absl@@@12@0@Z
     ??$?0V?$reverse_iterator@PAPBVCordzHandle@cord_internal@absl@@@Cr@std@@V012@$0A@@?$pair@V?$reverse_iterator@PAPBVCordzHandle@cord_internal@absl@@@Cr@std@@V123@@Cr@std@@QAE@$$QAV?$reverse_iterator@PAPBVCordzHandle@cord_internal@absl@@@12@0@Z
@@ -238,8 +236,6 @@
     ??$?0VFILERawSink@str_format_internal@absl@@$0A@@FormatRawSinkImpl@str_format_internal@absl@@QAE@PAVFILERawSink@12@@Z
     ??$?0VFallbackCrcMemcpyEngine@crc_internal@absl@@@?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@QAE@ABU?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@12@PAX@Z
     ??$?0VFallbackCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@XX@?$unique_ptr@VCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@Cr@std@@QAE@$$QAV?$unique_ptr@VFallbackCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VFallbackCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@12@@Z
-    ??$?0Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@QAE@ABVstring_view@2@@Z
-    ??$?0Vstring_view@absl@@XV01@$0A@@?$Span@$$CBD@absl@@QAE@ABVstring_view@1@@Z
     ??$?0_J@FormatArgImpl@str_format_internal@absl@@QAE@AB_J@Z
     ??$?6$01@LogMessage@log_internal@absl@@QAEAAV012@AAY01$$CBD@Z
     ??$?6$02@LogMessage@log_internal@absl@@QAEAAV012@AAY02$$CBD@Z
@@ -278,7 +274,6 @@
     ??$?9PAUViableSubstitution@strings_internal@absl@@PAU012@@Cr@std@@YA_NABV?$reverse_iterator@PAUViableSubstitution@strings_internal@absl@@@01@0@Z
     ??$?9PBQAVLogSink@absl@@PAPAV01@@Cr@std@@YA_NABV?$__wrap_iter@PBQAVLogSink@absl@@@01@ABV?$__wrap_iter@PAPAVLogSink@absl@@@01@@Z
     ??$?9PBUConversionItem@ParsedFormatBase@str_format_internal@absl@@@Cr@std@@YA_NABV?$__wrap_iter@PBUConversionItem@ParsedFormatBase@str_format_internal@absl@@@01@0@Z
-    ??$?BV?$allocator@D@Cr@std@@@string_view@absl@@QBE?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ??$?DH@absl@@YA?AVDuration@0@HV10@@Z
     ??$?DH@absl@@YA?AVDuration@0@V10@H@Z
     ??$?DN@absl@@YA?AVDuration@0@NV10@@Z
@@ -340,9 +335,9 @@
     ??$?RW4LogSeverity@absl@@ABQBDHV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$AtomicHook@P6AXW4LogSeverity@absl@@PBDHABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z@base_internal@absl@@QBEX$$QAW4LogSeverity@2@ABQBD$$QAH$$QAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?VVLogMessage@log_internal@absl@@@Voidify@log_internal@absl@@QHBEXABVLogMessage@12@@Z
     ??$?XH$0A@@Duration@absl@@QAEAAV01@H@Z
-    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@Vstring_view@1@@Z
+    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@YA?AVMixingHashState@01@V201@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$AbslHashValue@VMixingHashState@hash_internal@absl@@ABI@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABV?$tuple@ABI@Cr@std@@@Z
-    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@ABVstring_view@3@ABH@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABV?$tuple@ABVstring_view@absl@@ABH@Cr@std@@@Z
+    ??$AbslHashValue@VMixingHashState@hash_internal@absl@@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABV?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@@Z
     ??$AbslStringify@VStringifySink@strings_internal@absl@@@absl@@YAXAAVStringifySink@strings_internal@0@UHex@0@@Z
     ??$Add@$00@CordRepBtree@cord_internal@absl@@AAEXPAUCordRep@12@@Z
     ??$Add@$00@CordRepBtree@cord_internal@absl@@AAEXV?$Span@QAUCordRep@cord_internal@absl@@@2@@Z
@@ -350,10 +345,10 @@
     ??$Add@$0A@@CordRepBtree@cord_internal@absl@@AAEXV?$Span@QAUCordRep@cord_internal@absl@@@2@@Z
     ??$AddCordRep@$00@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@PAUCordRep@12@@Z
     ??$AddCordRep@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@PAUCordRep@12@@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AAE?AVstring_view@2@V32@I@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@Vstring_view@2@I@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AAE?AVstring_view@2@V32@I@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@Vstring_view@2@I@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$AddEdge@$00@CordRepBtree@cord_internal@absl@@QAE?AUOpResult@012@_NPAUCordRep@12@I@Z
     ??$AddEdge@$0A@@CordRepBtree@cord_internal@absl@@QAE?AUOpResult@012@_NPAUCordRep@12@I@Z
     ??$AddRing@$00@CordRepRing@cord_internal@absl@@CAPAV012@PAV012@0II@Z
@@ -376,8 +371,8 @@
     ??$ArgumentToConv@PBD@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@UVoidPtr@str_format_internal@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
+    ??$ArgumentToConv@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@Vint128@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
-    ??$ArgumentToConv@Vstring_view@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@Vuint128@absl@@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@_J@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
     ??$ArgumentToConv@_K@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@XZ
@@ -427,8 +422,8 @@
     ??$Dispatch@PBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
+    ??$Dispatch@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
-    ??$Dispatch@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
@@ -449,7 +444,7 @@
     ??$ExtractCharSet@$0IAAAE@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0IAAAE@@01@@Z
     ??$ExtractCharSet@$0JPOAA@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0JPOAA@@01@@Z
     ??$ExtractCharSet@$0JPPPL@@str_format_internal@absl@@YA?AW4FormatConversionCharSet@1@U?$ArgConvertResult@$0JPPPL@@01@@Z
-    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AVstring_view@1@AAVStringifySink@01@ABUHex@1@@Z
+    ??$ExtractStringification@UHex@absl@@@strings_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AAVStringifySink@01@ABUHex@1@@Z
     ??$FastIntToBuffer@C@numbers_internal@absl@@YAPADCPAD@Z
     ??$FastIntToBuffer@D@numbers_internal@absl@@YAPADDPAD@Z
     ??$FastIntToBuffer@E@numbers_internal@absl@@YAPADEPAD@Z
@@ -461,11 +456,11 @@
     ??$Fill@$0A@@CordRepRing@cord_internal@absl@@AAEXPBV012@II@Z
     ??$FindBinary@$00@CordRepRing@cord_internal@absl@@ABEIIII@Z
     ??$FindBinary@$0A@@CordRepRing@cord_internal@absl@@ABEIIII@Z
-    ??$FindSubstitutions@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@Vstring_view@1@ABV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
-    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
-    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
-    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
+    ??$FindSubstitutions@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@ABV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPAV234@PAV234@0II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_1>@?0???$AddRing@$00@012@CAPAV012@PAV012@0II@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPAV234@PAV234@0II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_1>@?0???$AddRing@$0A@@012@CAPAV012@PAV012@0II@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$00@CordRepRing@cord_internal@absl@@AAEXPBV234@II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_1>@?0???$Fill@$00@012@AAEXPBV012@II@Z@@Z
@@ -478,15 +473,15 @@
     ??$FromInt64@$0DLJKMKAA@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0DLJKMKAA@@Cr@std@@@Z
     ??$FromInt64@$0DOI@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0DOI@@Cr@std@@@Z
     ??$FromInt64@$0PECEA@@time_internal@absl@@YA?AVDuration@1@_JV?$ratio@$00$0PECEA@@Cr@std@@@Z
+    ??$GenericCompare@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHABVCord@0@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$GenericCompare@HVCord@absl@@@absl@@YAHABVCord@0@0I@Z
-    ??$GenericCompare@HVstring_view@absl@@@absl@@YAHABVCord@0@ABVstring_view@0@I@Z
+    ??$GenericCompare@_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YA_NABVCord@0@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$GenericCompare@_NVCord@absl@@@absl@@YA_NABVCord@0@0I@Z
-    ??$GenericCompare@_NVstring_view@absl@@@absl@@YA_NABVCord@0@ABVstring_view@0@I@Z
     ??$GetData@$$CBV?$Span@D@absl@@@span_internal@absl@@YAPADABV?$Span@D@1@@Z
     ??$GetData@$$CBV?$Span@I@absl@@@span_internal@absl@@YAPAIABV?$Span@I@1@@Z
     ??$GetData@$$CBV?$Span@VFormatArgImpl@str_format_internal@absl@@@absl@@@span_internal@absl@@YAPAVFormatArgImpl@str_format_internal@1@ABV?$Span@VFormatArgImpl@str_format_internal@absl@@@1@@Z
+    ??$GetData@$$CBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@span_internal@absl@@YAPBDABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$GetData@$$CBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPBVFormatArgImpl@str_format_internal@1@ABV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@Z
-    ??$GetData@$$CBVstring_view@absl@@@span_internal@absl@@YAPBDABVstring_view@1@@Z
     ??$GetData@U?$array@D$0DKJI@@Cr@std@@@span_internal@absl@@YAPADAAU?$array@D$0DKJI@@Cr@std@@@Z
     ??$GetData@V?$InlinedVector@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@absl@@@span_internal@absl@@YAPAPAVLogSink@1@AAV?$InlinedVector@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@1@@Z
     ??$GetData@V?$Span@D@absl@@@span_internal@absl@@YAPADAAV?$Span@D@1@@Z
@@ -495,15 +490,15 @@
     ??$GetDataImpl@$$CBV?$Span@D@absl@@@span_internal@absl@@YAPADABV?$Span@D@1@D@Z
     ??$GetDataImpl@$$CBV?$Span@I@absl@@@span_internal@absl@@YAPAIABV?$Span@I@1@D@Z
     ??$GetDataImpl@$$CBV?$Span@VFormatArgImpl@str_format_internal@absl@@@absl@@@span_internal@absl@@YAPAVFormatArgImpl@str_format_internal@1@ABV?$Span@VFormatArgImpl@str_format_internal@absl@@@1@D@Z
+    ??$GetDataImpl@$$CBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@span_internal@absl@@YAPBDABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ??$GetDataImpl@$$CBV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPBVFormatArgImpl@str_format_internal@1@ABV?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@Cr@std@@@Cr@std@@D@Z
-    ??$GetDataImpl@$$CBVstring_view@absl@@@span_internal@absl@@YAPBDABVstring_view@1@D@Z
     ??$GetDataImpl@U?$array@D$0DKJI@@Cr@std@@@span_internal@absl@@YAPADAAU?$array@D$0DKJI@@Cr@std@@D@Z
     ??$GetDataImpl@V?$InlinedVector@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@absl@@@span_internal@absl@@YAPAPAVLogSink@1@AAV?$InlinedVector@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@1@D@Z
     ??$GetDataImpl@V?$Span@D@absl@@@span_internal@absl@@YAPADAAV?$Span@D@1@D@Z
     ??$GetDataImpl@V?$Span@I@absl@@@span_internal@absl@@YAPAIAAV?$Span@I@1@D@Z
     ??$GetDataImpl@V?$vector@PAVLogSink@absl@@V?$allocator@PAVLogSink@absl@@@Cr@std@@@Cr@std@@@span_internal@absl@@YAPAPAVLogSink@1@AAV?$vector@PAVLogSink@absl@@V?$allocator@PAVLogSink@absl@@@Cr@std@@@Cr@std@@D@Z
     ??$HashOf@$S$$ZI@absl@@YAIABI@Z
-    ??$HashOf@$S$$ZVstring_view@absl@@H@absl@@YAIABVstring_view@0@ABH@Z
+    ??$HashOf@$S$$ZV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@absl@@YAIABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Z
     ??$HidePtr@$$CBX@base_internal@absl@@YAIPBX@Z
     ??$HidePtr@U?$atomic@H@Cr@std@@@base_internal@absl@@YAIPAU?$atomic@H@Cr@std@@@Z
     ??$HidePtr@X@base_internal@absl@@YAIPAX@Z
@@ -513,20 +508,20 @@
     ??$Init@H@FormatArgImpl@str_format_internal@absl@@AAEXABH@Z
     ??$Init@I@FormatArgImpl@str_format_internal@absl@@AAEXABI@Z
     ??$Init@PBD@FormatArgImpl@str_format_internal@absl@@AAEXABQBD@Z
-    ??$Init@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@AAEXABVstring_view@2@@Z
+    ??$Init@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@AAEXABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$Init@_J@FormatArgImpl@str_format_internal@absl@@AAEXAB_J@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@H@UniquelyRepresentedProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@ABH@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@I@UniquelyRepresentedProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@ABI@Z
+    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@ABI@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@ABV?$tuple@ABI@Cr@std@@@Z
-    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@ABVstring_view@absl@@ABH@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@ABV?$tuple@ABVstring_view@absl@@ABH@Cr@std@@@Z
-    ??$Invoke@VMixingHashState@hash_internal@absl@@Vstring_view@3@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@ABVstring_view@3@@Z
-    ??$InvokeFlush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YAXPAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@Vstring_view@1@@Z
-    ??$InvokeFlush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ??$InvokeFlush@VBufferRawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPAVBufferRawSink@01@Vstring_view@1@@Z
-    ??$InvokeFlush@VFILERawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPAVFILERawSink@01@Vstring_view@1@@Z
+    ??$Invoke@VMixingHashState@hash_internal@absl@@V?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@@HashValueProbe@HashSelect@hash_internal@absl@@SA?AVMixingHashState@23@V423@ABV?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@@Z
+    ??$InvokeFlush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@str_format_internal@absl@@YAXPAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ??$InvokeFlush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@str_format_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ??$InvokeFlush@VBufferRawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPAVBufferRawSink@01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$InvokeFlush@VFILERawSink@str_format_internal@absl@@@str_format_internal@absl@@YAXPAVFILERawSink@01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$LowLevelCallOnce@A6AXXZ$$V@base_internal@absl@@YAXPAVonce_flag@1@A6AXXZ@Z
     ??$MakeCheckOpString@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV123@@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV234@0PBD@Z
-    ??$MakeCheckOpString@ABVstring_view@absl@@ABV12@@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVstring_view@1@0PBD@Z
+    ??$MakeCheckOpString@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV123@@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@0PBD@Z
     ??$MakeCheckOpString@DD@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@DDPBD@Z
     ??$MakeCheckOpString@EE@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@EEPBD@Z
     ??$MakeCheckOpString@MM@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@MMPBD@Z
@@ -544,7 +539,7 @@
     ??$MakeCheckOpValueString@PBD@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@ABQBD@Z
     ??$MakeCheckOpValueString@PBE@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@ABQBE@Z
     ??$MakeCheckOpValueString@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
-    ??$MakeCheckOpValueString@Vstring_view@absl@@@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVstring_view@1@@Z
+    ??$MakeCheckOpValueString@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ??$MakeCheckOpValueString@_J@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AB_J@Z
     ??$MakeCheckOpValueString@_K@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AB_K@Z
     ??$MakeCheckOpValueString@_N@log_internal@absl@@YAXAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AB_N@Z
@@ -576,8 +571,8 @@
     ??$Nanoseconds@_J$0A@@absl@@YA?AVDuration@0@_J@Z
     ??$NewImpl@$0BAAA@$$V@CordRepFlat@cord_internal@absl@@SAPAU012@I@Z
     ??$NewImpl@$0EAAAA@$$V@CordRepFlat@cord_internal@absl@@SAPAU012@I@Z
-    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPAV012@Vstring_view@2@I@Z
-    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@Vstring_view@2@I@Z
+    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
+    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@IPAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@I$0A@$00$01@absl@@U45@@internal_layout@container_internal@absl@@QBEIXZ
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@IPAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@I$0A@$00@absl@@U?$integer_sequence@I$0A@$00$01@5@@internal_layout@container_internal@absl@@QBEIXZ
     ??$Offset@$00$0A@@?$LayoutImpl@V?$tuple@IPAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@I$0A@@absl@@U?$integer_sequence@I$0A@$00@5@@internal_layout@container_internal@absl@@QBEIXZ
@@ -589,7 +584,7 @@
     ??$Offset@$0A@$0A@@?$LayoutImpl@V?$tuple@IPAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@I$S@absl@@U?$integer_sequence@I$0A@@5@@internal_layout@container_internal@absl@@QBEIXZ
     ??$ParseFloat@$09@strings_internal@absl@@YA?AUParsedFloat@01@PBD0W4chars_format@1@@Z
     ??$ParseFloat@$0BA@@strings_internal@absl@@YA?AUParsedFloat@01@PBD0W4chars_format@1@@Z
-    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NVstring_view@1@UParsedFormatConsumer@ParsedFormatBase@01@@Z
+    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@UParsedFormatConsumer@ParsedFormatBase@01@@Z
     ??$Partial@$$V@?$Layout@IPAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@IPAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@I$S@absl@@U?$integer_sequence@I$0A@@5@@internal_layout@12@XZ
     ??$Partial@AAI@?$Layout@IPAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@IPAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@I$0A@@absl@@U?$integer_sequence@I$0A@$00@5@@internal_layout@12@AAI@Z
     ??$Partial@AAIAAI@?$Layout@IPAUCordRep@cord_internal@absl@@I@container_internal@absl@@SA?AV?$LayoutImpl@V?$tuple@IPAUCordRep@cord_internal@absl@@I@Cr@std@@U?$integer_sequence@I$0A@$00@absl@@U?$integer_sequence@I$0A@$00$01@5@@internal_layout@12@AAI0@Z
@@ -615,8 +610,8 @@
     ??$Seconds@_J$0A@@absl@@YA?AVDuration@0@_J@Z
     ??$SetEdge@$00@CordRepBtree@cord_internal@absl@@QAE?AUOpResult@012@_NPAUCordRep@12@I@Z
     ??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QAE?AUOpResult@012@_NPAUCordRep@12@I@Z
+    ??$SharedCompareImpl@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHABVCord@0@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$SharedCompareImpl@VCord@absl@@@absl@@YAHABVCord@0@0@Z
-    ??$SharedCompareImpl@Vstring_view@absl@@@absl@@YAHABVCord@0@ABVstring_view@0@@Z
     ??$SmallMemmove@$00@cord_internal@absl@@YAXPADPBDI@Z
     ??$SmallMemmove@$0A@@cord_internal@absl@@YAXPADPBDI@Z
     ??$StoreCallback@P6A_NPAUSynchEvent@absl@@@Z@Condition@absl@@AAEXP6A_NPAUSynchEvent@1@@Z@Z
@@ -624,9 +619,9 @@
     ??$StoreCallback@P6A_NPBU?$atomic@_N@Cr@std@@@Z@Condition@absl@@AAEXP6A_NPBU?$atomic@_N@Cr@std@@@Z@Z
     ??$StrAppend@$$V@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@0@1111@Z
     ??$StrCat@$$BY01D@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@0@0000AAY01$$CBD@Z
-    ??$StrFormat@DHHHHH_JIVstring_view@absl@@HPBDV12@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@ABDABH2222AB_JABIABVstring_view@0@2ABQBD5@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@0@ABV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@3@@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YAHABV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
+    ??$StrFormat@DHHHHH_JIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HPBDV123@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@ABDABH2222AB_JABIABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@2ABQBD5@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@ABV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@3@@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YAHABV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
     ??$ToChronoDuration@V?$duration@JV?$ratio@$0DM@$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0DM@$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$ToChronoDuration@V?$duration@JV?$ratio@$0OBA@$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0OBA@$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
     ??$ToChronoDuration@V?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@time_internal@absl@@YA?AV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@VDuration@1@@Z
@@ -648,9 +643,9 @@
     ??$ToInt@PBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
+    ??$ToInt@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@VFormatArgImpl@str_format_internal@absl@@@FormatArgImplFriend@str_format_internal@absl@@SA_NVFormatArgImpl@12@PAH@Z
     ??$ToInt@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
-    ??$ToInt@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$0A@@Cr@std@@2@Z
     ??$ToInt@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$00@Cr@std@@U?$integral_constant@_N$0A@@56@@Z
     ??$ToInt@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@PAHU?$integral_constant@_N$00@Cr@std@@U?$integral_constant@_N$0A@@56@@Z
@@ -690,7 +685,7 @@
     ??$__construct_node_hash@ABUpiecewise_construct_t@Cr@std@@V?$tuple@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AAE?AV?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@23@@12@IABUpiecewise_construct_t@12@$$QAV?$tuple@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QAV?$tuple@$$V@12@@Z
     ??$__construct_one_at_end@$$V@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AAEXXZ
     ??$__construct_one_at_end@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AAEXXZ
-    ??$__construct_one_at_end@AAVstring_view@absl@@ABV12@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AAEXAAVstring_view@absl@@ABV34@AAI@Z
+    ??$__construct_one_at_end@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV123@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AAEXAAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@ABV312@AAI@Z
     ??$__construct_one_at_end@ABQAVCordzHandle@cord_internal@absl@@@?$vector@PAVCordzHandle@cord_internal@absl@@V?$allocator@PAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AAEXABQAVCordzHandle@cord_internal@absl@@@Z
     ??$__construct_one_at_end@ABQAVLogSink@absl@@@?$vector@PAVLogSink@absl@@V?$allocator@PAVLogSink@absl@@@Cr@std@@@Cr@std@@AAEXABQAVLogSink@absl@@@Z
     ??$__construct_one_at_end@ABQBVCordzHandle@cord_internal@absl@@@?$vector@PBVCordzHandle@cord_internal@absl@@V?$allocator@PBVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@AAEXABQBVCordzHandle@cord_internal@absl@@@Z
@@ -792,7 +787,7 @@
     ??$__distance@V?$move_iterator@PAUTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAHV?$move_iterator@PAUTransition@cctz@time_internal@absl@@@01@0Urandom_access_iterator_tag@01@@Z
     ??$__distance@V?$move_iterator@PAUTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAHV?$move_iterator@PAUTransitionType@cctz@time_internal@absl@@@01@0Urandom_access_iterator_tag@01@@Z
     ??$__do_rehash@$00@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@AAEXI@Z
-    ??$__emplace_back_slow_path@AAVstring_view@absl@@ABV12@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AAEXAAVstring_view@absl@@ABV34@AAI@Z
+    ??$__emplace_back_slow_path@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV123@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@AAEXAAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@ABV312@AAI@Z
     ??$__emplace_unique_key_args@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABUpiecewise_construct_t@23@V?$tuple@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QAE?AU?$pair@V?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@_N@12@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@ABUpiecewise_construct_t@12@$$QAV?$tuple@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@12@$$QAV?$tuple@$$V@12@@Z
     ??$__invoke@AAUByCivilTime@Transition@cctz@time_internal@absl@@ABU2345@ABU2345@@Cr@std@@YA_NAAUByCivilTime@Transition@cctz@time_internal@absl@@ABU3456@1@Z
     ??$__invoke@AAUByUnixTime@Transition@cctz@time_internal@absl@@ABU2345@ABU2345@@Cr@std@@YA_NAAUByUnixTime@Transition@cctz@time_internal@absl@@ABU3456@1@Z
@@ -956,9 +951,9 @@
     ??$call_once@A6AXXZ$$V@absl@@YAXAAVonce_flag@0@A6AXXZ@Z
     ??$combine@H$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@ABH@Z
     ??$combine@I$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@ABI@Z
+    ??$combine@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Z
     ??$combine@V?$tuple@ABI@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@ABV?$tuple@ABI@Cr@std@@@Z
-    ??$combine@V?$tuple@ABVstring_view@absl@@ABH@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@ABV?$tuple@ABVstring_view@absl@@ABH@Cr@std@@@Z
-    ??$combine@Vstring_view@absl@@H@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@ABVstring_view@2@ABH@Z
+    ??$combine@V?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@$$V@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@ABV?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@@Z
     ??$combine_contiguous@D@?$HashStateBase@VMixingHashState@hash_internal@absl@@@hash_internal@absl@@SA?AVMixingHashState@12@V312@PBDI@Z
     ??$construct@PAPBVImpl@time_zone@cctz@time_internal@absl@@ABQAPBV12345@XX@?$allocator_traits@V?$allocator@PAPBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAAV?$allocator@PAPBVImpl@time_zone@cctz@time_internal@absl@@@12@PAPAPBVImpl@time_zone@cctz@time_internal@absl@@ABQAPBV45678@@Z
     ??$construct@PAPBVImpl@time_zone@cctz@time_internal@absl@@PAPBV12345@XX@?$allocator_traits@V?$allocator@PAPBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAAV?$allocator@PAPBVImpl@time_zone@cctz@time_internal@absl@@@12@PAPAPBVImpl@time_zone@cctz@time_internal@absl@@$$QAPAPBV45678@@Z
@@ -983,7 +978,7 @@
     ??$construct@UTransition@cctz@time_internal@absl@@U1234@XX@?$allocator_traits@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAAV?$allocator@UTransition@cctz@time_internal@absl@@@12@PAUTransition@cctz@time_internal@absl@@$$QAU4567@@Z
     ??$construct@UTransitionType@cctz@time_internal@absl@@$$VXX@?$allocator_traits@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@PAUTransitionType@cctz@time_internal@absl@@@Z
     ??$construct@UTransitionType@cctz@time_internal@absl@@U1234@XX@?$allocator_traits@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@SAXAAV?$allocator@UTransitionType@cctz@time_internal@absl@@@12@PAUTransitionType@cctz@time_internal@absl@@$$QAU4567@@Z
-    ??$construct@UViableSubstitution@strings_internal@absl@@AAVstring_view@3@ABV43@AAIXX@?$allocator_traits@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@SAXAAV?$allocator@UViableSubstitution@strings_internal@absl@@@12@PAUViableSubstitution@strings_internal@absl@@AAVstring_view@6@ABV76@AAI@Z
+    ??$construct@UViableSubstitution@strings_internal@absl@@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV456@AAIXX@?$allocator_traits@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@SAXAAV?$allocator@UViableSubstitution@strings_internal@absl@@@12@PAUViableSubstitution@strings_internal@absl@@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@ABV712@AAI@Z
     ??$construct@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$optional_data_base@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@optional_internal@absl@@IAEX$$QAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$construct_at@PAPBVImpl@time_zone@cctz@time_internal@absl@@ABQAPBV12345@PAPAPBV12345@@Cr@std@@YAPAPAPBVImpl@time_zone@cctz@time_internal@absl@@PAPAPBV23456@ABQAPBV23456@@Z
     ??$construct_at@PAPBVImpl@time_zone@cctz@time_internal@absl@@PAPBV12345@PAPAPBV12345@@Cr@std@@YAPAPAPBVImpl@time_zone@cctz@time_internal@absl@@PAPAPBV23456@$$QAPAPBV23456@@Z
@@ -1008,7 +1003,7 @@
     ??$construct_at@UTransition@cctz@time_internal@absl@@U1234@PAU1234@@Cr@std@@YAPAUTransition@cctz@time_internal@absl@@PAU2345@$$QAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@$$VPAU1234@@Cr@std@@YAPAUTransitionType@cctz@time_internal@absl@@PAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@U1234@PAU1234@@Cr@std@@YAPAUTransitionType@cctz@time_internal@absl@@PAU2345@$$QAU2345@@Z
-    ??$construct_at@UViableSubstitution@strings_internal@absl@@AAVstring_view@3@ABV43@AAIPAU123@@Cr@std@@YAPAUViableSubstitution@strings_internal@absl@@PAU234@AAVstring_view@4@ABV54@AAI@Z
+    ??$construct_at@UViableSubstitution@strings_internal@absl@@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV456@AAIPAU123@@Cr@std@@YAPAUViableSubstitution@strings_internal@absl@@PAU234@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@01@ABV501@AAI@Z
     ??$copy@PBVFormatArgImpl@str_format_internal@absl@@PAV123@@Cr@std@@YAPAVFormatArgImpl@str_format_internal@absl@@PBV234@0PAV234@@Z
     ??$copy@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PBU1234@ABU1234@PBQBU1234@H$0A@@Cr@std@@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PAU1234@AAU1234@PAPAU1234@H$0A@@23@@Cr@std@@YA?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PAU1234@AAU1234@PAPAU1234@H$0A@@01@V?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PBU1234@ABU1234@PBQBU1234@H$0A@@01@0V201@@Z
     ??$countl_zero@I@absl@@YAHI@Z
@@ -1055,7 +1050,7 @@
     ??$emplace@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__wrap_iter@PAUTransitionType@cctz@time_internal@absl@@@12@V?$__wrap_iter@PBUTransitionType@cctz@time_internal@absl@@@12@@Z
     ??$emplace_back@$$V@?$__split_buffer@UTransition@cctz@time_internal@absl@@AAV?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXXZ
     ??$emplace_back@$$V@?$__split_buffer@UTransitionType@cctz@time_internal@absl@@AAV?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXXZ
-    ??$emplace_back@AAVstring_view@absl@@ABV12@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUViableSubstitution@strings_internal@absl@@AAVstring_view@5@ABV65@AAI@Z
+    ??$emplace_back@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV123@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUViableSubstitution@strings_internal@absl@@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@ABV612@AAI@Z
     ??$emplace_back@ABQAUCordRep@cord_internal@absl@@@?$InlinedVector@PAUCordRep@cord_internal@absl@@$01V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QAEAAPAUCordRep@cord_internal@1@ABQAU231@@Z
     ??$emplace_back@ABQAVLogSink@absl@@@?$InlinedVector@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@absl@@QAEAAPAVLogSink@1@ABQAV21@@Z
     ??$emplace_back@HVcrc32c_t@absl@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUPrefixCrc@CrcCordState@crc_internal@absl@@$$QAH$$QAVcrc32c_t@6@@Z
@@ -1089,8 +1084,6 @@
     ??$get@$00@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@I@container_internal@absl@@QGAEAAIXZ
     ??$get@$00@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@I@container_internal@absl@@QGBEABIXZ
     ??$get@$00@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@PAUPayload@status_internal@absl@@@container_internal@absl@@QGAEAAPAUPayload@status_internal@2@XZ
-    ??$get@$00ABVstring_view@absl@@ABH@Cr@std@@YAABHABV?$tuple@ABVstring_view@absl@@ABH@01@@Z
-    ??$get@$00Vstring_view@absl@@V12@@Cr@std@@YAABVstring_view@absl@@ABU?$pair@Vstring_view@absl@@V12@@01@@Z
     ??$get@$0A@@?$CompressedTuple@IVHashtablezInfoHandle@container_internal@absl@@@container_internal@absl@@QGAEAAIXZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@H@Cr@std@@I@container_internal@absl@@QGAEAAV?$allocator@H@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@I@container_internal@absl@@QGAEAAV?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@XZ
@@ -1100,17 +1093,13 @@
     ??$get@$0A@@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@I@container_internal@absl@@QGAEAAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@I@container_internal@absl@@QGBEABV?$allocator@UPayload@status_internal@absl@@@Cr@std@@XZ
     ??$get@$0A@@?$CompressedTuple@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@PAUPayload@status_internal@absl@@@container_internal@absl@@QGAEAAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@XZ
-    ??$get@$0A@ABVstring_view@absl@@ABH@Cr@std@@YAABVstring_view@absl@@ABV?$tuple@ABVstring_view@absl@@ABH@01@@Z
-    ??$get@$0A@Vstring_view@absl@@V12@@Cr@std@@YAABVstring_view@absl@@ABU?$pair@Vstring_view@absl@@V12@@01@@Z
-    ??$get@Vstring_view@absl@@V12@@?$__get_pair@$00@Cr@std@@SAABVstring_view@absl@@ABU?$pair@Vstring_view@absl@@V12@@12@@Z
-    ??$get@Vstring_view@absl@@V12@@?$__get_pair@$0A@@Cr@std@@SAABVstring_view@absl@@ABU?$pair@Vstring_view@absl@@V12@@12@@Z
     ??$hash@V?$tuple@ABI@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SAIABV?$tuple@ABI@Cr@std@@@Z
-    ??$hash@V?$tuple@ABVstring_view@absl@@ABH@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SAIABV?$tuple@ABVstring_view@absl@@ABH@Cr@std@@@Z
+    ??$hash@V?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@$0A@@MixingHashState@hash_internal@absl@@SAIABV?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@@Z
     ??$hash_bytes@VMixingHashState@hash_internal@absl@@H@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABH@Z
     ??$hash_bytes@VMixingHashState@hash_internal@absl@@I@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABI@Z
     ??$hash_range_or_bytes@VMixingHashState@hash_internal@absl@@D@hash_internal@absl@@YA?AVMixingHashState@01@V201@PBDI@Z
     ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@ABI@Cr@std@@$0A@@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABV?$tuple@ABI@Cr@std@@U?$integer_sequence@I$0A@@1@@Z
-    ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@ABVstring_view@absl@@ABH@Cr@std@@$0A@$00@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABV?$tuple@ABVstring_view@absl@@ABH@Cr@std@@U?$integer_sequence@I$0A@$00@1@@Z
+    ??$hash_tuple@VMixingHashState@hash_internal@absl@@V?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@$0A@$00@hash_internal@absl@@YA?AVMixingHashState@01@V201@ABV?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@U?$integer_sequence@I$0A@$00@1@@Z
     ??$launder@$$CBU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAPBU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@01@PBU201@@Z
     ??$launder@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YAPAU?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@01@PAU201@@Z
     ??$lower_bound@PBUTransition@cctz@time_internal@absl@@U1234@UByUnixTime@1234@@Cr@std@@YAPBUTransition@cctz@time_internal@absl@@PBU2345@0ABU2345@UByUnixTime@2345@@Z
@@ -1199,17 +1188,15 @@
     ??$swap@PAUViableSubstitution@strings_internal@absl@@@Cr@std@@YAXAAPAUViableSubstitution@strings_internal@absl@@0@Z
     ??$swap@PBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@YAXAAPBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@0@Z
     ??$swap@UViableSubstitution@strings_internal@absl@@@Cr@std@@YAXAAUViableSubstitution@strings_internal@absl@@0@Z
-    ??$swap@Vstring_view@absl@@@Cr@std@@YAXAAVstring_view@absl@@0@Z
-    ??$tie@$$CBVstring_view@absl@@$$CBH@Cr@std@@YA?AV?$tuple@ABVstring_view@absl@@ABH@01@ABVstring_view@absl@@ABH@Z
     ??$upper_bound@PBUTransition@cctz@time_internal@absl@@U1234@UByCivilTime@1234@@Cr@std@@YAPBUTransition@cctz@time_internal@absl@@PBU2345@0ABU2345@UByCivilTime@2345@@Z
     ??$upper_bound@PBUTransition@cctz@time_internal@absl@@U1234@UByUnixTime@1234@@Cr@std@@YAPBUTransition@cctz@time_internal@absl@@PBU2345@0ABU2345@UByUnixTime@2345@@Z
     ??0?$AllocationTransaction@V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAE@AAV?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@Z
     ??0?$AllocationTransaction@V?$allocator@PAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAE@AAV?$allocator@PAVLogSink@absl@@@Cr@std@@@Z
     ??0?$AllocationTransaction@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAE@AAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@@Z
-    ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@XZ
     ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@_K@Z
-    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@XZ
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@_K@Z
     ??0?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@absl@@QAE@PBD@Z
@@ -1435,7 +1422,7 @@
     ??0AlphaNum@absl@@QAE@H@Z
     ??0AlphaNum@absl@@QAE@I@Z
     ??0AlphaNum@absl@@QAE@PBD@Z
-    ??0AlphaNum@absl@@QAE@Vstring_view@1@@Z
+    ??0AlphaNum@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0AlphaNum@absl@@QAE@_J@Z
     ??0Arena@LowLevelAlloc@base_internal@absl@@QAE@I@Z
     ??0Arg@substitute_internal@absl@@QAE@PBX@Z
@@ -1448,9 +1435,9 @@
     ??0BoundConversion@str_format_internal@absl@@QAE@XZ
     ??0Breakdown@Time@absl@@QAE@XZ
     ??0BufferRawSink@str_format_internal@absl@@QAE@PADI@Z
-    ??0ByAnyChar@absl@@QAE@Vstring_view@1@@Z
+    ??0ByAnyChar@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0ByLength@absl@@QAE@H@Z
-    ??0ByString@absl@@QAE@Vstring_view@1@@Z
+    ??0ByString@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0CRC32@crc_internal@absl@@QAE@XZ
     ??0CRC@crc_internal@absl@@IAE@XZ
     ??0CRCImpl@crc_internal@absl@@QAE@XZ
@@ -1462,7 +1449,7 @@
     ??0CivilInfo@TimeZone@absl@@QAE@XZ
     ??0Condition@absl@@QAE@P6A_NPAX@Z0@Z
     ??0Condition@absl@@QAE@PB_N@Z
-    ??0Cord@absl@@AAE@Vstring_view@1@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
+    ??0Cord@absl@@AAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
     ??0Cord@absl@@QAE@$$QAV01@@Z
     ??0Cord@absl@@QAE@ABV01@@Z
     ??0Cord@absl@@QAE@XZ
@@ -1517,9 +1504,9 @@
     ??0LogMessage@log_internal@absl@@QAE@PBDHW4LogSeverity@2@@Z
     ??0LogMessageData@LogMessage@log_internal@absl@@QAE@PBDHW4LogSeverity@3@VTime@3@@Z
     ??0LogMessageFatal@log_internal@absl@@QAE@PBDH@Z
-    ??0LogMessageFatal@log_internal@absl@@QAE@PBDHVstring_view@2@@Z
+    ??0LogMessageFatal@log_internal@absl@@QAE@PBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogMessageQuietlyFatal@log_internal@absl@@QAE@PBDH@Z
-    ??0LogMessageQuietlyFatal@log_internal@absl@@QAE@PBDHVstring_view@2@@Z
+    ??0LogMessageQuietlyFatal@log_internal@absl@@QAE@PBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogSink@absl@@QAE@XZ
     ??0Long@Rep@CordBuffer@absl@@QAE@PAUCordRepFlat@cord_internal@3@@Z
     ??0MixingHashState@hash_internal@absl@@AAE@XZ
@@ -1529,7 +1516,7 @@
     ??0NodeCounts@CordzStatistics@cord_internal@absl@@QAE@XZ
     ??0OstreamView@LogMessage@log_internal@absl@@QAE@AAULogMessageData@123@@Z
     ??0ParsedFloat@strings_internal@absl@@QAE@XZ
-    ??0ParsedFormatBase@str_format_internal@absl@@QAE@Vstring_view@2@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@std@@@Z
+    ??0ParsedFormatBase@str_format_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@5@@Z
     ??0ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAE@PAV123@@Z
     ??0Payload@status_internal@absl@@QAE@$$QAU012@@Z
     ??0Payload@status_internal@absl@@QAE@ABU012@@Z
@@ -1557,8 +1544,8 @@
     ??0SpinLockHolder@base_internal@absl@@QAE@PAVSpinLock@12@@Z
     ??0Status@absl@@QAE@$$QAV01@@Z
     ??0Status@absl@@QAE@ABV01@@Z
-    ??0Status@absl@@QAE@W4StatusCode@1@Vstring_view@1@@Z
-    ??0StatusRep@status_internal@absl@@QAE@W4StatusCode@2@Vstring_view@2@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@@Z
+    ??0Status@absl@@QAE@W4StatusCode@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0StatusRep@status_internal@absl@@QAE@W4StatusCode@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@56@@Z
     ??0StdcppWaiter@synchronization_internal@absl@@QAE@XZ
     ??0Streamable@str_format_internal@absl@@QAE@ABVUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ??0StringifySink@strings_internal@absl@@QAE@XZ
@@ -1575,9 +1562,9 @@
     ??0Transition@cctz@time_internal@absl@@QAE@XZ
     ??0TransitionType@cctz@time_internal@absl@@QAE@XZ
     ??0UnboundConversion@str_format_internal@absl@@QAE@XZ
-    ??0UntypedFormatSpec@absl@@QAE@Vstring_view@1@@Z
-    ??0UntypedFormatSpecImpl@str_format_internal@absl@@QAE@Vstring_view@2@@Z
-    ??0ViableSubstitution@strings_internal@absl@@QAE@Vstring_view@2@0I@Z
+    ??0UntypedFormatSpec@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0UntypedFormatSpecImpl@str_format_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??0ViableSubstitution@strings_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0I@Z
     ??0Win32Waiter@synchronization_internal@absl@@QAE@XZ
     ??0WriterMutexLock@absl@@QAE@PAVMutex@1@@Z
     ??0ZoneInfoSource@cctz@time_internal@absl@@QAE@XZ
@@ -1613,10 +1600,6 @@
     ??0int128@absl@@QAE@N@Z
     ??0int128@absl@@QAE@O@Z
     ??0once_flag@absl@@QAE@XZ
-    ??0string_view@absl@@AAE@PBDIUSkipCheckLengthTag@01@@Z
-    ??0string_view@absl@@QAE@PBD@Z
-    ??0string_view@absl@@QAE@PBDI@Z
-    ??0string_view@absl@@QAE@XZ
     ??0time_zone@cctz@time_internal@absl@@AAE@PBVImpl@0123@@Z
     ??0time_zone@cctz@time_internal@absl@@QAE@XZ
     ??0uint128@absl@@AAE@_K0@Z
@@ -1754,7 +1737,7 @@
     ??4BadStatusOrAccess@absl@@QAEAAV01@$$QAV01@@Z
     ??4BadStatusOrAccess@absl@@QAEAAV01@ABV01@@Z
     ??4Cord@absl@@QAEAAV01@$$QAV01@@Z
-    ??4Cord@absl@@QAEAAV01@Vstring_view@1@@Z
+    ??4Cord@absl@@QAEAAV01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??4CordzUpdateTracker@cord_internal@absl@@QAEAAV012@ABV012@@Z
     ??4CrcCordState@crc_internal@absl@@QAEAAV012@$$QAV012@@Z
     ??4CrcCordState@crc_internal@absl@@QAEAAV012@ABV012@@Z
@@ -1773,13 +1756,12 @@
     ??6LogMessage@log_internal@absl@@QAEAAV012@H@Z
     ??6LogMessage@log_internal@absl@@QAEAAV012@P6AAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV345@@Z@Z
     ??6LogMessage@log_internal@absl@@QAEAAV012@P6AAAVios_base@Cr@std@@AAV345@@Z@Z
-    ??6LogMessage@log_internal@absl@@QAEAAV012@Vstring_view@2@@Z
+    ??6LogMessage@log_internal@absl@@QAEAAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??6absl@@YA?AVuint128@0@V10@H@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@ABVCord@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@ABVStatus@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@Vcrc32c_t@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@Vint128@0@@Z
-    ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@Vstring_view@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@Vuint128@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@W4LogSeverity@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@W4LogSeverityAtLeast@0@@Z
@@ -1813,7 +1795,6 @@
     ??8absl@@YA_NVDuration@0@0@Z
     ??8absl@@YA_NVTime@0@0@Z
     ??8absl@@YA_NVint128@0@0@Z
-    ??8absl@@YA_NVstring_view@0@0@Z
     ??8absl@@YA_NVuint128@0@0@Z
     ??8cord_internal@absl@@YA_NABVInlineData@01@0@Z
     ??9ChunkIterator@Cord@absl@@QBE_NABV012@@Z
@@ -1827,7 +1808,6 @@
     ??9GraphId@synchronization_internal@absl@@QBE_NABU012@@Z
     ??9absl@@YA_NABVCord@0@0@Z
     ??9absl@@YA_NVint128@0@0@Z
-    ??9absl@@YA_NVstring_view@0@0@Z
     ??9absl@@YA_NVuint128@0@0@Z
     ??A?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QAEAAUPayload@status_internal@1@I@Z
     ??A?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QBEABUPayload@status_internal@1@I@Z
@@ -1844,7 +1824,6 @@
     ??A?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QBEABUTransitionType@cctz@time_internal@absl@@I@Z
     ??A?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUViableSubstitution@strings_internal@absl@@I@Z
     ??ACord@absl@@QBEDI@Z
-    ??Astring_view@absl@@QBEABDI@Z
     ??B?$NonIterableBitMask@I$0BA@$0A@@container_internal@absl@@QBE_NXZ
     ??B?$__atomic_base@PAVCordzHandle@cord_internal@absl@@$0A@@Cr@std@@QBEPAVCordzHandle@cord_internal@absl@@XZ
     ??B?$optional@I@absl@@QBE_NXZ
@@ -1873,7 +1852,7 @@
     ??C?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QBEPAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@XZ
     ??C?$unique_ptr@VTimeZoneIf@cctz@time_internal@absl@@U?$default_delete@VTimeZoneIf@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QBEPAVTimeZoneIf@cctz@time_internal@absl@@XZ
     ??C?$unique_ptr@VTimeZoneInfo@cctz@time_internal@absl@@U?$default_delete@VTimeZoneInfo@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QBEPAVTimeZoneInfo@cctz@time_internal@absl@@XZ
-    ??CChunkIterator@Cord@absl@@QBEPBVstring_view@2@XZ
+    ??CChunkIterator@Cord@absl@@QBEPBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ??D?$__deque_iterator@PBVImpl@time_zone@cctz@time_internal@absl@@PAPBV12345@AAPBV12345@PAPAPBV12345@H$0A@@Cr@std@@QBEAAPBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ??D?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PAU1234@AAU1234@PAPAU1234@H$0A@@Cr@std@@QBEAAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ??D?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PBU1234@ABU1234@PBQBU1234@H$0A@@Cr@std@@QBEABUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
@@ -1900,7 +1879,7 @@
     ??D?$reverse_iterator@PAUViableSubstitution@strings_internal@absl@@@Cr@std@@QBEAAUViableSubstitution@strings_internal@absl@@XZ
     ??D?$unique_ptr@ULogMessageData@LogMessage@log_internal@absl@@U?$default_delete@ULogMessageData@LogMessage@log_internal@absl@@@Cr@std@@@Cr@std@@QBEAAULogMessageData@LogMessage@log_internal@absl@@XZ
     ??D?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QBEAAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@XZ
-    ??DChunkIterator@Cord@absl@@QBE?AVstring_view@2@XZ
+    ??DChunkIterator@Cord@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ??D__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBE?AU__deque_block_range@123@XZ
     ??Dabsl@@YA?AVint128@0@V10@0@Z
     ??Dabsl@@YA?AVuint128@0@V10@0@Z
@@ -1981,15 +1960,13 @@
     ??R<lambda_1>@?0???A?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@absl@@QBEABVFormatArgImpl@str_format_internal@2@I@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0???A?$Span@D@absl@@QBEAADI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0???A?$Span@I@absl@@QBEAAII@Z@QBE?A?<auto>@@XZ
-    ??R<lambda_1>@?0???Astring_view@absl@@QBEABDI@Z@QBE?A?<auto>@@XZ
-    ??R<lambda_1>@?0???CChunkIterator@Cord@absl@@QBEPBVstring_view@3@XZ@QBE?A?<auto>@@XZ
+    ??R<lambda_1>@?0???CChunkIterator@Cord@absl@@QBEPBV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0???D?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@QGAEAAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ@QBE?A?<auto>@@XZ
-    ??R<lambda_1>@?0???DChunkIterator@Cord@absl@@QBE?AVstring_view@3@XZ@QBE?A?<auto>@@XZ
+    ??R<lambda_1>@?0???DChunkIterator@Cord@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0???EChunkIterator@Cord@absl@@QAEAAV123@XZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??Append@FormatSinkImpl@str_format_internal@absl@@QAEXID@Z@QBE?A?<auto>@@I@Z
-    ??R<lambda_1>@?0??CheckLengthInternal@string_view@absl@@CAII@Z@QBE?A?<auto>@@XZ
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@ABEHABV23@II@Z@QBE?A?<auto>@@PAVChunkIterator@23@PAVstring_view@3@@Z
-    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@ABEHVstring_view@3@II@Z@QBE?A?<auto>@@PAVChunkIterator@23@PAV43@@Z
+    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@ABEHABV23@II@Z@QBE?A?<auto>@@PAVChunkIterator@23@PAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??R<lambda_1>@?0??CompareSlowPath@Cord@absl@@ABEHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@II@Z@QBE?A?<auto>@@PAVChunkIterator@23@PAV456@@Z
     ??R<lambda_1>@?0??InitFrom@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAEXABV234@@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??SetLength@CordBuffer@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??SubtractSize@?$Storage@H$0CP@V?$allocator@H@Cr@std@@@inlined_vector_internal@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
@@ -2000,17 +1977,14 @@
     ??R<lambda_1>@?0??back@?$InlinedVector@PAUCordRep@cord_internal@absl@@$01V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QAEAAPAUCordRep@cord_internal@3@XZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??back@?$InlinedVector@PAUCordRep@cord_internal@absl@@$0CP@V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QAEAAPAUCordRep@cord_internal@3@XZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QAEPAUPayload@status_internal@3@PBU453@@Z@QBE?A?<auto>@@XZ
-    ??R<lambda_1>@?0??front@string_view@absl@@QBEABDXZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??inline_size@Rep@InlineData@cord_internal@absl@@QBEIXZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@H$0CP@V?$allocator@H@Cr@std@@@absl@@QAEXXZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@PAUCordRep@cord_internal@absl@@$01V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QAEXXZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??pop_back@?$InlinedVector@PAUCordRep@cord_internal@absl@@$0CP@V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@absl@@QAEXXZ@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_prefix@?$Span@$$CBD@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_prefix@?$Span@D@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
-    ??R<lambda_1>@?0??remove_prefix@string_view@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_suffix@?$Span@$$CBD@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??remove_suffix@?$Span@D@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
-    ??R<lambda_1>@?0??remove_suffix@string_view@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??set_inline_data@InlineData@cord_internal@absl@@QAEXPBDI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_1>@?0??set_inline_size@Rep@InlineData@cord_internal@absl@@QAEXI@Z@QBE?A?<auto>@@XZ
     ??R<lambda_2>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@0II@Z@QBE?A?<auto>@@I@Z
@@ -2018,10 +1992,10 @@
     ??R<lambda_2>@?0??erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QAEPAUPayload@status_internal@3@PBU453@@Z@QBE?A?<auto>@@XZ
     ??R?$FunctionRef@$$A6AXPAUCordRep@cord_internal@absl@@II@Z@absl@@QBEXPAUCordRep@cord_internal@1@II@Z
     ??R?$FunctionRef@$$A6AXV?$Span@I@absl@@@Z@absl@@QBEXV?$Span@I@1@@Z
-    ??R?$FunctionRef@$$A6AXVstring_view@absl@@@Z@absl@@QBEXVstring_view@1@@Z
-    ??R?$FunctionRef@$$A6AXVstring_view@absl@@ABVCord@2@@Z@absl@@QBEXVstring_view@1@ABVCord@1@@Z
+    ??R?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@absl@@QBEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??R?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@absl@@@Z@absl@@QBEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@1@@Z
     ??R?$HashImpl@V?$tuple@ABI@Cr@std@@@hash_internal@absl@@QBEIABV?$tuple@ABI@Cr@std@@@Z
-    ??R?$HashImpl@V?$tuple@ABVstring_view@absl@@ABH@Cr@std@@@hash_internal@absl@@QBEIABV?$tuple@ABVstring_view@absl@@ABH@Cr@std@@@Z
+    ??R?$HashImpl@V?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@@hash_internal@absl@@QBEIABV?$tuple@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABH@Cr@std@@@Z
     ??R?$RandenPool@E@random_internal@absl@@QAEEXZ
     ??R?$RandenPool@G@random_internal@absl@@QAEGXZ
     ??R?$RandenPool@I@random_internal@absl@@QAEIXZ
@@ -2079,20 +2053,20 @@
     ??_4uint128@absl@@QAEAAV01@V01@@Z
     ??_5uint128@absl@@QAEAAV01@V01@@Z
     ??_6uint128@absl@@QAEAAV01@V01@@Z
-    ?AbortedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AbortedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?AbsDuration@absl@@YA?AVDuration@1@V21@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPAVBufferRawSink@12@Vstring_view@2@@Z
-    ?AbslFormatFlush@str_format_internal@absl@@YAXPAVFILERawSink@12@Vstring_view@2@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PAVDuration@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPAVBufferRawSink@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslFormatFlush@str_format_internal@absl@@YAXPAVFILERawSink@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVDuration@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?AbslUnparseFlag@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@@Z
@@ -2134,34 +2108,34 @@
     ?AllocatedSize@CordRepFlat@cord_internal@absl@@QBEIXZ
     ?AllocatedSizeToTag@cord_internal@absl@@YAEI@Z
     ?AllocatedSizeToTagUnchecked@cord_internal@absl@@YAEI@Z
-    ?AlreadyExistsError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AlreadyExistsError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@?$AppendUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@I@Z
     ?Append@Cord@absl@@QAEX$$QAV12@@Z
     ?Append@Cord@absl@@QAEXABV12@@Z
-    ?Append@Cord@absl@@QAEXVstring_view@2@@Z
+    ?Append@Cord@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@PAUCordRep@23@@Z
-    ?Append@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
+    ?Append@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Append@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@PAUCordRep@23@@Z
-    ?Append@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
+    ?Append@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Append@FormatSinkImpl@str_format_internal@absl@@QAEXID@Z
-    ?Append@FormatSinkImpl@str_format_internal@absl@@QAEXVstring_view@3@@Z
-    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAE_NVstring_view@4@@Z
+    ?Append@FormatSinkImpl@str_format_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@StringifySink@strings_internal@absl@@QAEXID@Z
-    ?Append@StringifySink@strings_internal@absl@@QAEXVstring_view@3@@Z
-    ?AppendArray@InlineRep@Cord@absl@@QAEXVstring_view@3@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
+    ?Append@StringifySink@strings_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AppendArray@InlineRep@Cord@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
     ?AppendLeaf@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@II@Z
     ?AppendPack@str_format_internal@absl@@YAAAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAV345@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
-    ?AppendPieces@strings_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
-    ?AppendPrecise@Cord@absl@@AAEXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?AppendPieces@strings_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
+    ?AppendPrecise@Cord@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?AppendSlow@CordRepBtree@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
     ?AppendSlow@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
-    ?AppendText@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAEIVstring_view@4@@Z
+    ?AppendText@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAEIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?AppendTree@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToInlined@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToTree@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTruncated@log_internal@absl@@YAIDIAAV?$Span@D@2@@Z
-    ?AppendTruncated@log_internal@absl@@YAIVstring_view@2@AAV?$Span@D@2@@Z
-    ?ApplySubstitutions@strings_internal@absl@@YAHVstring_view@2@PAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@56@@Z
+    ?AppendTruncated@log_internal@absl@@YAIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV?$Span@D@2@@Z
+    ?ApplySubstitutions@strings_internal@absl@@YAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@45@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AsciiStrToLower@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AsciiStrToUpper@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AssertHeld@CordzInfo@cord_internal@absl@@QAEXXZ
@@ -2176,16 +2150,16 @@
     ?AsyncSignalSafeWriteToStderr@raw_log_internal@absl@@YAXPBDI@Z
     ?At@TimeZone@absl@@QBE?AUCivilInfo@12@VTime@2@@Z
     ?At@TimeZone@absl@@QBE?AUTimeInfo@12@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@@Z
-    ?AtLocation@LogMessage@log_internal@absl@@QAEAAV123@Vstring_view@3@H@Z
+    ?AtLocation@LogMessage@log_internal@absl@@QAEAAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?Avail@FormatSinkImpl@str_format_internal@absl@@ABEIXZ
     ?Await@Mutex@absl@@QAEXABVCondition@2@@Z
     ?AwaitCommon@Mutex@absl@@AAE_NABVCondition@2@VKernelTimeout@synchronization_internal@2@@Z
     ?AwaitWithDeadline@Mutex@absl@@QAE_NABVCondition@2@VTime@2@@Z
     ?AwaitWithTimeout@Mutex@absl@@QAE_NABVCondition@2@VDuration@2@@Z
-    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Base64Escape@absl@@YAXVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Base64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?Base64EscapeInternal@strings_internal@absl@@YAIPBEIPADIPBD_N@Z
-    ?Base64Unescape@absl@@YA_NVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?BindWithPack@str_format_internal@absl@@YA_NPBUUnboundConversion@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@PAVBoundConversion@12@@Z
     ?BitCastToSigned@int128_internal@absl@@YA_J_K@Z
     ?Block@Barrier@absl@@QAE_NXZ
@@ -2195,22 +2169,21 @@
     ?BreakTime@TimeZoneLibC@cctz@time_internal@absl@@UBE?AUabsolute_lookup@time_zone@234@ABV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?BufferSizeFor@log_internal@absl@@YAIXZ
     ?Build@Header@TimeZoneInfo@cctz@time_internal@absl@@QAE_NABUtzhead@@@Z
-    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?CPUSupportsRandenHwAes@random_internal@absl@@YA_NXZ
-    ?CUnescape@absl@@YA_NVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@1@Z
+    ?CUnescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@1@Z
     ?CalculateBase64EscapedLenInternal@strings_internal@absl@@YAII_N@Z
     ?CallVoidPtrFunction@Condition@absl@@CA_NPBV12@@Z
-    ?CancelledError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?CancelledError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Capacity@CordRepFlat@cord_internal@absl@@QBEIXZ
     ?CapacityToGrowth@container_internal@absl@@YAII@Z
-    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEVstring_view@2@0E@Z
-    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
+    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0E@Z
+    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
     ?Ceil@absl@@YA?AVDuration@1@V21@0@Z
     ?CheckFastPathSetting@str_format_internal@absl@@YA_NABUUnboundConversion@12@@Z
     ?CheckInvariants@GraphCycles@synchronization_internal@absl@@QBE_NXZ
-    ?CheckLengthInternal@string_view@absl@@CAII@Z
     ?CheckstrcasecmpfalseImpl@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBD00@Z
     ?CheckstrcasecmptrueImpl@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBD00@Z
     ?CheckstrcmpfalseImpl@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBD00@Z
@@ -2231,15 +2204,15 @@
     ?CombineLargeContiguousImpl32@MixingHashState@hash_internal@absl@@CA_K_KPBEI@Z
     ?CombineLargeContiguousImpl64@MixingHashState@hash_internal@absl@@CA_K_KPBEI@Z
     ?CommitTree@InlineRep@Cord@absl@@QAEXPBUCordRep@cord_internal@3@PAU453@ABVCordzUpdateScope@53@W4MethodIdentifier@CordzUpdateTracker@53@@Z
-    ?Compare@Cord@absl@@QBEHVstring_view@2@@Z
+    ?Compare@Cord@absl@@QBEHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?CompareImpl@Cord@absl@@ABEHABV12@@Z
     ?CompareSlowPath@Cord@absl@@ABEHABV12@II@Z
-    ?CompareSlowPath@Cord@absl@@ABEHVstring_view@2@II@Z
+    ?CompareSlowPath@Cord@absl@@ABEHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@II@Z
     ?Compute@CrcNonTemporalMemcpyAVXEngine@crc_internal@absl@@UBE?AVcrc32c_t@3@PIAXPIBXIV43@@Z
     ?Compute@CrcNonTemporalMemcpyEngine@crc_internal@absl@@UBE?AVcrc32c_t@3@PIAXPIBXIV43@@Z
     ?Compute@FallbackCrcMemcpyEngine@crc_internal@absl@@UBE?AVcrc32c_t@3@PIAXPIBXIV43@@Z
     ?ComputeCapacity@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@SAIII@Z
-    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@Vstring_view@1@@Z
+    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Concat@CRC@crc_internal@absl@@UAEXPAIII@Z
     ?ConcatCrc32c@absl@@YA?AVcrc32c_t@1@V21@0I@Z
     ?ConstructNext@?$IteratorValueAdapter@V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@V?$move_iterator@PAPAUCordRep@cord_internal@absl@@@23@@inlined_vector_internal@absl@@QAEXAAV?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@PAPAUCordRep@cord_internal@3@@Z
@@ -2248,7 +2221,7 @@
     ?ConstructNext@?$IteratorValueAdapter@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@V?$move_iterator@PAUPayload@status_internal@absl@@@23@@inlined_vector_internal@absl@@QAEXAAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@PAUPayload@status_internal@3@@Z
     ?Consume@cord_internal@absl@@YAXPAUCordRep@12@V?$FunctionRef@$$A6AXPAUCordRep@cord_internal@absl@@II@Z@2@@Z
     ?ConsumeBeginTo@CordRepBtree@cord_internal@absl@@CAPAV123@PAV123@II@Z
-    ?ConsumePrefix@absl@@YA_NPAVstring_view@1@V21@@Z
+    ?ConsumePrefix@absl@@YA_NPAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
     ?ConsumeUnboundConversion@str_format_internal@absl@@YAPBDPBD0PAUUnboundConversion@12@PAH@Z
     ?ConsumeUnboundConversionNoInline@str_format_internal@absl@@YAPBDPBD0PAUUnboundConversion@12@PAH@Z
     ?Contains@str_format_internal@absl@@YA_NW4FormatConversionCharSet@2@D@Z
@@ -2260,7 +2233,7 @@
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NMABVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NNABVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?ConvertFloatImpl@str_format_internal@absl@@YA_NOABVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
-    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAE_NABUUnboundConversion@34@Vstring_view@4@@Z
+    ?ConvertOne@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAE_NABUUnboundConversion@34@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ConvertSpecialToEmptyAndFullToDeleted@GroupSse2Impl@container_internal@absl@@QBEXPAW4ctrl_t@23@@Z
     ?Copy@CordRepBtree@cord_internal@absl@@ABEPAV123@XZ
     ?Copy@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@III@Z
@@ -2272,14 +2245,14 @@
     ?CopyTo@InlineRep@Cord@absl@@QBEXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyToArraySlowPath@Cord@absl@@ABEXPAD@Z
     ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AAEXDIW4StringType@123@@Z
-    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AAEXVstring_view@3@W4StringType@123@@Z
+    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4StringType@123@@Z
     ?CopyToEndFrom@CordRepBtree@cord_internal@absl@@ABEPAV123@II@Z
     ?Crash@Helper@internal_statusor@absl@@SAXABVStatus@3@@Z
     ?Crc32CAndCopy@crc_internal@absl@@YA?AVcrc32c_t@2@PIAXPIBXIV32@_N@Z
     ?Crc32c@CRC@crc_internal@absl@@SAPAV123@XZ
     ?CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PIAXPIBXIV43@_N@Z
     ?Create@CordRepBtree@cord_internal@absl@@SAPAV123@PAUCordRep@23@@Z
-    ?Create@CordRepFlat@cord_internal@absl@@SAPAU123@Vstring_view@3@I@Z
+    ?Create@CordRepFlat@cord_internal@absl@@SAPAU123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Create@CordRepRing@cord_internal@absl@@SAPAV123@PAUCordRep@23@I@Z
     ?CreateFromLeaf@CordRepRing@cord_internal@absl@@CAPAV123@PAUCordRep@23@III@Z
     ?CreateSlow@CordRepBtree@cord_internal@absl@@CAPAV123@PAUCordRep@23@@Z
@@ -2289,12 +2262,12 @@
     ?CreateWithDefaultLimit@CordBuffer@absl@@SA?AV12@I@Z
     ?Current@CordRepBtreeNavigator@cord_internal@absl@@QBEPAUCordRep@23@XZ
     ?CurrentThreadIdentityIfPresent@base_internal@absl@@YAPAUThreadIdentity@12@XZ
-    ?Data@CordRepBtree@cord_internal@absl@@QBE?AVstring_view@3@I@Z
+    ?Data@CordRepBtree@cord_internal@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Data@CordRepFlat@cord_internal@absl@@QAEPADXZ
     ?Data@CordRepFlat@cord_internal@absl@@QBEPBDXZ
     ?DataLength@Header@TimeZoneInfo@cctz@time_internal@absl@@QBEII@Z
-    ?DataLossError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?DeadlineExceededError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?DataLossError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?DeadlineExceededError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@H@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAAV?$allocator@H@Cr@std@@PAHI@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAAV?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@PAPAUCordRep@cord_internal@3@I@Z
     ?Deallocate@?$MallocAdapter@V?$allocator@PAVLogSink@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SAXAAV?$allocator@PAVLogSink@absl@@@Cr@std@@PAPAVLogSink@3@I@Z
@@ -2343,7 +2316,7 @@
     ?Digits10@?$BigUnsigned@$0FE@@strings_internal@absl@@SAHXZ
     ?DisableRescheduling@SchedulingGuard@base_internal@absl@@CA_NXZ
     ?Distance@CordRepRing@cord_internal@absl@@SAIII@Z
-    ?DoLoad@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@ABVCord@2@@Z@base_internal@absl@@ABEP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@ABVCord@3@@ZXZ
+    ?DoLoad@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@base_internal@absl@@ABEP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@3@@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPBDH000@Z@base_internal@absl@@ABEP6AXPBDH000@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPBDPBX@Z@base_internal@absl@@ABEP6AXPBDPBX@ZXZ
     ?DoLoad@?$AtomicHook@P6AXPBDPBX_J@Z@base_internal@absl@@ABEP6AXPBDPBX_J@ZXZ
@@ -2353,7 +2326,7 @@
     ?DoLoad@?$AtomicHook@P6AX_J@Z@base_internal@absl@@ABEP6AX_J@ZXZ
     ?DoLoad@?$AtomicHook@P6A_NPBXPADH@Z@base_internal@absl@@ABEP6A_NPBXPADH@ZXZ
     ?DoLoad@?$AtomicHook@P6A_NW4LogSeverity@absl@@PBDHPAPADPAH@Z@base_internal@absl@@ABEP6A_NW4LogSeverity@3@PBDHPAPADPAH@ZXZ
-    ?DoStore@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@ABVCord@2@@Z@base_internal@absl@@AAE_NP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@ABVCord@3@@Z@Z
+    ?DoStore@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@base_internal@absl@@AAE_NP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@3@@Z@Z
     ?DoStore@?$AtomicHook@P6AXPBDH000@Z@base_internal@absl@@AAE_NP6AXPBDH000@Z@Z
     ?DoStore@?$AtomicHook@P6AXPBDPBX@Z@base_internal@absl@@AAE_NP6AXPBDPBX@Z@Z
     ?DoStore@?$AtomicHook@P6AXPBDPBX_J@Z@base_internal@absl@@AAE_NP6AXPBDPBX_J@Z@Z
@@ -2364,7 +2337,7 @@
     ?DoStore@?$AtomicHook@P6A_NPBXPADH@Z@base_internal@absl@@AAE_NP6A_NPBXPADH@Z@Z
     ?DoStore@?$AtomicHook@P6A_NW4LogSeverity@absl@@PBDHPAPADPAH@Z@base_internal@absl@@AAE_NP6A_NW4LogSeverity@3@PBDHPAPADPAH@Z@Z
     ?DropDeletesWithoutResize@container_internal@absl@@YAXAAVCommonFields@12@ABUPolicyFunctions@12@PAX@Z
-    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@ABVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@ABVCord@3@@Z
+    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@3@@Z
     ?DummyFunction@?$AtomicHook@P6AXPBDH000@Z@base_internal@absl@@CAXPBDH000@Z
     ?DummyFunction@?$AtomicHook@P6AXPBDPBX@Z@base_internal@absl@@CAXPBDPBX@Z
     ?DummyFunction@?$AtomicHook@P6AXPBDPBX_J@Z@base_internal@absl@@CAXPBDPBX_J@Z
@@ -2372,15 +2345,15 @@
     ?DummyFunction@?$AtomicHook@P6AXXZ@base_internal@absl@@CAXXZ
     ?DummyFunction@?$AtomicHook@P6AX_J@Z@base_internal@absl@@CAX_J@Z
     ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@AAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@Vstring_view@3@AAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@Vstring_view@3@_NAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
     ?DumpPCAndFrameSizesAndStackTrace@debugging_internal@absl@@YAXQAXQBQAXQAHHH_NP6AXPBDPAX@Z5@Z
     ?DumpStackTrace@debugging_internal@absl@@YAXHH_NP6AXPBDPAX@Z2@Z
     ?DurationFromTimespec@absl@@YA?AVDuration@1@Utimespec@@@Z
     ?DurationFromTimeval@absl@@YA?AVDuration@1@Utimeval@@@Z
     ?Edge@CordRepBtree@cord_internal@absl@@QBEPAUCordRep@23@I@Z
     ?Edge@CordRepBtree@cord_internal@absl@@QBEPAUCordRep@23@W4EdgeType@123@@Z
-    ?EdgeData@cord_internal@absl@@YA?AVstring_view@2@PBUCordRep@12@@Z
+    ?EdgeData@cord_internal@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PBUCordRep@12@@Z
     ?Edges@CordRepBtree@cord_internal@absl@@QBE?AV?$Span@QAUCordRep@cord_internal@absl@@@3@II@Z
     ?Edges@CordRepBtree@cord_internal@absl@@QBE?AV?$Span@QAUCordRep@cord_internal@absl@@@3@XZ
     ?EmplaceTree@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@ABVInlineData@53@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -2402,22 +2375,22 @@
     ?EncodeBytesTruncate@log_internal@absl@@YA_N_KV?$Span@$$CBD@2@PAV?$Span@D@2@@Z
     ?EncodeMessageLength@log_internal@absl@@YAXV?$Span@D@2@PBV32@@Z
     ?EncodeMessageStart@log_internal@absl@@YA?AV?$Span@D@2@_K0PAV32@@Z
-    ?EncodeStringTruncate@log_internal@absl@@YA_N_KVstring_view@2@PAV?$Span@D@2@@Z
+    ?EncodeStringTruncate@log_internal@absl@@YA_N_KV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$Span@D@2@@Z
     ?EncodeUTF8Char@strings_internal@absl@@YAIPAD_U@Z
     ?EncodeVarint@log_internal@absl@@YA_N_K0PAV?$Span@D@2@@Z
     ?EncodeWaitCycles@SpinLock@base_internal@absl@@KAI_J0@Z
     ?EndsWith@Cord@absl@@QBE_NABV12@@Z
-    ?EndsWith@Cord@absl@@QBE_NVstring_view@2@@Z
-    ?EndsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?EqualsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?EndsWith@Cord@absl@@QBE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?EndsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?EqualsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?EqualsImpl@Cord@absl@@ABE_NABV12@I@Z
-    ?EqualsImpl@Cord@absl@@ABE_NVstring_view@2@I@Z
+    ?EqualsImpl@Cord@absl@@ABE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?EqualsSlow@Status@absl@@CA_NABV12@0@Z
     ?EquivTransitions@TimeZoneInfo@cctz@time_internal@absl@@ABE_NEE@Z
     ?Erase@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAEPAUPayload@status_internal@3@PBU453@0@Z
     ?EraseMetaOnly@container_internal@absl@@YAXAAVCommonFields@12@PAW4ctrl_t@12@I@Z
-    ?ErasePayload@Status@absl@@QAE_NVstring_view@2@@Z
-    ?ErrnoToStatus@absl@@YA?AVStatus@1@HVstring_view@1@@Z
+    ?ErasePayload@Status@absl@@QAE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ErrnoToStatus@absl@@YA?AVStatus@1@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ErrnoToStatusCode@absl@@YA?AW4StatusCode@1@H@Z
     ?Eval@Condition@absl@@QBE_NXZ
     ?Excess@str_format_internal@absl@@YAIII@Z
@@ -2426,17 +2399,17 @@
     ?Extend@CRC32@crc_internal@absl@@UBEXPAIPBXI@Z
     ?ExtendByZeroes@CRC32@crc_internal@absl@@UBEXPAII@Z
     ?ExtendByZeroesImpl@CRC32@crc_internal@absl@@CAXPAIIQBI1@Z
-    ?ExtendCrc32c@absl@@YA?AVcrc32c_t@1@V21@Vstring_view@1@@Z
+    ?ExtendCrc32c@absl@@YA?AVcrc32c_t@1@V21@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendCrc32cByZeroes@absl@@YA?AVcrc32c_t@1@V21@I@Z
     ?ExtendCrc32cInline@crc_internal@absl@@YA_NPAIPBDI@Z
-    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@Vstring_view@2@@Z
+    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendTransitions@TimeZoneInfo@cctz@time_internal@absl@@AAE_NXZ
     ?ExtractAppendBuffer@CordRepBtree@cord_internal@absl@@SA?AUExtractResult@CordRep@23@PAV123@I@Z
     ?ExtractFront@CordRepBtree@cord_internal@absl@@CAPAUCordRep@23@PAV123@@Z
     ?FDivDuration@absl@@YANVDuration@1@0@Z
     ?FailQuietly@LogMessage@log_internal@absl@@KAXXZ
     ?FailWithoutStackTrace@LogMessage@log_internal@absl@@KAXXZ
-    ?FailedPreconditionError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?FailedPreconditionError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?FailureSignalToString@debugging_internal@absl@@YAPBDH@Z
     ?FastHexToBufferZeroPad16@numbers_internal@absl@@YAI_KPAD@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPADHPAD@Z
@@ -2452,12 +2425,12 @@
     ?FillWordTable@CRCImpl@crc_internal@absl@@SAXIIHPAY0BAA@I@Z
     ?FillZeroesTable@CRCImpl@crc_internal@absl@@SAHIPAY0BAA@I@Z
     ?FinalizeEncodingAndFormat@LogMessageData@LogMessage@log_internal@absl@@QAEXXZ
-    ?Find@ByAnyChar@absl@@QBE?AVstring_view@2@V32@I@Z
-    ?Find@ByChar@absl@@QBE?AVstring_view@2@V32@I@Z
-    ?Find@ByLength@absl@@QBE?AVstring_view@2@V32@I@Z
-    ?Find@ByString@absl@@QBE?AVstring_view@2@V32@I@Z
+    ?Find@ByAnyChar@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ?Find@ByChar@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ?Find@ByLength@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ?Find@ByString@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
     ?Find@CordRepRing@cord_internal@absl@@QBE?AUPosition@123@I@Z
-    ?FindFlatStartPiece@InlineRep@Cord@absl@@QBE?AVstring_view@3@XZ
+    ?FindFlatStartPiece@InlineRep@Cord@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?FindPath@GraphCycles@synchronization_internal@absl@@QBEHUGraphId@23@0HQAU423@@Z
     ?FindSlow@CordRepRing@cord_internal@absl@@ABE?AUPosition@123@II@Z
     ?FindTail@CordRepRing@cord_internal@absl@@QBE?AUPosition@123@I@Z
@@ -2473,15 +2446,15 @@
     ?FlagsToString@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4Flags@12@@Z
     ?FlatOverhead@CordTestAccess@strings_internal@absl@@SAIXZ
     ?FlatTagToLength@CordTestAccess@strings_internal@absl@@SAIE@Z
-    ?FlattenSlowPath@Cord@absl@@AAE?AVstring_view@2@XZ
+    ?FlattenSlowPath@Cord@absl@@AAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Floor@absl@@YA?AVDuration@1@V21@0@Z
     ?Flush@FormatSinkImpl@str_format_internal@absl@@QAEXXZ
     ?Flush@LogMessage@log_internal@absl@@IAEXXZ
     ?Flush@LogSink@absl@@UAEXXZ
     ?FlushLogSinks@absl@@YAXXZ
     ?FlushLogSinks@log_internal@absl@@YAXXZ
-    ?ForEachChunkAux@Cord@absl@@CAXPAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXVstring_view@absl@@@Z@2@@Z
-    ?ForEachPayload@Status@absl@@QBEXV?$FunctionRef@$$A6AXVstring_view@absl@@ABVCord@2@@Z@2@@Z
+    ?ForEachChunkAux@Cord@absl@@CAXPAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@2@@Z
+    ?ForEachPayload@Status@absl@@QBEXV?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@absl@@@Z@2@@Z
     ?ForVar1@CheckOpMessageBuilder@log_internal@absl@@QAEAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForVar2@CheckOpMessageBuilder@log_internal@absl@@QAEAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForgetDeadlockInfo@Mutex@absl@@QAEXXZ
@@ -2503,7 +2476,7 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAA@@12@UVoidPtr@12@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAE@@12@PBDVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
-    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@Vstring_view@2@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
+    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@MVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@NVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@OVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
@@ -2518,12 +2491,12 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_JVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_KVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatDuration@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
-    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IVstring_view@2@HW4PrefixFormat@12@3@Z
-    ?FormatLogPrefix@log_internal@absl@@YAIW4LogSeverity@2@VTime@2@IVstring_view@2@HW4PrefixFormat@12@AAV?$Span@D@2@@Z
+    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@HW4PrefixFormat@12@3@Z
+    ?FormatLogPrefix@log_internal@absl@@YAIW4LogSeverity@2@VTime@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HW4PrefixFormat@12@AAV?$Span@D@2@@Z
     ?FormatPack@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
+    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@VTime@1@VTimeZone@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@VTimeZone@1@@Z
-    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@VTime@1@VTimeZone@1@@Z
     ?FormatUntyped@str_format_internal@absl@@YA_NVFormatRawSinkImpl@12@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?FprintF@str_format_internal@absl@@YAHPAU_iobuf@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?Frequency@CycleClock@base_internal@absl@@SANXZ
@@ -2588,9 +2561,9 @@
     ?GetDebugStackTraceHook@debugging_internal@absl@@YAP6AXQBQAXHP6AXPBDPAX@Z2@ZXZ
     ?GetEstimatedFairShareMemoryUsage@cord_internal@absl@@YAIPBUCordRep@12@@Z
     ?GetEstimatedMemoryUsage@cord_internal@absl@@YAIPBUCordRep@12@@Z
-    ?GetFirstChunk@Cord@absl@@CA?AVstring_view@2@ABV12@@Z
-    ?GetFirstChunk@Cord@absl@@CA?AVstring_view@2@V32@@Z
-    ?GetFlatAux@Cord@absl@@CA_NPAUCordRep@cord_internal@2@PAVstring_view@2@@Z
+    ?GetFirstChunk@Cord@absl@@CA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV12@@Z
+    ?GetFirstChunk@Cord@absl@@CA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@@Z
+    ?GetFlatAux@Cord@absl@@CA_NPAUCordRep@cord_internal@2@PAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetHashtablezMaxSamples@container_internal@absl@@YAIXZ
     ?GetHashtablezSampleParameter@container_internal@absl@@YAHXZ
     ?GetId@GraphCycles@synchronization_internal@absl@@QAE?AUGraphId@23@PAX@Z
@@ -2616,7 +2589,7 @@
     ?GetOrCreateCurrentThreadIdentity@synchronization_internal@absl@@YAPAUThreadIdentity@base_internal@2@XZ
     ?GetParentMethod@CordzInfo@cord_internal@absl@@CA?AW4MethodIdentifier@CordzUpdateTracker@23@PBV123@@Z
     ?GetParentStack@CordzInfo@cord_internal@absl@@QBE?AV?$Span@QAX@3@XZ
-    ?GetPayload@Status@absl@@QBE?AV?$optional@VCord@absl@@@2@Vstring_view@2@@Z
+    ?GetPayload@Status@absl@@QBE?AV?$optional@VCord@absl@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetPayloads@Status@absl@@AAEPAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@2@XZ
     ?GetPayloads@Status@absl@@ABEPBV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@2@XZ
     ?GetPrependBuffer@CordRepRing@cord_internal@absl@@QAE?AV?$Span@D@3@I@Z
@@ -2647,7 +2620,7 @@
     ?GetStackTrace@GraphCycles@synchronization_internal@absl@@QAEHUGraphId@23@PAPAPAX@Z
     ?GetStackTrace@absl@@YAHPAPAXHH@Z
     ?GetStackTraceWithContext@absl@@YAHPAPAXHHPBXPAH@Z
-    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@ABVCord@2@@ZXZ
+    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@ZXZ
     ?GetStride@ExponentialBiased@profiling_internal@absl@@QAE_J_J@Z
     ?GetTID@base_internal@absl@@YAIXZ
     ?GetTagForChar@str_format_internal@absl@@YA?AVConvTag@12@D@Z
@@ -2678,7 +2651,7 @@
     ?Guard@?$NullGuard@PBE@log_internal@absl@@SAPBEPBE@Z
     ?Guard@?$NullGuard@PBX@log_internal@absl@@SAABQBXABQBX@Z
     ?Guard@?$NullGuard@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@log_internal@absl@@SAABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV456@@Z
-    ?Guard@?$NullGuard@Vstring_view@absl@@@log_internal@absl@@SAABVstring_view@3@ABV43@@Z
+    ?Guard@?$NullGuard@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@log_internal@absl@@SAABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV456@@Z
     ?Guard@?$NullGuard@_J@log_internal@absl@@SAAB_JAB_J@Z
     ?Guard@?$NullGuard@_K@log_internal@absl@@SAAB_KAB_K@Z
     ?Guard@?$NullGuard@_N@log_internal@absl@@SAAB_NAB_N@Z
@@ -2690,7 +2663,7 @@
     ?HasNode@GraphCycles@synchronization_internal@absl@@QAE_NUGraphId@23@@Z
     ?HasRandenHwAesImplementation@random_internal@absl@@YA_NXZ
     ?Head@CordzInfo@cord_internal@absl@@SAPAV123@ABVCordzSnapshot@23@@Z
-    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?HideMask@base_internal@absl@@YAIXZ
     ?HighestBitSet@?$NonIterableBitMask@I$0BA@$0A@@container_internal@absl@@QBEIXZ
     ?IDivDuration@absl@@YA_JVDuration@1@0PAV21@@Z
@@ -2707,7 +2680,7 @@
     ?InfiniteDuration@absl@@YA?AVDuration@1@XZ
     ?InfiniteFuture@absl@@YA?AVTime@1@XZ
     ?InfinitePast@absl@@YA?AVTime@1@XZ
-    ?Init@CordRepBtreeReader@cord_internal@absl@@QAE?AVstring_view@3@PAVCordRepBtree@23@@Z
+    ?Init@CordRepBtreeReader@cord_internal@absl@@QAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVCordRepBtree@23@@Z
     ?Init@PerThreadSem@synchronization_internal@absl@@CAXPAUThreadIdentity@base_internal@3@@Z
     ?InitDiscreteDistribution@random_internal@absl@@YA?AV?$vector@U?$pair@NI@Cr@std@@V?$allocator@U?$pair@NI@Cr@std@@@23@@Cr@std@@PAV?$vector@NV?$allocator@N@Cr@std@@@45@@Z
     ?InitFirst@CordRepBtreeNavigator@cord_internal@absl@@QAEPAUCordRep@23@PAVCordRepBtree@23@@Z
@@ -2717,7 +2690,7 @@
     ?InitTree@ChunkIterator@Cord@absl@@AAEXPAUCordRep@cord_internal@3@@Z
     ?InitWhat@BadStatusOrAccess@absl@@ABEXXZ
     ?Initialize@ExponentialBiased@profiling_internal@absl@@AAEXXZ
-    ?InitializeCordRepExternal@cord_internal@absl@@YAXVstring_view@2@PAUCordRepExternal@12@@Z
+    ?InitializeCordRepExternal@cord_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAUCordRepExternal@12@@Z
     ?InitializeSymbolizer@absl@@YAXPBD@Z
     ?InlinedRepToCode@Status@absl@@CA?AW4StatusCode@2@I@Z
     ?InsertEdge@GraphCycles@synchronization_internal@absl@@QAE_NUGraphId@23@0@Z
@@ -2729,9 +2702,9 @@
     ?InternalAttemptToUseMutexInFatalSignalHandler@Mutex@absl@@SAXXZ
     ?InternalCondVarPoke@StdcppWaiter@synchronization_internal@absl@@AAEXXZ
     ?InternalCondVarPoke@Win32Waiter@synchronization_internal@absl@@AAEXXZ
-    ?InternalError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InternalError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?InternalStream@LogMessage@log_internal@absl@@QAEAAV123@XZ
-    ?InvalidArgumentError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InvalidArgumentError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?InvalidGraphId@synchronization_internal@absl@@YA?AUGraphId@12@XZ
     ?IsAborted@absl@@YA_NABVStatus@1@@Z
     ?IsAlreadyExists@absl@@YA_NABVStatus@1@@Z
@@ -2749,8 +2722,8 @@
     ?IsFailedPrecondition@absl@@YA_NABVStatus@1@@Z
     ?IsFatal@LogMessage@log_internal@absl@@ABE_NXZ
     ?IsFlat@CordRep@cord_internal@absl@@QBE_NXZ
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NIIPAVstring_view@3@@Z
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NPAVstring_view@3@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NIIPAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NPAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsFull@container_internal@absl@@YA_NW4ctrl_t@12@@Z
     ?IsHashtablezEnabled@container_internal@absl@@YA_NXZ
     ?IsImmortal@RefcountAndFlags@cord_internal@absl@@QBE_NXZ
@@ -2786,7 +2759,7 @@
     ?Load16@big_endian@absl@@YAGPBX@Z
     ?Load32@big_endian@absl@@YAIPBX@Z
     ?Load32@little_endian@absl@@YAIPBX@Z
-    ?Load@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@ABVCord@2@@Z@base_internal@absl@@QBEP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@ABVCord@3@@ZXZ
+    ?Load@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@base_internal@absl@@QBEP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@3@@ZXZ
     ?Load@?$AtomicHook@P6AXXZ@base_internal@absl@@QBEP6AXXZXZ
     ?Load@TimeZoneIf@cctz@time_internal@absl@@SA?AV?$unique_ptr@VTimeZoneIf@cctz@time_internal@absl@@U?$default_delete@VTimeZoneIf@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@67@@Z
     ?Load@TimeZoneInfo@cctz@time_internal@absl@@AAE_NPAVZoneInfoSource@234@@Z
@@ -2850,7 +2823,6 @@
     ?MaybeTrackCordImpl@CordzInfo@cord_internal@absl@@CAXAAVInlineData@23@ABV423@W4MethodIdentifier@CordzUpdateTracker@23@@Z
     ?MemcpyCrc32c@absl@@YA?AVcrc32c_t@1@PAXPBXIV21@@Z
     ?MergeTrees@CordRepBtree@cord_internal@absl@@CAPAV123@PAV123@0@Z
-    ?Min@string_view@absl@@CAIII@Z
     ?MinLogLevel@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?MixIntoSeedMaterial@random_internal@absl@@YAXV?$Span@$$CBI@2@V?$Span@I@2@@Z
     ?MovedFromRep@Status@absl@@CAIXZ
@@ -2884,7 +2856,7 @@
     ?NewInternal@CRCImpl@crc_internal@absl@@SAPAV123@XZ
     ?NewString@CheckOpMessageBuilder@log_internal@absl@@QAEPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Next@CordRepBtreeNavigator@cord_internal@absl@@QAEPAUCordRep@23@XZ
-    ?Next@CordRepBtreeReader@cord_internal@absl@@QAE?AVstring_view@3@XZ
+    ?Next@CordRepBtreeReader@cord_internal@absl@@QAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Next@CordzInfo@cord_internal@absl@@QBEPAV123@ABVCordzSnapshot@23@@Z
     ?NextCapacity@?$Storage@PAUCordRep@cord_internal@absl@@$01V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@SAII@Z
     ?NextCapacity@?$Storage@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@SAII@Z
@@ -2900,13 +2872,13 @@
     ?Normalize@CrcCordState@crc_internal@absl@@QAEXXZ
     ?NormalizeLogSeverity@absl@@YA?AW4LogSeverity@1@W421@@Z
     ?NormalizedPrefixCrcAtNthChunk@CrcCordState@crc_internal@absl@@QBE?AUPrefixCrc@123@I@Z
-    ?NotFoundError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?NotFoundError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Notify@Notification@absl@@QAEXXZ
     ?Now@CycleClock@base_internal@absl@@SA_JXZ
     ?Now@UnscaledCycleClock@base_internal@absl@@CA_JXZ
     ?Now@UnscaledCycleClockWrapperForGetCurrentTime@time_internal@absl@@SA_JXZ
     ?Now@absl@@YA?AVTime@1@XZ
-    ?NullSafeStringView@absl@@YA?AVstring_view@1@PBD@Z
+    ?NullSafeStringView@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PBD@Z
     ?NumCPUs@base_internal@absl@@YAHXZ
     ?NumChunks@CrcCordState@crc_internal@absl@@QBEIXZ
     ?NumClonedBytes@container_internal@absl@@YAIXZ
@@ -2915,29 +2887,29 @@
     ?OccursBefore@ViableSubstitution@strings_internal@absl@@QBE_NABU123@@Z
     ?OneTimeInitThreadIdentity@synchronization_internal@absl@@YAXPAUThreadIdentity@base_internal@2@@Z
     ?OppositeInfinity@time_internal@absl@@YA?AVDuration@2@V32@@Z
-    ?OutOfRangeError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?OutOfRangeError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParseDigits@str_format_internal@absl@@YAHAADAAPBDQBD@Z
-    ?ParseDuration@absl@@YA_NVstring_view@1@PAVDuration@1@@Z
+    ?ParseDuration@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVDuration@1@@Z
     ?ParseFlag@absl@@YA_NABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAVDuration@1@PAV234@@Z
     ?ParseFlag@absl@@YA_NABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAVTime@1@PAV234@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParsePosixSpec@cctz@time_internal@absl@@YA_NABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAUPosixTimeZone@123@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0VTimeZone@1@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0VTimeZone@1@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?PerTableSalt@container_internal@absl@@YAIPBW4ctrl_t@12@@Z
-    ?PermissionDeniedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?Piece@AlphaNum@absl@@QBE?AVstring_view@2@XZ
+    ?PermissionDeniedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Piece@AlphaNum@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?PiecewiseChunkSize@hash_internal@absl@@YAIXZ
     ?PointerToRep@Status@absl@@CAIPAUStatusRep@status_internal@2@@Z
     ?Poison@CrcCordState@crc_internal@absl@@QAEXXZ
@@ -2951,14 +2923,14 @@
     ?PrepareToDie@LogMessage@log_internal@absl@@AAEXXZ
     ?PrepareToModify@Status@absl@@AAEXXZ
     ?Prepend@Cord@absl@@QAEXABV12@@Z
-    ?Prepend@Cord@absl@@QAEXVstring_view@2@@Z
+    ?Prepend@Cord@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Prepend@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@PAUCordRep@23@@Z
-    ?Prepend@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
+    ?Prepend@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Prepend@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@PAUCordRep@23@@Z
-    ?Prepend@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
-    ?PrependArray@Cord@absl@@AAEXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?Prepend@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
+    ?PrependArray@Cord@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependLeaf@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@II@Z
-    ?PrependPrecise@Cord@absl@@AAEXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?PrependPrecise@Cord@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependSlow@CordRepBtree@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
     ?PrependSlow@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
     ?PrependTree@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -2972,7 +2944,7 @@
     ?Ptr@GraphCycles@synchronization_internal@absl@@QAEPAXUGraphId@23@@Z
     ?PushDead@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AAEXPAUHashtablezInfo@container_internal@3@@Z
     ?PushNew@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AAEXPAUHashtablezInfo@container_internal@3@@Z
-    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QAE_NVstring_view@3@HH_N@Z
+    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QAE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HH_N@Z
     ?PutTwoDigits@numbers_internal@absl@@YAXIPAD@Z
     ?RawAbsNanos@KernelTimeout@synchronization_internal@absl@@ABE_JXZ
     ?RawEnableLogPrefix@log_internal@absl@@YAX_N@Z
@@ -2984,7 +2956,7 @@
     ?Read4To8@MixingHashState@hash_internal@absl@@CA_KPBEI@Z
     ?Read9To16@MixingHashState@hash_internal@absl@@CA?AU?$pair@_K_K@Cr@std@@PBEI@Z
     ?Read@CordRepBtreeNavigator@cord_internal@absl@@QAE?AUReadResult@123@II@Z
-    ?Read@CordRepBtreeReader@cord_internal@absl@@QAE?AVstring_view@3@IIAAPAUCordRep@23@@Z
+    ?Read@CordRepBtreeReader@cord_internal@absl@@QAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@IIAAPAUCordRep@23@@Z
     ?ReadDigits@?$BigUnsigned@$03@strings_internal@absl@@AAEHPBD0H@Z
     ?ReadDigits@?$BigUnsigned@$0FE@@strings_internal@absl@@AAEHPBD0H@Z
     ?ReadFloatMantissa@?$BigUnsigned@$03@strings_internal@absl@@QAEHABUParsedFloat@23@H@Z
@@ -3051,7 +3023,7 @@
     ?ResetToBuiltinUTC@TimeZoneInfo@cctz@time_internal@absl@@AAE_NABV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?ResetToEmpty@InlineRep@Cord@absl@@AAEXXZ
     ?Resize@?$ResizeUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@I@Z
-    ?ResourceExhaustedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ResourceExhaustedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Rethrow@variant_internal@absl@@YAXXZ
     ?ReverseConsume@cord_internal@absl@@YAXPAUCordRep@12@V?$FunctionRef@$$A6AXPAUCordRep@cord_internal@absl@@II@Z@2@@Z
     ?RoundUp@cord_internal@absl@@YAIII@Z
@@ -3063,7 +3035,7 @@
     ?SanitizerUnpoisonMemoryRegion@container_internal@absl@@YAXPBXI@Z
     ?Scramble@CRC32@crc_internal@absl@@UBEXPAI@Z
     ?Seek@CordRepBtreeNavigator@cord_internal@absl@@QAE?AUPosition@123@I@Z
-    ?Seek@CordRepBtreeReader@cord_internal@absl@@QAE?AVstring_view@3@I@Z
+    ?Seek@CordRepBtreeReader@cord_internal@absl@@QAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?SendToLog@LogMessage@log_internal@absl@@AAEXXZ
     ?SetAllocation@?$Storage@PAUCordRep@cord_internal@absl@@$01V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAEXU?$Allocation@V?$allocator@PAUCordRep@cord_internal@absl@@@Cr@std@@@23@@Z
     ?SetAllocation@?$Storage@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAEXU?$Allocation@V?$allocator@PAVLogSink@absl@@@Cr@std@@@23@@Z
@@ -3093,16 +3065,16 @@
     ?SetIsAllocated@?$Storage@PAVLogSink@absl@@$0BA@V?$allocator@PAVLogSink@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAEXXZ
     ?SetIsAllocated@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAEXXZ
     ?SetLength@CordBuffer@absl@@QAEXI@Z
-    ?SetLogBacktraceLocation@absl@@YAXVstring_view@1@H@Z
+    ?SetLogBacktraceLocation@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?SetLoggingGlobalsListener@log_internal@absl@@YAXP6AXXZ@Z
     ?SetMaxFramesInLogStackTrace@log_internal@absl@@YAXH@Z
     ?SetMaxSamples@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@QAEXI@Z
     ?SetMinLogLevel@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetMutexDeadlockDetectionMode@absl@@YAXW4OnDeadlockCycle@1@@Z
-    ?SetPayload@Status@absl@@QAEXVstring_view@2@VCord@2@@Z
+    ?SetPayload@Status@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VCord@2@@Z
     ?SetPrecision@FormatConversionSpecImplFriend@str_format_internal@absl@@SAXHPAVFormatConversionSpecImpl@23@@Z
     ?SetStackUnwinder@absl@@YAXP6AHPAPAXPAHHHPBX1@Z@Z
-    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@ABVCord@2@@Z@Z
+    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@Z
     ?SetStderrThreshold@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetSuppressSigabortTrace@log_internal@absl@@YA_N_N@Z
     ?SetThreadBlockedCounter@PerThreadSem@synchronization_internal@absl@@SAXPAU?$atomic@H@Cr@std@@@Z
@@ -3115,7 +3087,7 @@
     ?SetValue@?$Manager@H$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@ABH@Z
     ?SetValue@?$Manager@I$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@ABI@Z
     ?SetValue@?$Manager@PBD$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@ABQBD@Z
-    ?SetValue@?$Manager@Vstring_view@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@ABVstring_view@4@@Z
+    ?SetValue@?$Manager@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?SetValue@?$Manager@_J$01@FormatArgImpl@str_format_internal@absl@@SA?ATData@234@AB_J@Z
     ?SetWidth@FormatConversionSpecImplFriend@str_format_internal@absl@@SAXHPAVFormatConversionSpecImpl@23@@Z
     ?ShiftLeft@?$BigUnsigned@$03@strings_internal@absl@@QAEXH@Z
@@ -3125,16 +3097,16 @@
     ?ShouldLog@LogEveryNState@log_internal@absl@@QAE_NH@Z
     ?ShouldLog@LogEveryPow2State@log_internal@absl@@QAE_NXZ
     ?ShouldLog@LogFirstNState@log_internal@absl@@QAE_NH@Z
-    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NVstring_view@2@H@Z
+    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?ShouldPrependLogPrefix@absl@@YA_NXZ
     ?ShouldSymbolizeLogStackTrace@log_internal@absl@@YA_NXZ
     ?Signal@CondVar@absl@@QAEXXZ
     ?SignalAll@CondVar@absl@@QAEXXZ
     ?SignedAddResult@int128_internal@absl@@YA?AVint128@2@V32@0@Z
     ?SignedSubstructResult@int128_internal@absl@@YA?AVint128@2@V32@00@Z
-    ?SimpleAtob@absl@@YA_NVstring_view@1@PA_N@Z
-    ?SimpleAtod@absl@@YA_NVstring_view@1@PAN@Z
-    ?SimpleAtof@absl@@YA_NVstring_view@1@PAM@Z
+    ?SimpleAtob@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PA_N@Z
+    ?SimpleAtod@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAN@Z
+    ?SimpleAtof@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAM@Z
     ?SixDigitsToBuffer@numbers_internal@absl@@YAINPAD@Z
     ?SizeofCordRepExternal@CordTestAccess@strings_internal@absl@@SAIXZ
     ?SizeofCordRepSubstring@CordTestAccess@strings_internal@absl@@SAIXZ
@@ -3151,12 +3123,12 @@
     ?SpinLockWake@base_internal@absl@@YAXPAU?$atomic@I@Cr@std@@_N@Z
     ?SpinLoop@SpinLock@base_internal@absl@@AAEIXZ
     ?StackTraceWorksForTest@debugging_internal@absl@@YA_NXZ
-    ?StartsWith@absl@@YA_NVstring_view@1@0@Z
-    ?StartsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?StartsWith@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StartsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?StatusCodeToString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4StatusCode@1@@Z
     ?StderrThreshold@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?SteadyClockNow@KernelTimeout@synchronization_internal@absl@@CA_JXZ
-    ?Store@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@ABVCord@2@@Z@base_internal@absl@@QAEXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@ABVCord@3@@Z@Z
+    ?Store@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@base_internal@absl@@QAEXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@3@@Z@Z
     ?Store@?$AtomicHook@P6AXPBDH000@Z@base_internal@absl@@QAEXP6AXPBDH000@Z@Z
     ?Store@?$AtomicHook@P6AXPBDPBX@Z@base_internal@absl@@QAEXP6AXPBDPBX@Z@Z
     ?Store@?$AtomicHook@P6AXPBDPBX_J@Z@base_internal@absl@@QAEXP6AXPBDPBX_J@Z@Z
@@ -3174,21 +3146,20 @@
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@1@00@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@1@0@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@1@@Z
-    ?StrContains@absl@@YA_NVstring_view@1@D@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@D@Z
+    ?StrContains@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ?StrError@base_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@H@Z
-    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
-    ?StripAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StripLeadingAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StripTrailingAsciiWhitespace@absl@@YA?AVstring_view@1@V21@@Z
-    ?StrlenInternal@string_view@absl@@CAIPBD@Z
+    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
+    ?StripAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
+    ?StripLeadingAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
+    ?StripTrailingAsciiWhitespace@absl@@YA?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V234@@Z
     ?SubLength@CordRepRing@cord_internal@absl@@AAEXII@Z
     ?SubRing@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@III@Z
     ?SubTree@CordRepBtree@cord_internal@absl@@QAEPAUCordRep@23@II@Z
     ?Subcord@Cord@absl@@QBE?AV12@II@Z
-    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@PBV62@I@Z
+    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@PBV645@I@Z
     ?Substring@CordRepSubstring@cord_internal@absl@@SAPAUCordRep@23@PAU423@II@Z
     ?SubstructResult@int128_internal@absl@@YA?AVuint128@2@V32@00@Z
     ?SubtractSize@?$Storage@H$0CP@V?$allocator@H@Cr@std@@@inlined_vector_internal@absl@@QAEXI@Z
@@ -3305,13 +3276,13 @@
     ?UnalignedLoad16@base_internal@absl@@YAGPBX@Z
     ?UnalignedLoad32@base_internal@absl@@YAIPBX@Z
     ?UnalignedLoad64@base_internal@absl@@YA_KPBX@Z
-    ?UnauthenticatedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnavailableError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnauthenticatedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnavailableError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UnextendByZeroes@CRC32@crc_internal@absl@@UBEXPAII@Z
     ?UnextendCrc32cByZeroes@crc_internal@absl@@YA?AVcrc32c_t@2@V32@I@Z
-    ?UnimplementedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnimplementedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UniversalEpoch@absl@@YA?AVTime@1@XZ
-    ?UnknownError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnknownError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Unlock@CordzInfo@cord_internal@absl@@QAEXXZ
     ?Unlock@Mutex@absl@@QAEXXZ
     ?Unlock@SpinLock@base_internal@absl@@QAEXXZ
@@ -3330,8 +3301,8 @@
     ?Unscramble@CRC32@crc_internal@absl@@UBEXPAI@Z
     ?Untrack@CordzInfo@cord_internal@absl@@QAEXXZ
     ?UpdateStackTrace@GraphCycles@synchronization_internal@absl@@QAEXUGraphId@23@HP6AHPAPAXH@Z@Z
-    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?Validate@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PBDH@Z
     ?Value@?$Manager@C$01@FormatArgImpl@str_format_internal@absl@@SACTData@234@@Z
     ?Value@?$Manager@D$01@FormatArgImpl@str_format_internal@absl@@SADTData@234@@Z
@@ -3348,8 +3319,8 @@
     ?Value@?$Manager@PBD$01@FormatArgImpl@str_format_internal@absl@@SAPBDTData@234@@Z
     ?Value@?$Manager@UVoidPtr@str_format_internal@absl@@$01@FormatArgImpl@str_format_internal@absl@@SA?AUVoidPtr@34@TData@234@@Z
     ?Value@?$Manager@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SAABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@TData@234@@Z
+    ?Value@?$Manager@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@$0A@@FormatArgImpl@str_format_internal@absl@@SAABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@TData@234@@Z
     ?Value@?$Manager@Vint128@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAABVint128@4@TData@234@@Z
-    ?Value@?$Manager@Vstring_view@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAABVstring_view@4@TData@234@@Z
     ?Value@?$Manager@Vuint128@absl@@$0A@@FormatArgImpl@str_format_internal@absl@@SAABVuint128@4@TData@234@@Z
     ?Value@?$Manager@_J$01@FormatArgImpl@str_format_internal@absl@@SA_JTData@234@@Z
     ?Value@?$Manager@_K$01@FormatArgImpl@str_format_internal@absl@@SA_KTData@234@@Z
@@ -3373,18 +3344,18 @@
     ?WaitWithTimeout@CondVar@absl@@QAE_NPAVMutex@2@VDuration@2@@Z
     ?Wakeup@CondVar@absl@@AAEXPAUPerThreadSynch@base_internal@2@@Z
     ?Wakeup@Mutex@absl@@AAEPAUPerThreadSynch@base_internal@2@PAU342@@Z
-    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?WebSafeBase64Escape@absl@@YAXVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?WebSafeBase64Unescape@absl@@YA_NVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?WebSafeBase64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?WebSafeBase64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?WithMetadataFrom@LogMessage@log_internal@absl@@QAEAAV123@ABVLogEntry@3@@Z
     ?WithPerror@LogMessage@log_internal@absl@@QAEAAV123@XZ
     ?WithThreadID@LogMessage@log_internal@absl@@QAEAAV123@I@Z
     ?WithTimestamp@LogMessage@log_internal@absl@@QAEAAV123@VTime@3@@Z
     ?WithVerbosity@LogMessage@log_internal@absl@@QAEAAV123@H@Z
-    ?Write@BufferRawSink@str_format_internal@absl@@QAEXVstring_view@3@@Z
-    ?Write@FILERawSink@str_format_internal@absl@@QAEXVstring_view@3@@Z
-    ?Write@FormatRawSinkImpl@str_format_internal@absl@@QAEXVstring_view@3@@Z
-    ?WriteToStderr@log_internal@absl@@YAXVstring_view@2@W4LogSeverity@2@@Z
+    ?Write@BufferRawSink@str_format_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FILERawSink@str_format_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FormatRawSinkImpl@str_format_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?WriteToStderr@log_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4LogSeverity@2@@Z
     ?WriterLock@Mutex@absl@@QAEXXZ
     ?WriterUnlock@Mutex@absl@@QAEXXZ
     ?ZeroDuration@absl@@YA?AVDuration@1@XZ
@@ -3859,9 +3830,7 @@
     ?begin@?$__split_buffer@PAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBEPBQAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?begin@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PAU1234@AAU1234@PAPAU1234@H$0A@@23@XZ
     ?begin@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBE?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PBU1234@ABU1234@PBQBU1234@H$0A@@23@XZ
-    ?begin@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QBEPBU?$pair@Vstring_view@absl@@V12@@Cr@2@XZ
     ?begin@?$initializer_list@VFormatArgImpl@str_format_internal@absl@@@std@@QBEPBVFormatArgImpl@str_format_internal@absl@@XZ
-    ?begin@?$initializer_list@Vstring_view@absl@@@std@@QBEPBVstring_view@absl@@XZ
     ?begin@?$initializer_list@W4FormatConversionCharSet@absl@@@std@@QBEPBW4FormatConversionCharSet@absl@@XZ
     ?begin@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QAE?AV?$__hash_map_iterator@V?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@23@XZ
     ?begin@?$vector@PAVCordzHandle@cord_internal@absl@@V?$allocator@PAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__wrap_iter@PAPAVCordzHandle@cord_internal@absl@@@23@XZ
@@ -3873,7 +3842,6 @@
     ?begin@ChunkRange@Cord@absl@@QBE?AVChunkIterator@23@XZ
     ?begin@CordRepBtree@cord_internal@absl@@QBEIXZ
     ?begin@__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBE?AU1234@XZ
-    ?begin@string_view@absl@@QBEPBDXZ
     ?btree@CordRep@cord_internal@absl@@QAEPAVCordRepBtree@23@XZ
     ?btree@CordRep@cord_internal@absl@@QBEPBVCordRepBtree@23@XZ
     ?btree@CordRepBtreeNavigator@cord_internal@absl@@QBEPAVCordRepBtree@23@XZ
@@ -3969,7 +3937,6 @@
     ?data@CordBuffer@absl@@QAEPADXZ
     ?data@InlineRep@Cord@absl@@QBEPBDXZ
     ?data@Rep@CordBuffer@absl@@QAEPADXZ
-    ?data@string_view@absl@@QBEPBDXZ
     ?day@?$civil_time@Uday_tag@detail@cctz@time_internal@absl@@@detail@cctz@time_internal@absl@@QBEHXZ
     ?day@?$civil_time@Usecond_tag@detail@cctz@time_internal@absl@@@detail@cctz@time_internal@absl@@QBEHXZ
     ?day@?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@absl@@QBEHXZ
@@ -4032,7 +3999,6 @@
     ?empty@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QBE_NXZ
     ?empty@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QBE_NXZ
     ?empty@Cord@absl@@QBE_NXZ
-    ?empty@string_view@absl@@QBE_NXZ
     ?end@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QAEPAUPayload@status_internal@2@XZ
     ?end@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QBEPBUPayload@status_internal@2@XZ
     ?end@?$Span@$$CBI@absl@@QBEPBIXZ
@@ -4046,8 +4012,6 @@
     ?end@?$deque@PBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__deque_iterator@PBVImpl@time_zone@cctz@time_internal@absl@@PAPBV12345@AAPBV12345@PAPAPBV12345@H$0A@@23@XZ
     ?end@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PAU1234@AAU1234@PAPAU1234@H$0A@@23@XZ
     ?end@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBE?AV?$__deque_iterator@UPrefixCrc@CrcCordState@crc_internal@absl@@PBU1234@ABU1234@PBQBU1234@H$0A@@23@XZ
-    ?end@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QBEPBU?$pair@Vstring_view@absl@@V12@@Cr@2@XZ
-    ?end@?$initializer_list@Vstring_view@absl@@@std@@QBEPBVstring_view@absl@@XZ
     ?end@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QAE?AV?$__hash_map_iterator@V?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@23@XZ
     ?end@?$vector@PAVCordzHandle@cord_internal@absl@@V?$allocator@PAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__wrap_iter@PAPAVCordzHandle@cord_internal@absl@@@23@XZ
     ?end@?$vector@PAVLogSink@absl@@V?$allocator@PAVLogSink@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__wrap_iter@PAPAVLogSink@absl@@@23@XZ
@@ -4057,7 +4021,6 @@
     ?end@ChunkRange@Cord@absl@@QBE?AVChunkIterator@23@XZ
     ?end@CordRepBtree@cord_internal@absl@@QBEIXZ
     ?end@__deque_range@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBE?AU1234@XZ
-    ?end@string_view@absl@@QBEPBDXZ
     ?engines@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@4@PIAXPIBXIV54@_N@Z@4UArchSpecificEngines@234@B
     ?entries@CordRepRing@cord_internal@absl@@QBEIII@Z
     ?entries@CordRepRing@cord_internal@absl@@QBEIXZ
@@ -4078,19 +4041,7 @@
     ?external@CordRep@cord_internal@absl@@QBEPBUCordRepExternal@23@XZ
     ?fetch_add_end@CordRepBtree@cord_internal@absl@@AAEII@Z
     ?find@?$unordered_map@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QAE?AV?$__hash_map_iterator@V?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@23@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@23@@Z
-    ?find@string_view@absl@@QBEIDI@Z
-    ?find@string_view@absl@@QBEIV12@I@Z
     ?find_first_non_full_outofline@container_internal@absl@@YA?AUFindInfo@12@ABVCommonFields@12@I@Z
-    ?find_first_not_of@string_view@absl@@QBEIDI@Z
-    ?find_first_not_of@string_view@absl@@QBEIV12@I@Z
-    ?find_first_of@string_view@absl@@QBEIDI@Z
-    ?find_first_of@string_view@absl@@QBEIPBDI@Z
-    ?find_first_of@string_view@absl@@QBEIV12@I@Z
-    ?find_last_not_of@string_view@absl@@QBEIDI@Z
-    ?find_last_not_of@string_view@absl@@QBEIV12@I@Z
-    ?find_last_of@string_view@absl@@QBEIDI@Z
-    ?find_last_of@string_view@absl@@QBEIPBDI@Z
-    ?find_last_of@string_view@absl@@QBEIV12@I@Z
     ?first@?$__compressed_pair@IV?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QAEAAIXZ
     ?first@?$__compressed_pair@IV?$allocator@PAU?$__hash_node_base@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@Cr@std@@@Cr@std@@QAEAAIXZ
     ?first@?$__compressed_pair@IV?$allocator@PAU?$__hash_node_base@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@Cr@std@@@Cr@std@@QBEABIXZ
@@ -4169,7 +4120,6 @@
     ?front@?$__split_buffer@PAPBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PAPBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEAAPAPBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?front@?$__split_buffer@PAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QAEAAPAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?front@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUTransition@cctz@time_internal@absl@@XZ
-    ?front@string_view@absl@@QBEABDXZ
     ?gbswap_16@absl@@YAGG@Z
     ?gbswap_32@absl@@YAII@Z
     ?gbswap_64@absl@@YA_K_K@Z
@@ -4187,7 +4137,6 @@
     ?get@?$Storage@VHashtablezInfoHandle@container_internal@absl@@$00$00@internal_compressed_tuple@container_internal@absl@@QGAEAAVHashtablezInfoHandle@34@XZ
     ?get@?$__temp_value@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUTransition@cctz@time_internal@absl@@XZ
     ?get@?$__temp_value@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUTransitionType@cctz@time_internal@absl@@XZ
-    ?get@?$__tuple_leaf@$0A@ABVstring_view@absl@@$0A@@Cr@std@@QBEABVstring_view@absl@@XZ
     ?get@?$unique_ptr@PAPBVImpl@time_zone@cctz@time_internal@absl@@V?$__allocator_destructor@V?$allocator@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@@Cr@std@@QBEPAPBVImpl@time_zone@cctz@time_internal@absl@@XZ
     ?get@?$unique_ptr@PAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$__allocator_destructor@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@@Cr@std@@QBEPAUPrefixCrc@CrcCordState@crc_internal@absl@@XZ
     ?get@?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@23@@Cr@std@@QBEPAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@23@XZ
@@ -4245,7 +4194,6 @@
     ?key_eq@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QAEAAV?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@XZ
     ?length@?$Span@D@absl@@QBEIXZ
     ?length@CordRepBtreeReader@cord_internal@absl@@QBEIXZ
-    ?length@string_view@absl@@QBEIXZ
     ?load@?$__atomic_base@P6AXABUHashtablezInfo@container_internal@absl@@@Z$0A@@Cr@std@@QBEP6AXABUHashtablezInfo@container_internal@absl@@@ZW4memory_order@23@@Z
     ?load@?$__atomic_base@PAUHashtablezInfo@container_internal@absl@@$0A@@Cr@std@@QBEPAUHashtablezInfo@container_internal@absl@@W4memory_order@23@@Z
     ?load@?$__atomic_base@PAVCordzHandle@cord_internal@absl@@$0A@@Cr@std@@QBEPAVCordzHandle@cord_internal@absl@@W4memory_order@23@@Z
@@ -4284,7 +4232,7 @@
     ?mempbrk@strings_internal@absl@@YAPADPBDI0@Z
     ?memrchr@strings_internal@absl@@YAPADPBDHI@Z
     ?memspn@strings_internal@absl@@YAIPBDI0@Z
-    ?message@Status@absl@@QBE?AVstring_view@2@XZ
+    ?message@Status@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?min@?$RandenPool@E@random_internal@absl@@SAEXZ
     ?min@?$RandenPool@G@random_internal@absl@@SAGXZ
     ?min@?$RandenPool@I@random_internal@absl@@SAIXZ
@@ -4359,7 +4307,6 @@
     ?push_front@?$__split_buffer@PAUPrefixCrc@CrcCordState@crc_internal@absl@@AAV?$allocator@PAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QAEXABQAUPrefixCrc@CrcCordState@crc_internal@absl@@@Z
     ?push_front@?$__split_buffer@PAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QAEX$$QAPAUPrefixCrc@CrcCordState@crc_internal@absl@@@Z
     ?raw_code@Status@absl@@QBEHXZ
-    ?rbegin@string_view@absl@@QBE?AV?$reverse_iterator@PBD@Cr@std@@XZ
     ?reduce_size@InlineRep@Cord@absl@@QAEXI@Z
     ?reference@?$optional@I@absl@@AAEAAIXZ
     ?reference@?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@AAEAAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
@@ -4374,11 +4321,8 @@
     ?remove_prefix@?$Span@$$CBD@absl@@QAEXI@Z
     ?remove_prefix@?$Span@D@absl@@QAEXI@Z
     ?remove_prefix@InlineRep@Cord@absl@@QAEXI@Z
-    ?remove_prefix@string_view@absl@@QAEXI@Z
     ?remove_suffix@?$Span@$$CBD@absl@@QAEXI@Z
     ?remove_suffix@?$Span@D@absl@@QAEXI@Z
-    ?remove_suffix@string_view@absl@@QAEXI@Z
-    ?rend@string_view@absl@@QBE?AV?$reverse_iterator@PBD@Cr@std@@XZ
     ?rep@CrcCordState@crc_internal@absl@@QBEABURep@123@XZ
     ?rep@Rep@CordBuffer@absl@@QBEPAUCordRepFlat@cord_internal@3@XZ
     ?reserve@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXI@Z
@@ -4399,16 +4343,14 @@
     ?resize@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXI@Z
     ?retreat@CordRepRing@cord_internal@absl@@QBEII@Z
     ?retreat@CordRepRing@cord_internal@absl@@QBEIII@Z
-    ?rfind@string_view@absl@@QBEIDI@Z
-    ?rfind@string_view@absl@@QBEIV12@I@Z
     ?ring@CordRep@cord_internal@absl@@QAEPAVCordRepRing@23@XZ
     ?ring@CordRep@cord_internal@absl@@QBEPBVCordRepRing@23@XZ
-    ?safe_strto128_base@numbers_internal@absl@@YA_NVstring_view@2@PAVint128@2@H@Z
-    ?safe_strto32_base@numbers_internal@absl@@YA_NVstring_view@2@PAHH@Z
-    ?safe_strto64_base@numbers_internal@absl@@YA_NVstring_view@2@PA_JH@Z
-    ?safe_strtou128_base@numbers_internal@absl@@YA_NVstring_view@2@PAVuint128@2@H@Z
-    ?safe_strtou32_base@numbers_internal@absl@@YA_NVstring_view@2@PAIH@Z
-    ?safe_strtou64_base@numbers_internal@absl@@YA_NVstring_view@2@PA_KH@Z
+    ?safe_strto128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVint128@2@H@Z
+    ?safe_strto32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAHH@Z
+    ?safe_strto64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PA_JH@Z
+    ?safe_strtou128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVuint128@2@H@Z
+    ?safe_strtou32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAIH@Z
+    ?safe_strtou64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PA_KH@Z
     ?scale_add@impl@detail@cctz@time_internal@absl@@YA_J_J00@Z
     ?second@?$__compressed_pair@IV?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@Cr@std@@@Cr@std@@QAEAAV?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@XZ
     ?second@?$__compressed_pair@IV?$allocator@PAU?$__hash_node_base@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@Cr@std@@@Cr@std@@QAEAAV?$allocator@PAU?$__hash_node_base@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@Cr@std@@@23@XZ
@@ -4505,7 +4447,6 @@
     ?size@?$__split_buffer@PAUPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@PAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBEIXZ
     ?size@?$deque@PBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QBEIXZ
     ?size@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QBEIXZ
-    ?size@?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@QBEIXZ
     ?size@?$initializer_list@VFormatArgImpl@str_format_internal@absl@@@std@@QBEIXZ
     ?size@?$initializer_list@W4FormatConversionCharSet@absl@@@std@@QBEIXZ
     ?size@?$vector@PAVCordzHandle@cord_internal@absl@@V?$allocator@PAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@QBEIXZ
@@ -4520,10 +4461,9 @@
     ?size@Cord@absl@@QBEIXZ
     ?size@CordRepBtree@cord_internal@absl@@QBEIXZ
     ?size@InlineRep@Cord@absl@@QBEIXZ
-    ?size@string_view@absl@@QBEIXZ
-    ?source_basename@LogEntry@absl@@QBE?AVstring_view@2@XZ
+    ?source_basename@LogEntry@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?source_line@LogEntry@absl@@QBEHXZ
-    ?stacktrace@LogEntry@absl@@QBE?AVstring_view@2@XZ
+    ?stacktrace@LogEntry@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?status@BadStatusOrAccess@absl@@QBEABVStatus@2@XZ
     ?step@detail@cctz@time_internal@absl@@YA?AUfields@1234@Uday_tag@1234@U51234@_J@Z
     ?step@detail@cctz@time_internal@absl@@YA?AUfields@1234@Usecond_tag@1234@U51234@_J@Z
@@ -4531,19 +4471,18 @@
     ?store@?$__atomic_base@PAVCordzInfo@cord_internal@absl@@$0A@@Cr@std@@QAEXPAVCordzInfo@cord_internal@absl@@W4memory_order@23@@Z
     ?store@?$__atomic_base@W4OnDeadlockCycle@absl@@$0A@@Cr@std@@QAEXW4OnDeadlockCycle@absl@@W4memory_order@23@@Z
     ?store@?$__atomic_base@W4State@PerThreadSynch@base_internal@absl@@$0A@@Cr@std@@QAEXW4State@PerThreadSynch@base_internal@absl@@W4memory_order@23@@Z
-    ?str@UntypedFormatSpecImpl@str_format_internal@absl@@QBE?AVstring_view@3@XZ
+    ?str@UntypedFormatSpecImpl@str_format_internal@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?stream@OstreamView@LogMessage@log_internal@absl@@QAEAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
-    ?string_value@ProtoField@log_internal@absl@@QBE?AVstring_view@3@XZ
+    ?string_value@ProtoField@log_internal@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?sub_fetch_begin@CordRepBtree@cord_internal@absl@@AAEII@Z
     ?subspan@?$Span@$$CBD@absl@@QBE?AV12@II@Z
     ?subspan@?$Span@D@absl@@QBE?AV12@II@Z
-    ?substr@string_view@absl@@QBE?AV12@II@Z
     ?substring@CordRep@cord_internal@absl@@QAEPAUCordRepSubstring@23@XZ
     ?substring@CordRep@cord_internal@absl@@QBEPBUCordRepSubstring@23@XZ
     ?tag@ProtoField@log_internal@absl@@QBE_KXZ
     ?tag@Rep@InlineData@cord_internal@absl@@QBECXZ
     ?tail@CordRepRing@cord_internal@absl@@QBEIXZ
-    ?text_message_with_prefix_and_newline@LogEntry@absl@@QBE?AVstring_view@2@XZ
+    ?text_message_with_prefix_and_newline@LogEntry@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?text_message_with_prefix_and_newline_c_str@LogEntry@absl@@QBEPBDXZ
     ?thread_identity@PerThreadSynch@base_internal@absl@@QAEPAUThreadIdentity@23@XZ
     ?throw_bad_optional_access@optional_internal@absl@@YAXXZ

third_party/abseil-cpp/symbols_x86_rel.def

diff --git a/third_party/abseil-cpp/symbols_x86_rel.def b/third_party/abseil-cpp/symbols_x86_rel.def
index c40ee94e..d4c7d0aa6 100644
--- a/third_party/abseil-cpp/symbols_x86_rel.def
+++ b/third_party/abseil-cpp/symbols_x86_rel.def
@@ -2,6 +2,7 @@
     ?$TSS0@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PIAXPIBXIV43@_N@Z@4HA
     ??$?0ABVCord@absl@@@?$optional_data_dtor_base@VCord@absl@@$0A@@optional_internal@absl@@IAE@Uin_place_t@2@ABVCord@2@@Z
     ??$?0PAI@?$SaltedSeedSeq@Vseed_seq@Cr@std@@@random_internal@absl@@QAE@PAI0@Z
+    ??$?0V?$allocator@D@Cr@std@@@AlphaNum@absl@@QAE@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?0V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QAE@$$QAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$?6C$0A@@LogMessage@log_internal@absl@@QAEAAV012@ABC@Z
     ??$?6D$0A@@LogMessage@log_internal@absl@@QAEAAV012@ABD@Z
@@ -28,10 +29,10 @@
     ??$AbslStringify@VStringifySink@strings_internal@absl@@@absl@@YAXAAVStringifySink@strings_internal@0@UHex@0@@Z
     ??$AddCordRep@$00@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@PAUCordRep@12@@Z
     ??$AddCordRep@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@PAUCordRep@12@@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AAE?AVstring_view@2@V32@I@Z
-    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@Vstring_view@2@I@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AAE?AVstring_view@2@V32@I@Z
-    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@Vstring_view@2@I@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@AAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ??$AddData@$00@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@AAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ??$AddData@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$AddRing@$00@CordRepRing@cord_internal@absl@@CAPAV012@PAV012@0II@Z
     ??$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPAV012@PAV012@0II@Z
     ??$Append@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QAEX$$QAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -72,8 +73,8 @@
     ??$Dispatch@PBD@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@UVoidPtr@str_format_internal@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
+    ??$Dispatch@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@Vint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
-    ??$Dispatch@Vstring_view@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@Vuint128@absl@@@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@_J@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
     ??$Dispatch@_K@FormatArgImpl@str_format_internal@absl@@CA_NTData@012@VFormatConversionSpecImpl@12@PAX@Z
@@ -86,23 +87,23 @@
     ??$EmplaceBackSlow@UPayload@status_internal@absl@@@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@AAEAAUPayload@status_internal@2@$$QAU342@@Z
     ??$Fill@$00@CordRepRing@cord_internal@absl@@AAEXPBV012@II@Z
     ??$Fill@$0A@@CordRepRing@cord_internal@absl@@AAEXPBV012@II@Z
-    ??$FindSubstitutions@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@Vstring_view@1@ABV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
-    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
-    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
-    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXVstring_view@2@@Z
+    ??$FindSubstitutions@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@strings_internal@absl@@YA?AV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@ABV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ??$Flush@V?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VBufferRawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ??$Flush@VFILERawSink@str_format_internal@absl@@@FormatRawSinkImpl@str_format_internal@absl@@CAXPAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPAV234@PAV234@0II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_1>@?0???$AddRing@$00@012@CAPAV012@PAV012@0II@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPAV234@PAV234@0II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_1>@?0???$AddRing@$0A@@012@CAPAV012@PAV012@0II@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$00@CordRepRing@cord_internal@absl@@AAEXPBV234@II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_1>@?0???$Fill@$00@012@AAEXPBV012@II@Z@@Z
     ??$ForEach@V<lambda_1>@?0???$Fill@$0A@@CordRepRing@cord_internal@absl@@AAEXPBV234@II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_1>@?0???$Fill@$0A@@012@AAEXPBV012@II@Z@@Z
     ??$ForEach@V<lambda_2>@?0???$AddRing@$00@CordRepRing@cord_internal@absl@@CAPAV234@PAV234@0II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_2>@?0???$AddRing@$00@012@CAPAV012@PAV012@0II@Z@@Z
     ??$ForEach@V<lambda_2>@?0???$AddRing@$0A@@CordRepRing@cord_internal@absl@@CAPAV234@PAV234@0II@Z@@CordRepRing@cord_internal@absl@@QBEXII$$QAV<lambda_2>@?0???$AddRing@$0A@@012@CAPAV012@PAV012@0II@Z@@Z
+    ??$GenericCompare@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YAHABVCord@0@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$GenericCompare@HVCord@absl@@@absl@@YAHABVCord@0@0I@Z
-    ??$GenericCompare@HVstring_view@absl@@@absl@@YAHABVCord@0@ABVstring_view@0@I@Z
+    ??$GenericCompare@_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@absl@@YA_NABVCord@0@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$GenericCompare@_NVCord@absl@@@absl@@YA_NABVCord@0@0I@Z
-    ??$GenericCompare@_NVstring_view@absl@@@absl@@YA_NABVCord@0@ABVstring_view@0@I@Z
     ??$MakeCheckOpString@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV123@@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV234@0PBD@Z
-    ??$MakeCheckOpString@ABVstring_view@absl@@ABV12@@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVstring_view@1@0PBD@Z
+    ??$MakeCheckOpString@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV123@@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@0PBD@Z
     ??$MakeCheckOpString@DD@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@DDPBD@Z
     ??$MakeCheckOpString@EE@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@EEPBD@Z
     ??$MakeCheckOpString@MM@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@MMPBD@Z
@@ -118,11 +119,11 @@
     ??$Merge@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@PAV012@0@Z
     ??$NewImpl@$0BAAA@$$V@CordRepFlat@cord_internal@absl@@SAPAU012@I@Z
     ??$NewImpl@$0EAAAA@$$V@CordRepFlat@cord_internal@absl@@SAPAU012@I@Z
-    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPAV012@Vstring_view@2@I@Z
-    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@Vstring_view@2@I@Z
+    ??$NewLeaf@$00@CordRepBtree@cord_internal@absl@@CAPAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
+    ??$NewLeaf@$0A@@CordRepBtree@cord_internal@absl@@CAPAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ??$ParseFloat@$09@strings_internal@absl@@YA?AUParsedFloat@01@PBD0W4chars_format@1@@Z
     ??$ParseFloat@$0BA@@strings_internal@absl@@YA?AUParsedFloat@01@PBD0W4chars_format@1@@Z
-    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NVstring_view@1@UParsedFormatConsumer@ParsedFormatBase@01@@Z
+    ??$ParseFormatString@UParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@@str_format_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@UParsedFormatConsumer@ParsedFormatBase@01@@Z
     ??$PopDead@_JI@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AAEPAUHashtablezInfo@container_internal@2@_JI@Z
     ??$Prepend@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@Cord@absl@@QAEX$$QAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??$Register@AB_JAAI@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@QAEPAUHashtablezInfo@container_internal@2@AB_JAAI@Z
@@ -130,9 +131,9 @@
     ??$STLStringResizeUninitializedAmortized@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@strings_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@I@Z
     ??$SetEdge@$00@CordRepBtree@cord_internal@absl@@QAE?AUOpResult@012@_NPAUCordRep@12@I@Z
     ??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QAE?AUOpResult@012@_NPAUCordRep@12@I@Z
-    ??$StrFormat@DHHHHH_JIVstring_view@absl@@HPBDV12@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@ABDABH2222AB_JABIABVstring_view@0@2ABQBD5@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@0@ABV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@3@@Z
-    ??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@@absl@@YAHABV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
+    ??$StrFormat@DHHHHH_JIV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HPBDV123@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV?$FormatSpecTemplate@$0BPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0JPPPL@$0IAAAE@$0JPPPL@$0EAAAE@$0IAAAE@@str_format_internal@0@ABDABH2222AB_JABIABV?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@2ABQBD5@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@23@ABV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@3@@Z
+    ??$StrReplaceAll@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@@absl@@YAHABV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@2@@Z
     ??$__allocate_at_least@V?$allocator@PAPBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@YA?AU?$__allocation_result@PAPAPBVImpl@time_zone@cctz@time_internal@absl@@@01@AAV?$allocator@PAPBVImpl@time_zone@cctz@time_internal@absl@@@01@I@Z
     ??$__allocate_at_least@V?$allocator@PAUPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@YA?AU?$__allocation_result@PAPAUPrefixCrc@CrcCordState@crc_internal@absl@@@01@AAV?$allocator@PAUPrefixCrc@CrcCordState@crc_internal@absl@@@01@I@Z
     ??$__allocate_at_least@V?$allocator@PAVCordzHandle@cord_internal@absl@@@Cr@std@@@Cr@std@@YA?AU?$__allocation_result@PAPAVCordzHandle@cord_internal@absl@@@01@AAV?$allocator@PAVCordzHandle@cord_internal@absl@@@01@I@Z
@@ -161,19 +162,19 @@
     ??$construct_at@UPayload@status_internal@absl@@ABU123@PAU123@@Cr@std@@YAPAUPayload@status_internal@absl@@PAU234@ABU234@@Z
     ??$construct_at@UTransition@cctz@time_internal@absl@@$$VPAU1234@@Cr@std@@YAPAUTransition@cctz@time_internal@absl@@PAU2345@@Z
     ??$construct_at@UTransitionType@cctz@time_internal@absl@@$$VPAU1234@@Cr@std@@YAPAUTransitionType@cctz@time_internal@absl@@PAU2345@@Z
-    ??$construct_at@UViableSubstitution@strings_internal@absl@@AAVstring_view@3@ABV43@AAIPAU123@@Cr@std@@YAPAUViableSubstitution@strings_internal@absl@@PAU234@AAVstring_view@4@ABV54@AAI@Z
+    ??$construct_at@UViableSubstitution@strings_internal@absl@@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV456@AAIPAU123@@Cr@std@@YAPAUViableSubstitution@strings_internal@absl@@PAU234@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@01@ABV501@AAI@Z
     ??$emplace@$$V@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__wrap_iter@PAUTransition@cctz@time_internal@absl@@@12@V?$__wrap_iter@PBUTransition@cctz@time_internal@absl@@@12@@Z
     ??$emplace@$$V@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAE?AV?$__wrap_iter@PAUTransitionType@cctz@time_internal@absl@@@12@V?$__wrap_iter@PBUTransitionType@cctz@time_internal@absl@@@12@@Z
     ??$emplace_back@$$V@?$__split_buffer@UTransition@cctz@time_internal@absl@@AAV?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXXZ
     ??$emplace_back@$$V@?$__split_buffer@UTransitionType@cctz@time_internal@absl@@AAV?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXXZ
-    ??$emplace_back@AAVstring_view@absl@@ABV12@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUViableSubstitution@strings_internal@absl@@AAVstring_view@5@ABV65@AAI@Z
+    ??$emplace_back@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABV123@AAI@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUViableSubstitution@strings_internal@absl@@AAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@12@ABV612@AAI@Z
     ??$emplace_back@HVcrc32c_t@absl@@@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@QAEAAUPrefixCrc@CrcCordState@crc_internal@absl@@$$QAH$$QAVcrc32c_t@6@@Z
     ??$find@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@23@@Cr@std@@QAE?AV?$__hash_iterator@PAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@PAX@Cr@std@@@12@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@12@@Z
     ??$find_first_non_full@X@container_internal@absl@@YA?AUFindInfo@01@ABVCommonFields@01@I@Z
-    ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@XZ
     ??0?$BigUnsigned@$03@strings_internal@absl@@QAE@_K@Z
-    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@Vstring_view@2@@Z
+    ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@XZ
     ??0?$BigUnsigned@$0FE@@strings_internal@absl@@QAE@_K@Z
     ??0?$RandenPool@E@random_internal@absl@@QAE@XZ
@@ -192,15 +193,16 @@
     ??0BadStatusOrAccess@absl@@QAE@ABV01@@Z
     ??0BadStatusOrAccess@absl@@QAE@VStatus@1@@Z
     ??0BlockingCounter@absl@@QAE@H@Z
-    ??0ByAnyChar@absl@@QAE@Vstring_view@1@@Z
+    ??0ByAnyChar@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0ByLength@absl@@QAE@H@Z
-    ??0ByString@absl@@QAE@Vstring_view@1@@Z
+    ??0ByString@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0CRC@crc_internal@absl@@IAE@XZ
     ??0CheckOpMessageBuilder@log_internal@absl@@QAE@PBD@Z
+    ??0ChunkIterator@Cord@absl@@AAE@PAUCordRep@cord_internal@2@@Z
     ??0ChunkIterator@Cord@absl@@AAE@PBV12@@Z
     ??0Condition@absl@@QAE@P6A_NPAX@Z0@Z
     ??0Condition@absl@@QAE@PB_N@Z
-    ??0Cord@absl@@AAE@Vstring_view@1@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
+    ??0Cord@absl@@AAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@1@@Z
     ??0Cord@absl@@QAE@ABV01@@Z
     ??0CordzHandle@cord_internal@absl@@IAE@_N@Z
     ??0CordzInfo@cord_internal@absl@@AAE@PAUCordRep@12@PBV012@W4MethodIdentifier@CordzUpdateTracker@12@@Z
@@ -215,18 +217,17 @@
     ??0LogMessage@log_internal@absl@@QAE@PBDHW4LogSeverity@2@@Z
     ??0LogMessageData@LogMessage@log_internal@absl@@QAE@PBDHW4LogSeverity@3@VTime@3@@Z
     ??0LogMessageFatal@log_internal@absl@@QAE@PBDH@Z
-    ??0LogMessageFatal@log_internal@absl@@QAE@PBDHVstring_view@2@@Z
+    ??0LogMessageFatal@log_internal@absl@@QAE@PBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0LogMessageQuietlyFatal@log_internal@absl@@QAE@PBDH@Z
-    ??0LogMessageQuietlyFatal@log_internal@absl@@QAE@PBDHVstring_view@2@@Z
+    ??0LogMessageQuietlyFatal@log_internal@absl@@QAE@PBDHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0OstreamView@LogMessage@log_internal@absl@@QAE@AAULogMessageData@123@@Z
-    ??0ParsedFormatBase@str_format_internal@absl@@QAE@Vstring_view@2@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@std@@@Z
+    ??0ParsedFormatBase@str_format_internal@absl@@QAE@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NV?$initializer_list@W4FormatConversionCharSet@absl@@@5@@Z
     ??0Randen@random_internal@absl@@QAE@XZ
     ??0Rep@GraphCycles@synchronization_internal@absl@@QAE@XZ
     ??0ScopedMinLogLevel@log_internal@absl@@QAE@W4LogSeverityAtLeast@2@@Z
     ??0ScopedStderrThreshold@absl@@QAE@W4LogSeverityAtLeast@1@@Z
     ??0SpinLock@base_internal@absl@@QAE@W4SchedulingMode@12@@Z
-    ??0Status@absl@@QAE@W4StatusCode@1@Vstring_view@1@@Z
-    ??0StatusRep@status_internal@absl@@QAE@W4StatusCode@2@Vstring_view@2@V?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@@Z
+    ??0Status@absl@@QAE@W4StatusCode@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??0StdcppWaiter@synchronization_internal@absl@@QAE@XZ
     ??0Streamable@str_format_internal@absl@@QAE@ABVUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ??0TimeZoneLibC@cctz@time_internal@absl@@QAE@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
@@ -234,7 +235,6 @@
     ??0int128@absl@@QAE@M@Z
     ??0int128@absl@@QAE@N@Z
     ??0int128@absl@@QAE@O@Z
-    ??0string_view@absl@@QAE@PBD@Z
     ??0uint128@absl@@QAE@M@Z
     ??0uint128@absl@@QAE@N@Z
     ??0uint128@absl@@QAE@O@Z
@@ -266,17 +266,16 @@
     ??4?$optional_data@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@$0A@@optional_internal@absl@@IAEAAV012@$$QAV012@@Z
     ??4BadStatusOrAccess@absl@@QAEAAV01@$$QAV01@@Z
     ??4BadStatusOrAccess@absl@@QAEAAV01@ABV01@@Z
-    ??4Cord@absl@@QAEAAV01@Vstring_view@1@@Z
+    ??4Cord@absl@@QAEAAV01@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??4CrcCordState@crc_internal@absl@@QAEAAV012@$$QAV012@@Z
     ??4CrcCordState@crc_internal@absl@@QAEAAV012@ABV012@@Z
     ??6LogMessage@log_internal@absl@@QAEAAV012@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ??6LogMessage@log_internal@absl@@QAEAAV012@P6AAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV345@@Z@Z
     ??6LogMessage@log_internal@absl@@QAEAAV012@P6AAAVios_base@Cr@std@@AAV345@@Z@Z
-    ??6LogMessage@log_internal@absl@@QAEAAV012@Vstring_view@2@@Z
+    ??6LogMessage@log_internal@absl@@QAEAAV012@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@ABVCord@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@ABVStatus@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@Vint128@0@@Z
-    ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@Vstring_view@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@Vuint128@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@W4LogSeverity@0@@Z
     ??6absl@@YAAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV123@W4LogSeverityAtLeast@0@@Z
@@ -301,6 +300,7 @@
     ??ACord@absl@@QBEDI@Z
     ??BCord@absl@@QBE?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ??Bint128@absl@@QBENXZ
+    ??EChunkIterator@Cord@absl@@QAEAAV012@XZ
     ??Gdetail@cctz@time_internal@absl@@YA?AV?$civil_time@Uday_tag@detail@cctz@time_internal@absl@@@0123@V40123@_J@Z
     ??Gdetail@cctz@time_internal@absl@@YA?AV?$civil_time@Usecond_tag@detail@cctz@time_internal@absl@@@0123@V40123@_J@Z
     ??Kabsl@@YA?AVint128@0@V10@0@Z
@@ -320,15 +320,15 @@
     ??_0Duration@absl@@QAEAAV01@N@Z
     ??_0Duration@absl@@QAEAAV01@_J@Z
     ??_1Duration@absl@@QAEAAV01@V01@@Z
-    ?AbortedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PAVDuration@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@absl@@YA_NVstring_view@1@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?AbslParseFlag@time_internal@absl@@YA_NVstring_view@2@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?AbortedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVDuration@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
+    ?AbslParseFlag@time_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@12@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
     ?AbslUnparseFlag@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?AbslUnparseFlag@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@12@@Z
@@ -351,29 +351,29 @@
     ?AllocWithArena@LowLevelAlloc@base_internal@absl@@SAPAXIPAUArena@123@@Z
     ?Allocate@?$MallocAdapter@V?$allocator@PAVLogSink@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SA?AU?$Allocation@V?$allocator@PAVLogSink@absl@@@Cr@std@@@23@AAV?$allocator@PAVLogSink@absl@@@Cr@std@@I@Z
     ?Allocate@?$MallocAdapter@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@$0A@@inlined_vector_internal@absl@@SA?AU?$Allocation@V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@23@AAV?$allocator@UPayload@status_internal@absl@@@Cr@std@@I@Z
-    ?AlreadyExistsError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?AlreadyExistsError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@?$AppendUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@I@Z
     ?Append@Cord@absl@@QAEX$$QAV12@@Z
     ?Append@Cord@absl@@QAEXABV12@@Z
-    ?Append@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
+    ?Append@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Append@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@PAUCordRep@23@@Z
-    ?Append@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
+    ?Append@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Append@FormatSinkImpl@str_format_internal@absl@@QAEXID@Z
-    ?Append@FormatSinkImpl@str_format_internal@absl@@QAEXVstring_view@3@@Z
-    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAE_NVstring_view@4@@Z
+    ?Append@FormatSinkImpl@str_format_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Append@ParsedFormatConsumer@ParsedFormatBase@str_format_internal@absl@@QAE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Append@StringifySink@strings_internal@absl@@QAEXID@Z
-    ?Append@StringifySink@strings_internal@absl@@QAEXVstring_view@3@@Z
-    ?AppendArray@InlineRep@Cord@absl@@QAEXVstring_view@3@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
+    ?Append@StringifySink@strings_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?AppendArray@InlineRep@Cord@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@3@@Z
     ?AppendLeaf@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@II@Z
     ?AppendPack@str_format_internal@absl@@YAAAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAV345@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
-    ?AppendPieces@strings_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
-    ?AppendPrecise@Cord@absl@@AAEXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?AppendPieces@strings_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
+    ?AppendPrecise@Cord@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?AppendSlow@CordRepBtree@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
     ?AppendSlow@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
     ?AppendTree@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToInlined@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
     ?AppendTreeToTree@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
-    ?ApplySubstitutions@strings_internal@absl@@YAHVstring_view@2@PAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@56@@Z
+    ?ApplySubstitutions@strings_internal@absl@@YAHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@Cr@std@@@45@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@45@@Z
     ?AsciiStrToLower@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AsciiStrToUpper@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?AssertHeld@Mutex@absl@@QBEXXZ
@@ -385,31 +385,31 @@
     ?AsyncSignalSafeWriteToStderr@raw_log_internal@absl@@YAXPBDI@Z
     ?At@TimeZone@absl@@QBE?AUCivilInfo@12@VTime@2@@Z
     ?At@TimeZone@absl@@QBE?AUTimeInfo@12@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@@Z
-    ?AtLocation@LogMessage@log_internal@absl@@QAEAAV123@Vstring_view@3@H@Z
+    ?AtLocation@LogMessage@log_internal@absl@@QAEAAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?Await@Mutex@absl@@QAEXABVCondition@2@@Z
     ?AwaitCommon@Mutex@absl@@AAE_NABVCondition@2@VKernelTimeout@synchronization_internal@2@@Z
     ?AwaitWithDeadline@Mutex@absl@@QAE_NABVCondition@2@VTime@2@@Z
     ?AwaitWithTimeout@Mutex@absl@@QAE_NABVCondition@2@VDuration@2@@Z
-    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Base64Escape@absl@@YAXVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Base64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?Base64EscapeInternal@strings_internal@absl@@YAIPBEIPADIPBD_N@Z
-    ?Base64Unescape@absl@@YA_NVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?Base64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?BindWithPack@str_format_internal@absl@@YA_NPBUUnboundConversion@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@PAVBoundConversion@12@@Z
     ?Block@Barrier@absl@@QAE_NXZ
     ?Block@Mutex@absl@@AAEXPAUPerThreadSynch@base_internal@2@@Z
     ?BreakTime@TimeZoneInfo@cctz@time_internal@absl@@UBE?AUabsolute_lookup@time_zone@234@ABV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?BreakTime@TimeZoneLibC@cctz@time_internal@absl@@UBE?AUabsolute_lookup@time_zone@234@ABV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@Cr@std@@@Z
     ?Build@Header@TimeZoneInfo@cctz@time_internal@absl@@QAE_NABUtzhead@@@Z
-    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?BytesToHexString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?CHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?CPUSupportsRandenHwAes@random_internal@absl@@YA_NXZ
-    ?CUnescape@absl@@YA_NVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@1@Z
+    ?CUnescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@1@Z
     ?CalculateBase64EscapedLenInternal@strings_internal@absl@@YAII_N@Z
     ?CallVoidPtrFunction@Condition@absl@@CA_NPBV12@@Z
-    ?CancelledError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEVstring_view@2@0E@Z
-    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@Vstring_view@absl@@@5@@Z
+    ?CancelledError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?CappedDamerauLevenshteinDistance@strings_internal@absl@@YAEV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0E@Z
+    ?CatPieces@strings_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$initializer_list@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@5@@Z
     ?Ceil@absl@@YA?AVDuration@1@V21@0@Z
     ?CheckInvariants@GraphCycles@synchronization_internal@absl@@QBE_NXZ
     ?CheckstrcasecmpfalseImpl@log_internal@absl@@YAPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PBD00@Z
@@ -429,14 +429,14 @@
     ?CombineContiguousImpl@MixingHashState@hash_internal@absl@@CA_K_KPBEIU?$integral_constant@H$07@Cr@std@@@Z
     ?CombineLargeContiguousImpl32@MixingHashState@hash_internal@absl@@CA_K_KPBEI@Z
     ?CombineLargeContiguousImpl64@MixingHashState@hash_internal@absl@@CA_K_KPBEI@Z
-    ?Compare@Cord@absl@@QBEHVstring_view@2@@Z
+    ?Compare@Cord@absl@@QBEHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?CompareImpl@Cord@absl@@ABEHABV12@@Z
     ?CompareSlowPath@Cord@absl@@ABEHABV12@II@Z
-    ?CompareSlowPath@Cord@absl@@ABEHVstring_view@2@II@Z
+    ?CompareSlowPath@Cord@absl@@ABEHV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@II@Z
     ?Compute@CrcNonTemporalMemcpyAVXEngine@crc_internal@absl@@UBE?AVcrc32c_t@3@PIAXPIBXIV43@@Z
     ?Compute@CrcNonTemporalMemcpyEngine@crc_internal@absl@@UBE?AVcrc32c_t@3@PIAXPIBXIV43@@Z
     ?Compute@FallbackCrcMemcpyEngine@crc_internal@absl@@UBE?AVcrc32c_t@3@PIAXPIBXIV43@@Z
-    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@Vstring_view@1@@Z
+    ?ComputeCrc32c@absl@@YA?AVcrc32c_t@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Concat@CRC@crc_internal@absl@@UAEXPAIII@Z
     ?ConcatCrc32c@absl@@YA?AVcrc32c_t@1@V21@0I@Z
     ?Consume@cord_internal@absl@@YAXPAUCordRep@12@V?$FunctionRef@$$A6AXPAUCordRep@cord_internal@absl@@II@Z@2@@Z
@@ -456,7 +456,7 @@
     ?CopyTo@InlineRep@Cord@absl@@QBEXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
     ?CopyToArraySlowPath@Cord@absl@@ABEXPAD@Z
     ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AAEXDIW4StringType@123@@Z
-    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AAEXVstring_view@3@W4StringType@123@@Z
+    ?CopyToEncodedBuffer@LogMessage@log_internal@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4StringType@123@@Z
     ?Crash@Helper@internal_statusor@absl@@SAXABVStatus@3@@Z
     ?Crc32c@CRC@crc_internal@absl@@SAPAV123@XZ
     ?CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@3@PIAXPIBXIV43@_N@Z
@@ -467,8 +467,8 @@
     ?CreateThreadIdentity@synchronization_internal@absl@@YAPAUThreadIdentity@base_internal@2@XZ
     ?CurrentThreadIdentityIfPresent@base_internal@absl@@YAPAUThreadIdentity@12@XZ
     ?DataLength@Header@TimeZoneInfo@cctz@time_internal@absl@@QBEII@Z
-    ?DataLossError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?DeadlineExceededError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?DataLossError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?DeadlineExceededError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?DecodeFrom@ProtoField@log_internal@absl@@QAE_NPAV?$Span@$$CBD@3@@Z
     ?DecodeWaitCycles@SpinLock@base_internal@absl@@KA_JI@Z
     ?DecrementCount@BlockingCounter@absl@@QAE_NXZ
@@ -495,7 +495,7 @@
     ?Digits10@?$BigUnsigned@$03@strings_internal@absl@@SAHXZ
     ?Digits10@?$BigUnsigned@$0FE@@strings_internal@absl@@SAHXZ
     ?DropDeletesWithoutResize@container_internal@absl@@YAXAAVCommonFields@12@ABUPolicyFunctions@12@PAX@Z
-    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@Vstring_view@2@ABVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@Vstring_view@3@ABVCord@3@@Z
+    ?DummyFunction@?$AtomicHook@P6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@absl@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@base_internal@absl@@CA?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@3@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@3@@Z
     ?DummyFunction@?$AtomicHook@P6AXPBDH000@Z@base_internal@absl@@CAXPBDH000@Z
     ?DummyFunction@?$AtomicHook@P6AXPBDPBX@Z@base_internal@absl@@CAXPBDPBX@Z
     ?DummyFunction@?$AtomicHook@P6AXPBDPBX_J@Z@base_internal@absl@@CAXPBDPBX_J@Z
@@ -503,8 +503,8 @@
     ?DummyFunction@?$AtomicHook@P6AXXZ@base_internal@absl@@CAXXZ
     ?DummyFunction@?$AtomicHook@P6AX_J@Z@base_internal@absl@@CAX_J@Z
     ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@AAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@Vstring_view@3@AAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
-    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@Vstring_view@3@_NAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
+    ?Dump@CordRepBtree@cord_internal@absl@@SAXPBUCordRep@23@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@_NAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@67@@Z
     ?DumpPCAndFrameSizesAndStackTrace@debugging_internal@absl@@YAXQAXQBQAXQAHHH_NP6AXPBDPAX@Z5@Z
     ?DumpStackTrace@debugging_internal@absl@@YAXHH_NP6AXPBDPAX@Z2@Z
     ?DurationFromTimespec@absl@@YA?AVDuration@1@Utimespec@@@Z
@@ -528,17 +528,17 @@
     ?EncodeVarint@log_internal@absl@@YA_N_K0PAV?$Span@D@2@@Z
     ?EncodeWaitCycles@SpinLock@base_internal@absl@@KAI_J0@Z
     ?EndsWith@Cord@absl@@QBE_NABV12@@Z
-    ?EndsWith@Cord@absl@@QBE_NVstring_view@2@@Z
-    ?EndsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?EqualsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?EndsWith@Cord@absl@@QBE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?EndsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?EqualsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?EqualsImpl@Cord@absl@@ABE_NABV12@I@Z
-    ?EqualsImpl@Cord@absl@@ABE_NVstring_view@2@I@Z
+    ?EqualsImpl@Cord@absl@@ABE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?EqualsSlow@Status@absl@@CA_NABV12@0@Z
     ?EquivTransitions@TimeZoneInfo@cctz@time_internal@absl@@ABE_NEE@Z
     ?Erase@?$Storage@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@inlined_vector_internal@absl@@QAEPAUPayload@status_internal@3@PBU453@0@Z
     ?EraseMetaOnly@container_internal@absl@@YAXAAVCommonFields@12@PAW4ctrl_t@12@I@Z
-    ?ErasePayload@Status@absl@@QAE_NVstring_view@2@@Z
-    ?ErrnoToStatus@absl@@YA?AVStatus@1@HVstring_view@1@@Z
+    ?ErasePayload@Status@absl@@QAE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ErrnoToStatus@absl@@YA?AVStatus@1@HV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ErrnoToStatusCode@absl@@YA?AW4StatusCode@1@H@Z
     ?Eval@Condition@absl@@QBE_NXZ
     ?ExitOnDFatal@log_internal@absl@@YA_NXZ
@@ -547,14 +547,14 @@
     ?ExtendByZeroes@CRC32@crc_internal@absl@@UBEXPAII@Z
     ?ExtendByZeroesImpl@CRC32@crc_internal@absl@@CAXPAIIQBI1@Z
     ?ExtendCrc32cByZeroes@absl@@YA?AVcrc32c_t@1@V21@I@Z
-    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@Vstring_view@2@@Z
+    ?ExtendCrc32cInternal@crc_internal@absl@@YA?AVcrc32c_t@2@V32@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?ExtendTransitions@TimeZoneInfo@cctz@time_internal@absl@@AAE_NXZ
     ?ExtractAppendBuffer@CordRepBtree@cord_internal@absl@@SA?AUExtractResult@CordRep@23@PAV123@I@Z
     ?ExtractFront@CordRepBtree@cord_internal@absl@@CAPAUCordRep@23@PAV123@@Z
     ?FDivDuration@absl@@YANVDuration@1@0@Z
     ?FailQuietly@LogMessage@log_internal@absl@@KAXXZ
     ?FailWithoutStackTrace@LogMessage@log_internal@absl@@KAXXZ
-    ?FailedPreconditionError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?FailedPreconditionError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?FailureSignalToString@debugging_internal@absl@@YAPBDH@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPADHPAD@Z
     ?FastIntToBuffer@numbers_internal@absl@@YAPADIPAD@Z
@@ -569,10 +569,11 @@
     ?FillWordTable@CRCImpl@crc_internal@absl@@SAXIIHPAY0BAA@I@Z
     ?FillZeroesTable@CRCImpl@crc_internal@absl@@SAHIPAY0BAA@I@Z
     ?FinalizeEncodingAndFormat@LogMessageData@LogMessage@log_internal@absl@@QAEXXZ
-    ?Find@ByAnyChar@absl@@QBE?AVstring_view@2@V32@I@Z
-    ?Find@ByChar@absl@@QBE?AVstring_view@2@V32@I@Z
-    ?Find@ByLength@absl@@QBE?AVstring_view@2@V32@I@Z
-    ?Find@ByString@absl@@QBE?AVstring_view@2@V32@I@Z
+    ?Find@ByAnyChar@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ?Find@ByChar@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ?Find@ByLength@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ?Find@ByString@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V345@I@Z
+    ?FindFlatStartPiece@InlineRep@Cord@absl@@QBE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?FindPath@GraphCycles@synchronization_internal@absl@@QBEHUGraphId@23@0HQAU423@@Z
     ?FindSlow@CordRepRing@cord_internal@absl@@ABE?AUPosition@123@II@Z
     ?FindTailSlow@CordRepRing@cord_internal@absl@@ABE?AUPosition@123@II@Z
@@ -584,13 +585,13 @@
     ?FlagsToString@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4Flags@12@@Z
     ?FlatOverhead@CordTestAccess@strings_internal@absl@@SAIXZ
     ?FlatTagToLength@CordTestAccess@strings_internal@absl@@SAIE@Z
-    ?FlattenSlowPath@Cord@absl@@AAE?AVstring_view@2@XZ
+    ?FlattenSlowPath@Cord@absl@@AAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?Floor@absl@@YA?AVDuration@1@V21@0@Z
     ?Flush@LogMessage@log_internal@absl@@IAEXXZ
     ?Flush@LogSink@absl@@UAEXXZ
     ?FlushLogSinks@log_internal@absl@@YAXXZ
-    ?ForEachChunkAux@Cord@absl@@CAXPAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXVstring_view@absl@@@Z@2@@Z
-    ?ForEachPayload@Status@absl@@QBEXV?$FunctionRef@$$A6AXVstring_view@absl@@ABVCord@2@@Z@2@@Z
+    ?ForEachChunkAux@Cord@absl@@CAXPAUCordRep@cord_internal@2@V?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z@2@@Z
+    ?ForEachPayload@Status@absl@@QBEXV?$FunctionRef@$$A6AXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@absl@@@Z@2@@Z
     ?ForVar2@CheckOpMessageBuilder@log_internal@absl@@QAEAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@XZ
     ?ForgetDeadlockInfo@Mutex@absl@@QAEXXZ
     ?FormatCivilTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
@@ -606,7 +607,7 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAA@@12@UVoidPtr@12@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0EAAAE@@12@PBDVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@ABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
-    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@Vstring_view@2@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
+    ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0IAAAE@@12@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@MVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@NVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPOAA@@12@OVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
@@ -621,12 +622,12 @@
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_JVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatConvertImpl@str_format_internal@absl@@YA?AU?$ArgConvertResult@$0JPPPL@@12@_KVFormatConversionSpecImpl@12@PAVFormatSinkImpl@12@@Z
     ?FormatDuration@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VDuration@1@@Z
-    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IVstring_view@2@HW4PrefixFormat@12@3@Z
-    ?FormatLogPrefix@log_internal@absl@@YAIW4LogSeverity@2@VTime@2@IVstring_view@2@HW4PrefixFormat@12@AAV?$Span@D@2@@Z
+    ?FormatLogMessage@log_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4LogSeverity@2@V?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@2@VDuration@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@HW4PrefixFormat@12@3@Z
+    ?FormatLogPrefix@log_internal@absl@@YAIW4LogSeverity@2@VTime@2@IV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HW4PrefixFormat@12@AAV?$Span@D@2@@Z
     ?FormatPack@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
+    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@VTime@1@VTimeZone@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@@Z
     ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VTime@1@VTimeZone@1@@Z
-    ?FormatTime@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@VTime@1@VTimeZone@1@@Z
     ?FormatUntyped@str_format_internal@absl@@YA_NVFormatRawSinkImpl@12@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?FprintF@str_format_internal@absl@@YAHPAU_iobuf@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?Frequency@UnscaledCycleClock@base_internal@absl@@CANXZ
@@ -654,7 +655,7 @@
     ?GetDebugStackTraceHook@debugging_internal@absl@@YAP6AXQBQAXHP6AXPBDPAX@Z2@ZXZ
     ?GetEstimatedFairShareMemoryUsage@cord_internal@absl@@YAIPBUCordRep@12@@Z
     ?GetEstimatedMemoryUsage@cord_internal@absl@@YAIPBUCordRep@12@@Z
-    ?GetFlatAux@Cord@absl@@CA_NPAUCordRep@cord_internal@2@PAVstring_view@2@@Z
+    ?GetFlatAux@Cord@absl@@CA_NPAUCordRep@cord_internal@2@PAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetHashtablezMaxSamples@container_internal@absl@@YAIXZ
     ?GetHashtablezSampleParameter@container_internal@absl@@YAHXZ
     ?GetId@GraphCycles@synchronization_internal@absl@@QAE?AUGraphId@23@PAX@Z
@@ -662,7 +663,7 @@
     ?GetKeys@RandenSlow@random_internal@absl@@SAPBXXZ
     ?GetParentMethod@CordzInfo@cord_internal@absl@@CA?AW4MethodIdentifier@CordzUpdateTracker@23@PBV123@@Z
     ?GetParentStack@CordzInfo@cord_internal@absl@@QBE?AV?$Span@QAX@3@XZ
-    ?GetPayload@Status@absl@@QBE?AV?$optional@VCord@absl@@@2@Vstring_view@2@@Z
+    ?GetPayload@Status@absl@@QBE?AV?$optional@VCord@absl@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?GetPrependBuffer@CordRepRing@cord_internal@absl@@QAE?AV?$Span@D@3@I@Z
     ?GetProgramCounter@debugging_internal@absl@@YAPAXQAX@Z
     ?GetSaltMaterial@random_internal@absl@@YA?AV?$optional@I@2@XZ
@@ -673,7 +674,7 @@
     ?GetStackTrace@GraphCycles@synchronization_internal@absl@@QAEHUGraphId@23@PAPAPAX@Z
     ?GetStackTrace@absl@@YAHPAPAXHH@Z
     ?GetStackTraceWithContext@absl@@YAHPAPAXHHPBXPAH@Z
-    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@ABVCord@2@@ZXZ
+    ?GetStatusPayloadPrinter@status_internal@absl@@YAP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@ZXZ
     ?GetStride@ExponentialBiased@profiling_internal@absl@@QAE_J_J@Z
     ?GetTID@base_internal@absl@@YAIXZ
     ?GetTestEngine@CrcMemcpy@crc_internal@absl@@SA?AV?$unique_ptr@VCrcMemcpyEngine@crc_internal@absl@@U?$default_delete@VCrcMemcpyEngine@crc_internal@absl@@@Cr@std@@@Cr@std@@HH@Z
@@ -689,7 +690,7 @@
     ?HasNode@GraphCycles@synchronization_internal@absl@@QAE_NUGraphId@23@@Z
     ?HasRandenHwAesImplementation@random_internal@absl@@YA_NXZ
     ?Head@CordzInfo@cord_internal@absl@@SAPAV123@ABVCordzSnapshot@23@@Z
-    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?HexStringToBytes@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?IDivDuration@time_internal@absl@@YA_J_NVDuration@2@1PAV32@@Z
     ?In@Time@absl@@QBE?AUBreakdown@12@VTimeZone@2@@Z
     ?InMillisecondsFromNow@KernelTimeout@synchronization_internal@absl@@QBEKXZ
@@ -700,15 +701,15 @@
     ?InitTables@CRC32@crc_internal@absl@@UAEXXZ
     ?InitWhat@BadStatusOrAccess@absl@@ABEXXZ
     ?Initialize@ExponentialBiased@profiling_internal@absl@@AAEXXZ
-    ?InitializeCordRepExternal@cord_internal@absl@@YAXVstring_view@2@PAUCordRepExternal@12@@Z
+    ?InitializeCordRepExternal@cord_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAUCordRepExternal@12@@Z
     ?InitializeSymbolizer@absl@@YAXPBD@Z
     ?InsertEdge@GraphCycles@synchronization_internal@absl@@QAE_NUGraphId@23@0@Z
     ?InstallFailureSignalHandler@absl@@YAXABUFailureSignalHandlerOptions@1@@Z
     ?InternalAttemptToUseMutexInFatalSignalHandler@Mutex@absl@@SAXXZ
     ?InternalCondVarPoke@StdcppWaiter@synchronization_internal@absl@@AAEXXZ
     ?InternalCondVarPoke@Win32Waiter@synchronization_internal@absl@@AAEXXZ
-    ?InternalError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?InvalidArgumentError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?InternalError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?InvalidArgumentError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsAborted@absl@@YA_NABVStatus@1@@Z
     ?IsAlreadyExists@absl@@YA_NABVStatus@1@@Z
     ?IsCancelled@absl@@YA_NABVStatus@1@@Z
@@ -716,8 +717,8 @@
     ?IsDeadlineExceeded@absl@@YA_NABVStatus@1@@Z
     ?IsFailedPrecondition@absl@@YA_NABVStatus@1@@Z
     ?IsFatal@LogMessage@log_internal@absl@@ABE_NXZ
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NIIPAVstring_view@3@@Z
-    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NPAVstring_view@3@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NIIPAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?IsFlat@CordRepBtree@cord_internal@absl@@QBE_NPAV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?IsHashtablezEnabled@container_internal@absl@@YA_NXZ
     ?IsInitialized@log_internal@absl@@YA_NXZ
     ?IsInternal@absl@@YA_NABVStatus@1@@Z
@@ -806,33 +807,33 @@
     ?NominalCPUFrequency@base_internal@absl@@YANXZ
     ?Normalize@CrcCordState@crc_internal@absl@@QAEXXZ
     ?NormalizedPrefixCrcAtNthChunk@CrcCordState@crc_internal@absl@@QBE?AUPrefixCrc@123@I@Z
-    ?NotFoundError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?NotFoundError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Notify@Notification@absl@@QAEXXZ
     ?Now@CycleClock@base_internal@absl@@SA_JXZ
     ?Now@UnscaledCycleClock@base_internal@absl@@CA_JXZ
     ?Now@absl@@YA?AVTime@1@XZ
     ?NumCPUs@base_internal@absl@@YAHXZ
     ?OneTimeInitThreadIdentity@synchronization_internal@absl@@YAXPAUThreadIdentity@base_internal@2@@Z
-    ?OutOfRangeError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseDuration@absl@@YA_NVstring_view@1@PAVDuration@1@@Z
+    ?OutOfRangeError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseDuration@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVDuration@1@@Z
     ?ParseFlag@absl@@YA_NABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAVDuration@1@PAV234@@Z
     ?ParseFlag@absl@@YA_NABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAVTime@1@PAV234@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
-    ?ParseLenientCivilTime@absl@@YA_NVstring_view@1@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uday_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uhour_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uminute_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Umonth_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Usecond_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
+    ?ParseLenientCivilTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$civil_time@Uyear_tag@time_internal@absl@@@detail@cctz@time_internal@1@@Z
     ?ParsePosixSpec@cctz@time_internal@absl@@YA_NABV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@PAUPosixTimeZone@123@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?ParseTime@absl@@YA_NVstring_view@1@0VTimeZone@1@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?PermissionDeniedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?ParseTime@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0VTimeZone@1@PAVTime@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?PermissionDeniedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Poison@CrcCordState@crc_internal@absl@@QAEXXZ
     ?Poke@StdcppWaiter@synchronization_internal@absl@@QAEXXZ
     ?Poke@Win32Waiter@synchronization_internal@absl@@QAEXXZ
@@ -842,12 +843,12 @@
     ?PrepareToDie@LogMessage@log_internal@absl@@AAEXXZ
     ?PrepareToModify@Status@absl@@AAEXXZ
     ?Prepend@Cord@absl@@QAEXABV12@@Z
-    ?Prepend@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
+    ?Prepend@CordRepBtree@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?Prepend@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@PAUCordRep@23@@Z
-    ?Prepend@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@Vstring_view@3@I@Z
-    ?PrependArray@Cord@absl@@AAEXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?Prepend@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
+    ?PrependArray@Cord@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependLeaf@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@II@Z
-    ?PrependPrecise@Cord@absl@@AAEXVstring_view@2@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
+    ?PrependPrecise@Cord@absl@@AAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4MethodIdentifier@CordzUpdateTracker@cord_internal@2@@Z
     ?PrependSlow@CordRepBtree@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
     ?PrependSlow@CordRepRing@cord_internal@absl@@CAPAV123@PAV123@PAUCordRep@23@@Z
     ?PrependTree@InlineRep@Cord@absl@@QAEXPAUCordRep@cord_internal@3@W4MethodIdentifier@CordzUpdateTracker@53@@Z
@@ -859,14 +860,14 @@
     ?Print@Streamable@str_format_internal@absl@@QBEAAV?$basic_ostream@DU?$char_traits@D@Cr@std@@@Cr@std@@AAV456@@Z
     ?Ptr@GraphCycles@synchronization_internal@absl@@QAEPAXUGraphId@23@@Z
     ?PushDead@?$SampleRecorder@UHashtablezInfo@container_internal@absl@@@profiling_internal@absl@@AAEXPAUHashtablezInfo@container_internal@3@@Z
-    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QAE_NVstring_view@3@HH_N@Z
+    ?PutPaddedString@FormatSinkImpl@str_format_internal@absl@@QAE_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@HH_N@Z
     ?RawEnableLogPrefix@log_internal@absl@@YAX_N@Z
     ?RawLog@raw_log_internal@absl@@YAXW4LogSeverity@2@PBDH1ZZ
     ?RawLoggingFullySupported@raw_log_internal@absl@@YA_NXZ
     ?RawSetMinLogLevel@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?RawSetStderrThreshold@log_internal@absl@@YAXW4LogSeverityAtLeast@2@@Z
     ?Read@CordRepBtreeNavigator@cord_internal@absl@@QAE?AUReadResult@123@II@Z
-    ?Read@CordRepBtreeReader@cord_internal@absl@@QAE?AVstring_view@3@IIAAPAUCordRep@23@@Z
+    ?Read@CordRepBtreeReader@cord_internal@absl@@QAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@IIAAPAUCordRep@23@@Z
     ?ReadDigits@?$BigUnsigned@$03@strings_internal@absl@@AAEHPBD0H@Z
     ?ReadDigits@?$BigUnsigned@$0FE@@strings_internal@absl@@AAEHPBD0H@Z
     ?ReadFloatMantissa@?$BigUnsigned@$03@strings_internal@absl@@QAEHABUParsedFloat@23@H@Z
@@ -912,13 +913,13 @@
     ?RemoveSuffix@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@II@Z
     ?ResetToBuiltinUTC@TimeZoneInfo@cctz@time_internal@absl@@AAE_NABV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?Resize@?$ResizeUninitializedTraits@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@X@strings_internal@absl@@SAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@I@Z
-    ?ResourceExhaustedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?ResourceExhaustedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Rethrow@variant_internal@absl@@YAXXZ
     ?ReverseConsume@cord_internal@absl@@YAXPAUCordRep@12@V?$FunctionRef@$$A6AXPAUCordRep@cord_internal@absl@@II@Z@2@@Z
     ?SafeToDelete@CordzHandle@cord_internal@absl@@QBE_NXZ
     ?SampleSlow@container_internal@absl@@YAPAUHashtablezInfo@12@AAUSamplingState@12@I@Z
     ?Scramble@CRC32@crc_internal@absl@@UBEXPAI@Z
-    ?Seek@CordRepBtreeReader@cord_internal@absl@@QAE?AVstring_view@3@I@Z
+    ?Seek@CordRepBtreeReader@cord_internal@absl@@QAE?AV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@I@Z
     ?SendToLog@LogMessage@log_internal@absl@@AAEXXZ
     ?SetCapacityForTesting@CordRepRing@cord_internal@absl@@QAEXI@Z
     ?SetCrcCordState@Cord@absl@@AAEXVCrcCordState@crc_internal@2@@Z
@@ -934,14 +935,14 @@
     ?SetHashtablezSampleParameter@container_internal@absl@@YAXH@Z
     ?SetHashtablezSampleParameterInternal@container_internal@absl@@YAXH@Z
     ?SetInitialized@log_internal@absl@@YAXXZ
-    ?SetLogBacktraceLocation@absl@@YAXVstring_view@1@H@Z
+    ?SetLogBacktraceLocation@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?SetLoggingGlobalsListener@log_internal@absl@@YAXP6AXXZ@Z
     ?SetMaxFramesInLogStackTrace@log_internal@absl@@YAXH@Z
     ?SetMinLogLevel@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetMutexDeadlockDetectionMode@absl@@YAXW4OnDeadlockCycle@1@@Z
-    ?SetPayload@Status@absl@@QAEXVstring_view@2@VCord@2@@Z
+    ?SetPayload@Status@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@VCord@2@@Z
     ?SetStackUnwinder@absl@@YAXP6AHPAPAXPAHHHPBX1@Z@Z
-    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@Vstring_view@2@ABVCord@2@@Z@Z
+    ?SetStatusPayloadPrinter@status_internal@absl@@YAXP6A?AV?$optional@V?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@2@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@ABVCord@2@@Z@Z
     ?SetStderrThreshold@absl@@YAXW4LogSeverityAtLeast@1@@Z
     ?SetSuppressSigabortTrace@log_internal@absl@@YA_N_N@Z
     ?SetThreadBlockedCounter@PerThreadSem@synchronization_internal@absl@@SAXPAU?$atomic@H@Cr@std@@@Z
@@ -955,14 +956,14 @@
     ?ShouldLog@LogEveryNState@log_internal@absl@@QAE_NH@Z
     ?ShouldLog@LogEveryPow2State@log_internal@absl@@QAE_NXZ
     ?ShouldLog@LogFirstNState@log_internal@absl@@QAE_NH@Z
-    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NVstring_view@2@H@Z
+    ?ShouldLogBacktraceAt@log_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@H@Z
     ?ShouldPrependLogPrefix@absl@@YA_NXZ
     ?ShouldSymbolizeLogStackTrace@log_internal@absl@@YA_NXZ
     ?Signal@CondVar@absl@@QAEXXZ
     ?SignalAll@CondVar@absl@@QAEXXZ
-    ?SimpleAtob@absl@@YA_NVstring_view@1@PA_N@Z
-    ?SimpleAtod@absl@@YA_NVstring_view@1@PAN@Z
-    ?SimpleAtof@absl@@YA_NVstring_view@1@PAM@Z
+    ?SimpleAtob@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PA_N@Z
+    ?SimpleAtod@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAN@Z
+    ?SimpleAtof@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAM@Z
     ?SixDigitsToBuffer@numbers_internal@absl@@YAINPAD@Z
     ?SizeofCordRepExternal@CordTestAccess@strings_internal@absl@@SAIXZ
     ?SizeofCordRepSubstring@CordTestAccess@strings_internal@absl@@SAIXZ
@@ -974,7 +975,7 @@
     ?SpinLockWait@base_internal@absl@@YAIPAU?$atomic@I@Cr@std@@HQBUSpinLockWaitTransition@12@W4SchedulingMode@12@@Z
     ?SpinLoop@SpinLock@base_internal@absl@@AAEIXZ
     ?StackTraceWorksForTest@debugging_internal@absl@@YA_NXZ
-    ?StartsWithIgnoreCase@absl@@YA_NVstring_view@1@0@Z
+    ?StartsWithIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
     ?StatusCodeToString@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@W4StatusCode@1@@Z
     ?StderrThreshold@absl@@YA?AW4LogSeverityAtLeast@1@XZ
     ?SteadyClockNow@KernelTimeout@synchronization_internal@absl@@CA_JXZ
@@ -985,16 +986,16 @@
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@1@000@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@1@00@Z
     ?StrCat@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABVAlphaNum@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@0@Z
-    ?StrContainsIgnoreCase@absl@@YA_NVstring_view@1@D@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@0@Z
+    ?StrContainsIgnoreCase@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@D@Z
     ?StrError@base_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@H@Z
-    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@4@@Z
-    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
+    ?StrReplaceAll@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@V?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@4@@Z
+    ?StrReplaceAll@absl@@YAHV?$initializer_list@U?$pair@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@V123@@Cr@std@@@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@3@@Z
     ?SubLength@CordRepRing@cord_internal@absl@@AAEXII@Z
     ?SubRing@CordRepRing@cord_internal@absl@@SAPAV123@PAV123@III@Z
     ?SubTree@CordRepBtree@cord_internal@absl@@QAEPAUCordRep@23@II@Z
     ?Subcord@Cord@absl@@QBE?AV12@II@Z
-    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@2@PBV62@I@Z
+    ?SubstituteAndAppendArray@substitute_internal@absl@@YAXPAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@45@PBV645@I@Z
     ?Summarize@str_format_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@VUntypedFormatSpecImpl@12@V?$Span@$$CBVFormatArgImpl@str_format_internal@absl@@@2@@Z
     ?SupportsArmCRC32PMULL@crc_internal@absl@@YA_NXZ
     ?SuppressSigabortTrace@log_internal@absl@@YA_NXZ
@@ -1077,12 +1078,12 @@
     ?TryRemove@Mutex@absl@@AAEXPAUPerThreadSynch@base_internal@2@@Z
     ?UTC@Impl@time_zone@cctz@time_internal@absl@@SA?AV2345@XZ
     ?UTCImpl@Impl@time_zone@cctz@time_internal@absl@@CAPBV12345@XZ
-    ?UnauthenticatedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnavailableError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnauthenticatedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnavailableError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?UnextendByZeroes@CRC32@crc_internal@absl@@UBEXPAII@Z
     ?UnextendCrc32cByZeroes@crc_internal@absl@@YA?AVcrc32c_t@2@V32@I@Z
-    ?UnimplementedError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
-    ?UnknownError@absl@@YA?AVStatus@1@Vstring_view@1@@Z
+    ?UnimplementedError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?UnknownError@absl@@YA?AVStatus@1@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
     ?Unlock@CordzInfo@cord_internal@absl@@QAEXXZ
     ?Unlock@Mutex@absl@@QAEXXZ
     ?UnlockSlow@Mutex@absl@@AAEXPAUSynchWaitParams@2@@Z
@@ -1095,8 +1096,8 @@
     ?Unscramble@CRC32@crc_internal@absl@@UBEXPAI@Z
     ?Untrack@CordzInfo@cord_internal@absl@@QAEXXZ
     ?UpdateStackTrace@GraphCycles@synchronization_internal@absl@@QAEXUGraphId@23@HP6AHPAPAXH@Z@Z
-    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
+    ?Utf8SafeCEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?Utf8SafeCHexEscape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
     ?Version@TimeZoneInfo@cctz@time_internal@absl@@UBE?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@TimeZoneLibC@cctz@time_internal@absl@@UBE?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
     ?Version@ZoneInfoSource@cctz@time_internal@absl@@UBE?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@XZ
@@ -1112,17 +1113,17 @@
     ?WaitWithTimeout@CondVar@absl@@QAE_NPAVMutex@2@VDuration@2@@Z
     ?Wakeup@CondVar@absl@@AAEXPAUPerThreadSynch@base_internal@2@@Z
     ?Wakeup@Mutex@absl@@AAEPAUPerThreadSynch@base_internal@2@PAU342@@Z
-    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@Vstring_view@1@@Z
-    ?WebSafeBase64Escape@absl@@YAXVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
-    ?WebSafeBase64Unescape@absl@@YA_NVstring_view@1@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@@Z
+    ?WebSafeBase64Escape@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@V?$basic_string_view@DU?$char_traits@D@Cr@std@@@34@@Z
+    ?WebSafeBase64Escape@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
+    ?WebSafeBase64Unescape@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@34@@Z
     ?WithMetadataFrom@LogMessage@log_internal@absl@@QAEAAV123@ABVLogEntry@3@@Z
     ?WithPerror@LogMessage@log_internal@absl@@QAEAAV123@XZ
     ?WithThreadID@LogMessage@log_internal@absl@@QAEAAV123@I@Z
     ?WithTimestamp@LogMessage@log_internal@absl@@QAEAAV123@VTime@3@@Z
     ?WithVerbosity@LogMessage@log_internal@absl@@QAEAAV123@H@Z
-    ?Write@BufferRawSink@str_format_internal@absl@@QAEXVstring_view@3@@Z
-    ?Write@FILERawSink@str_format_internal@absl@@QAEXVstring_view@3@@Z
-    ?WriteToStderr@log_internal@absl@@YAXVstring_view@2@W4LogSeverity@2@@Z
+    ?Write@BufferRawSink@str_format_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?Write@FILERawSink@str_format_internal@absl@@QAEXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@@Z
+    ?WriteToStderr@log_internal@absl@@YAXV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@W4LogSeverity@2@@Z
     ?__add_back_capacity@?$deque@PBVImpl@time_zone@cctz@time_internal@absl@@V?$allocator@PBVImpl@time_zone@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@AAEXXZ
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AAEXI@Z
     ?__add_back_capacity@?$deque@UPrefixCrc@CrcCordState@crc_internal@absl@@V?$allocator@UPrefixCrc@CrcCordState@crc_internal@absl@@@Cr@std@@@Cr@std@@AAEXXZ
@@ -1153,15 +1154,7 @@
     ?effective_impl@time_zone@cctz@time_internal@absl@@ABEABVImpl@1234@XZ
     ?engines@?1??CrcAndCopy@CrcMemcpy@crc_internal@absl@@SA?AVcrc32c_t@4@PIAXPIBXIV54@_N@Z@4UArchSpecificEngines@234@B
     ?erase@?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@QAEPAUPayload@status_internal@2@PBU342@@Z
-    ?find@string_view@absl@@QBEIDI@Z
-    ?find@string_view@absl@@QBEIV12@I@Z
     ?find_first_non_full_outofline@container_internal@absl@@YA?AUFindInfo@12@ABVCommonFields@12@I@Z
-    ?find_first_not_of@string_view@absl@@QBEIDI@Z
-    ?find_first_not_of@string_view@absl@@QBEIV12@I@Z
-    ?find_first_of@string_view@absl@@QBEIV12@I@Z
-    ?find_last_not_of@string_view@absl@@QBEIDI@Z
-    ?find_last_not_of@string_view@absl@@QBEIV12@I@Z
-    ?find_last_of@string_view@absl@@QBEIV12@I@Z
     ?fixed_time_zone@cctz@time_internal@absl@@YA?AVtime_zone@123@ABV?$duration@_JV?$ratio@$00$00@Cr@std@@@chrono@Cr@std@@@Z
     ?format@detail@cctz@time_internal@absl@@YA?AV?$basic_string@DU?$char_traits@D@Cr@std@@V?$allocator@D@23@@Cr@std@@ABV567@ABV?$time_point@Vsystem_clock@chrono@Cr@std@@V?$duration@_JV?$ratio@$00$00@Cr@std@@@234@@chrono@67@ABV?$duration@_JV?$ratio@$00$0DINHOKEMGIAAA@@Cr@std@@@967@ABVtime_zone@234@@Z
     ?from_chars@absl@@YA?AUfrom_chars_result@1@PBD0AAMW4chars_format@1@@Z
@@ -1224,14 +1217,12 @@
     ?reset@?$unique_ptr@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@U?$default_delete@V?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Cr@std@@@Cr@std@@QAEXPAV?$InlinedVector@UPayload@status_internal@absl@@$00V?$allocator@UPayload@status_internal@absl@@@Cr@std@@@absl@@@Z
     ?resize@?$vector@UTransition@cctz@time_internal@absl@@V?$allocator@UTransition@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXI@Z
     ?resize@?$vector@UTransitionType@cctz@time_internal@absl@@V?$allocator@UTransitionType@cctz@time_internal@absl@@@Cr@std@@@Cr@std@@QAEXI@Z
-    ?rfind@string_view@absl@@QBEIDI@Z
-    ?rfind@string_view@absl@@QBEIV12@I@Z
-    ?safe_strto128_base@numbers_internal@absl@@YA_NVstring_view@2@PAVint128@2@H@Z
-    ?safe_strto32_base@numbers_internal@absl@@YA_NVstring_view@2@PAHH@Z
-    ?safe_strto64_base@numbers_internal@absl@@YA_NVstring_view@2@PA_JH@Z
-    ?safe_strtou128_base@numbers_internal@absl@@YA_NVstring_view@2@PAVuint128@2@H@Z
-    ?safe_strtou32_base@numbers_internal@absl@@YA_NVstring_view@2@PAIH@Z
-    ?safe_strtou64_base@numbers_internal@absl@@YA_NVstring_view@2@PA_KH@Z
+    ?safe_strto128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVint128@2@H@Z
+    ?safe_strto32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAHH@Z
+    ?safe_strto64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PA_JH@Z
+    ?safe_strtou128_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAVuint128@2@H@Z
+    ?safe_strtou32_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PAIH@Z
+    ?safe_strtou64_base@numbers_internal@absl@@YA_NV?$basic_string_view@DU?$char_traits@D@Cr@std@@@Cr@std@@PA_KH@Z
     ?set_cordz_mean_interval@cord_internal@absl@@YAXH@Z
     ?set_inline_data@InlineData@cord_internal@absl@@QAEXPBDI@Z
     ?shallow_subcords_enabled@cord_internal@absl@@3U?$atomic@_N@Cr@std@@A

third_party/blink/common/features.cc

diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
index de694d1..d7dbfff 100644
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -26,12 +26,6 @@
              "AnonymousIframeOriginTrial",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
-// Gate access to Attribution Reporting cross app and web APIs that allow
-// registering with a native attribution API.
-BASE_FEATURE(kAttributionReportingCrossAppWeb,
-             "AttributionReportingCrossAppWeb",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-
 // If enabled, whenever form controls are removed from the DOM, the ChromeClient
 // is informed about this. This enables Autofill to trigger a reparsing of
 // forms.
@@ -1798,5 +1792,9 @@
              "KeepAliveInBrowserMigration",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
+BASE_FEATURE(kGainmapHdrImages,
+             "GainmapHdrImages",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
 }  // namespace features
 }  // namespace blink

third_party/blink/public/common/features.h

diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
index 0cb2c95..d75295e 100644
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -19,7 +19,6 @@
 namespace features {
 
 BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAnonymousIframeOriginTrial);
-BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAttributionReportingCrossAppWeb);
 BLINK_COMMON_EXPORT
 BASE_DECLARE_FEATURE(kAutofillDetectRemovedFormControls);
 BLINK_COMMON_EXPORT
@@ -1098,6 +1097,10 @@
 // Tracker: https://crbug.com/1356128
 BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kKeepAliveInBrowserMigration);
 
+// Switch to enabling rendering of gainmap-based HDR images.
+// Tracker: https://crbug.com/1404000
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kGainmapHdrImages);
+
 }  // namespace features
 }  // namespace blink
 

third_party/blink/public/devtools_protocol/browser_protocol.pdl

diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
index 573b6d1c..da79b6f 100644
--- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
+++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
@@ -809,14 +809,17 @@
       WellKnownNoResponse
       WellKnownInvalidResponse
       WellKnownListEmpty
+      WellKnownInvalidContentType
       ConfigNotInWellKnown
       WellKnownTooBig
       ConfigHttpNotFound
       ConfigNoResponse
       ConfigInvalidResponse
+      ConfigInvalidContentType
       ClientMetadataHttpNotFound
       ClientMetadataNoResponse
       ClientMetadataInvalidResponse
+      ClientMetadataInvalidContentType
       DisabledInSettings
       ErrorFetchingSignin
       InvalidSigninResponse
@@ -824,10 +827,12 @@
       AccountsNoResponse
       AccountsInvalidResponse
       AccountsListEmpty
+      AccountsInvalidContentType
       IdTokenHttpNotFound
       IdTokenNoResponse
       IdTokenInvalidResponse
       IdTokenInvalidRequest
+      IdTokenInvalidContentType
       ErrorIdToken
       Canceled
       RpPageNotVisible

third_party/blink/public/mojom/devtools/inspector_issue.mojom

diff --git a/third_party/blink/public/mojom/devtools/inspector_issue.mojom b/third_party/blink/public/mojom/devtools/inspector_issue.mojom
index 535428a..fdabf20 100644
--- a/third_party/blink/public/mojom/devtools/inspector_issue.mojom
+++ b/third_party/blink/public/mojom/devtools/inspector_issue.mojom
@@ -197,21 +197,26 @@
   kErrorFetchingWellKnownNoResponse,
   kErrorFetchingWellKnownInvalidResponse,
   kErrorFetchingWellKnownListEmpty,
+  kErrorFetchingWellKnownInvalidContentType,
   kErrorConfigNotInWellKnown,
   kErrorWellKnownTooBig,
   kErrorFetchingConfigHttpNotFound,
   kErrorFetchingConfigNoResponse,
   kErrorFetchingConfigInvalidResponse,
+  kErrorFetchingConfigInvalidContentType,
   kErrorFetchingClientMetadataHttpNotFound,
   kErrorFetchingClientMetadataNoResponse,
   kErrorFetchingClientMetadataInvalidResponse,
+  kErrorFetchingClientMetadataInvalidContentType,
   kErrorFetchingAccountsHttpNotFound,
   kErrorFetchingAccountsNoResponse,
   kErrorFetchingAccountsInvalidResponse,
   kErrorFetchingAccountsListEmpty,
+  kErrorFetchingAccountsInvalidContentType,
   kErrorFetchingIdTokenHttpNotFound,
   kErrorFetchingIdTokenNoResponse,
   kErrorFetchingIdTokenInvalidResponse,
+  kErrorFetchingIdTokenInvalidContentType,
   kErrorCanceled,
   kErrorRpPageNotVisible,
   kError,

third_party/blink/public/platform/DEPS

diff --git a/third_party/blink/public/platform/DEPS b/third_party/blink/public/platform/DEPS
index ccd3a089..02c45bb9 100644
--- a/third_party/blink/public/platform/DEPS
+++ b/third_party/blink/public/platform/DEPS
@@ -25,7 +25,6 @@
     "+base/trace_event",
     "+build/build_config.h",
     "+cc",
-    "+components/attribution_reporting",
     "+components/viz/common",
     "+media/base/audio_capturer_source.h",
     "+media/base/audio_latency.h",
@@ -60,6 +59,7 @@
     "+services/network/public/mojom/blocked_by_response_reason.mojom-shared.h",
     "+services/network/public/mojom/content_security_policy.mojom-shared.h",
     "+services/network/public/mojom/cors.mojom-shared.h",
+    "+services/network/public/mojom/attribution.mojom-shared.h",
     "+services/network/public/mojom/cross_origin_embedder_policy.mojom-shared.h",
     "+services/network/public/mojom/data_pipe_getter.mojom-shared.h",
     "+services/network/public/mojom/fetch_api.mojom-forward.h",

third_party/blink/public/platform/platform.h

diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 17e2a28..9e36252 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -44,11 +44,11 @@
 #include "build/build_config.h"
 #include "cc/tiles/raster_dark_mode_filter.h"
 #include "cc/trees/raster_context_provider_wrapper.h"
-#include "components/attribution_reporting/os_support.mojom-shared.h"
 #include "components/viz/common/surfaces/frame_sink_id.h"
 #include "media/base/audio_capturer_source.h"
 #include "media/base/audio_latency.h"
 #include "media/base/audio_renderer_sink.h"
+#include "services/network/public/mojom/attribution.mojom-shared.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/security/protocol_handler_security_level.h"
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -774,9 +774,9 @@
   // Returns whether OS-level support is enabled for Attribution Reporting API.
   // See
   // https://github.com/WICG/attribution-reporting-api/blob/main/app_to_web.md.
-  virtual attribution_reporting::mojom::OsSupport
+  virtual network::mojom::AttributionOsSupport
   GetOsSupportForAttributionReporting() {
-    return attribution_reporting::mojom::OsSupport::kDisabled;
+    return network::mojom::AttributionOsSupport::kDisabled;
   }
 
 #if BUILDFLAG(IS_ANDROID)

third_party/blink/renderer/core/css/css_math_expression_node.cc

diff --git a/third_party/blink/renderer/core/css/css_math_expression_node.cc b/third_party/blink/renderer/core/css/css_math_expression_node.cc
index f9d8a19..cfc6f16 100644
--- a/third_party/blink/renderer/core/css/css_math_expression_node.cc
+++ b/third_party/blink/renderer/core/css/css_math_expression_node.cc
@@ -30,6 +30,9 @@
 
 #include "third_party/blink/renderer/core/css/css_math_expression_node.h"
 
+#include <cfloat>
+#include <numeric>
+
 #include "base/memory/values_equivalent.h"
 #include "third_party/blink/renderer/core/css/calculation_expression_anchor_query_node.h"
 #include "third_party/blink/renderer/core/css/css_custom_ident_value.h"
@@ -738,6 +741,80 @@
       category, std::move(operands), op);
 }
 
+// static
+CSSMathExpressionNode* CSSMathExpressionOperation::CreateExponentialFunction(
+    Operands&& operands,
+    CSSValueID function_id) {
+  if (!RuntimeEnabledFeatures::CSSExponentialFunctionsEnabled()) {
+    return nullptr;
+  }
+
+  double value = 0;
+  bool error = false;
+  auto unit_type = CSSPrimitiveValue::UnitType::kNumber;
+  switch (function_id) {
+    case CSSValueID::kPow: {
+      DCHECK_EQ(operands.size(), 2u);
+      double a = ValueAsNumber(operands[0], error);
+      double b = ValueAsNumber(operands[1], error);
+      value = std::pow(a, b);
+      break;
+    }
+    case CSSValueID::kSqrt: {
+      DCHECK_EQ(operands.size(), 1u);
+      double a = ValueAsNumber(operands[0], error);
+      value = std::sqrt(a);
+      break;
+    }
+    case CSSValueID::kHypot: {
+      DCHECK_GE(operands.size(), 1u);
+      CalculationCategory category = DetermineComparisonCategory(operands);
+      if (category == kCalcOther) {
+        return nullptr;
+      }
+      if (CanEagerlySimplify(category)) {
+        for (const CSSMathExpressionNode* operand : operands) {
+          absl::optional<double> a = operand->ComputeValueInCanonicalUnit();
+          DCHECK(a.has_value());
+          value = std::hypot(value, a.value());
+        }
+        unit_type = CSSPrimitiveValue::CanonicalUnit(
+            operands.front()->ResolvedUnitType());
+      } else {
+        return MakeGarbageCollected<CSSMathExpressionOperation>(
+            category, std::move(operands), CSSMathOperator::kHypot);
+      }
+      break;
+    }
+    case CSSValueID::kLog: {
+      DCHECK_GE(operands.size(), 1u);
+      DCHECK_LE(operands.size(), 2u);
+      double a = ValueAsNumber(operands[0], error);
+      if (operands.size() == 2) {
+        double b = ValueAsNumber(operands[1], error);
+        value = std::log2(a) / std::log2(b);
+      } else {
+        value = std::log(a);
+      }
+      break;
+    }
+    case CSSValueID::kExp: {
+      DCHECK_EQ(operands.size(), 1u);
+      double a = ValueAsNumber(operands[0], error);
+      value = std::exp(a);
+      break;
+    }
+    default:
+      return nullptr;
+  }
+  if (error) {
+    return nullptr;
+  }
+
+  DCHECK_NE(unit_type, CSSPrimitiveValue::UnitType::kUnknown);
+  return CSSMathExpressionNumericLiteral::Create(value, unit_type);
+}
+
 CSSMathExpressionNode*
 CSSMathExpressionOperation::CreateSignRelatedFunctionSimplified(
     Operands&& operands,
@@ -959,6 +1036,7 @@
     case CSSMathOperator::kRoundToZero:
     case CSSMathOperator::kMod:
     case CSSMathOperator::kRem:
+    case CSSMathOperator::kHypot:
       return absl::nullopt;
     case CSSMathOperator::kInvalid:
       NOTREACHED();
@@ -1038,7 +1116,8 @@
     case CSSMathOperator::kRoundDown:
     case CSSMathOperator::kRoundToZero:
     case CSSMathOperator::kMod:
-    case CSSMathOperator::kRem: {
+    case CSSMathOperator::kRem:
+    case CSSMathOperator::kHypot: {
       Vector<scoped_refptr<const CalculationExpressionNode>> operands;
       operands.reserve(operands_.size());
       for (const CSSMathExpressionNode* operand : operands_) {
@@ -1055,8 +1134,10 @@
         op = CalculationOperator::kRoundToZero;
       } else if (operator_ == CSSMathOperator::kMod) {
         op = CalculationOperator::kMod;
-      } else {
+      } else if (operator_ == CSSMathOperator::kRem) {
         op = CalculationOperator::kRem;
+      } else {
+        op = CalculationOperator::kHypot;
       }
       return CalculationExpressionOperationNode::CreateSimplified(
           std::move(operands), op);
@@ -1167,6 +1248,7 @@
     case CSSMathOperator::kRoundToZero:
     case CSSMathOperator::kMod:
     case CSSMathOperator::kRem:
+    case CSSMathOperator::kHypot:
       // When stepped value functions are involved, we can't resolve the
       // expression into a length array.
       return false;
@@ -1237,7 +1319,8 @@
     case CSSMathOperator::kClamp:
     case CSSMathOperator::kRoundNearest:
     case CSSMathOperator::kMod:
-    case CSSMathOperator::kRem: {
+    case CSSMathOperator::kRem:
+    case CSSMathOperator::kHypot: {
       StringBuilder result;
       result.Append(ToString(operator_));
       result.Append('(');
@@ -1325,7 +1408,8 @@
         case CSSMathOperator::kRoundDown:
         case CSSMathOperator::kRoundToZero:
         case CSSMathOperator::kMod:
-        case CSSMathOperator::kRem: {
+        case CSSMathOperator::kRem:
+        case CSSMathOperator::kHypot: {
           CSSPrimitiveValue::UnitType first_type =
               operands_.front()->ResolvedUnitType();
           if (first_type == CSSPrimitiveValue::UnitType::kUnknown) {
@@ -1437,6 +1521,14 @@
       DCHECK_EQ(operands.size(), 2u);
       return EvaluateSteppedValueFunction(op, operands[0], operands[1]);
     }
+    case CSSMathOperator::kHypot: {
+      DCHECK_GE(operands.size(), 1u);
+      double value = 0;
+      for (double operand : operands) {
+        value = std::hypot(value, operand);
+      }
+      return value;
+    }
     case CSSMathOperator::kInvalid:
       NOTREACHED();
       break;
@@ -1651,6 +1743,12 @@
       case CSSValueID::kAtan:
       case CSSValueID::kAtan2:
         return RuntimeEnabledFeatures::CSSTrigonometricFunctionsEnabled();
+      case CSSValueID::kPow:
+      case CSSValueID::kSqrt:
+      case CSSValueID::kHypot:
+      case CSSValueID::kLog:
+      case CSSValueID::kExp:
+        return RuntimeEnabledFeatures::CSSExponentialFunctionsEnabled();
       case CSSValueID::kRound:
       case CSSValueID::kMod:
       case CSSValueID::kRem:
@@ -1775,7 +1873,24 @@
       case CSSValueID::kAtan:
         DCHECK(RuntimeEnabledFeatures::CSSTrigonometricFunctionsEnabled());
         max_argument_count = 1;
-        min_argument_count = 1;
+        break;
+      case CSSValueID::kPow:
+        DCHECK(RuntimeEnabledFeatures::CSSExponentialFunctionsEnabled());
+        max_argument_count = 2;
+        min_argument_count = 2;
+        break;
+      case CSSValueID::kExp:
+      case CSSValueID::kSqrt:
+        DCHECK(RuntimeEnabledFeatures::CSSExponentialFunctionsEnabled());
+        max_argument_count = 1;
+        break;
+      case CSSValueID::kHypot:
+        DCHECK(RuntimeEnabledFeatures::CSSExponentialFunctionsEnabled());
+        max_argument_count = kMaxExpressionDepth;
+        break;
+      case CSSValueID::kLog:
+        DCHECK(RuntimeEnabledFeatures::CSSExponentialFunctionsEnabled());
+        max_argument_count = 2;
         break;
       case CSSValueID::kRound:
         DCHECK(RuntimeEnabledFeatures::CSSSteppedValueFunctionsEnabled());
@@ -1850,6 +1965,14 @@
         return CSSMathExpressionOperation::
             CreateTrigonometricFunctionSimplified(std::move(nodes),
                                                   function_id);
+      case CSSValueID::kPow:
+      case CSSValueID::kSqrt:
+      case CSSValueID::kHypot:
+      case CSSValueID::kLog:
+      case CSSValueID::kExp:
+        DCHECK(RuntimeEnabledFeatures::CSSExponentialFunctionsEnabled());
+        return CSSMathExpressionOperation::CreateExponentialFunction(
+            std::move(nodes), function_id);
       case CSSValueID::kRound:
       case CSSValueID::kMod:
       case CSSValueID::kRem: {
@@ -2299,6 +2422,15 @@
       return CSSMathExpressionOperation::CreateSteppedValueFunction(
           std::move(operands), op);
     }
+    case CalculationOperator::kHypot: {
+      DCHECK_GE(children.size(), 1u);
+      CSSMathExpressionOperation::Operands operands;
+      for (const auto& child : children) {
+        operands.push_back(Create(*child));
+      }
+      return CSSMathExpressionOperation::CreateExponentialFunction(
+          std::move(operands), CSSValueID::kHypot);
+    }
     case CalculationOperator::kInvalid:
       NOTREACHED();
       return nullptr;

third_party/blink/renderer/core/css/css_math_expression_node.h

diff --git a/third_party/blink/renderer/core/css/css_math_expression_node.h b/third_party/blink/renderer/core/css/css_math_expression_node.h
index 09847f5..05b2c562 100644
--- a/third_party/blink/renderer/core/css/css_math_expression_node.h
+++ b/third_party/blink/renderer/core/css/css_math_expression_node.h
@@ -256,6 +256,10 @@
   static CSSMathExpressionNode* CreateSteppedValueFunction(Operands&& operands,
                                                            CSSMathOperator op);
 
+  static CSSMathExpressionNode* CreateExponentialFunction(
+      Operands&& operands,
+      CSSValueID function_id);
+
   static CSSMathExpressionNode* CreateArithmeticOperationSimplified(
       const CSSMathExpressionNode* left_side,
       const CSSMathExpressionNode* right_side,
@@ -293,10 +297,14 @@
     return CSSMathOperator::kRoundNearest <= operator_ &&
            operator_ <= CSSMathOperator::kRem;
   }
+  bool IsTrigonometricFunction() const {
+    return operator_ == CSSMathOperator::kHypot;
+  }
 
   // TODO(crbug.com/1284199): Check other math functions too.
   bool IsMathFunction() const final {
-    return IsMinOrMax() || IsClamp() || IsSteppedValueFunction();
+    return IsMinOrMax() || IsClamp() || IsSteppedValueFunction() ||
+           IsTrigonometricFunction();
   }
 
   String CSSTextAsClamp() const;

third_party/blink/renderer/core/css/css_math_expression_node_test.cc

diff --git a/third_party/blink/renderer/core/css/css_math_expression_node_test.cc b/third_party/blink/renderer/core/css/css_math_expression_node_test.cc
index f465f9c..960c1af6 100644
--- a/third_party/blink/renderer/core/css/css_math_expression_node_test.cc
+++ b/third_party/blink/renderer/core/css/css_math_expression_node_test.cc
@@ -32,6 +32,7 @@
 
 #include <algorithm>
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/renderer/core/css/css_length_resolver.h"
 #include "third_party/blink/renderer/core/css/css_math_operator.h"
 #include "third_party/blink/renderer/core/css/css_numeric_literal_value.h"
 #include "third_party/blink/renderer/core/css/css_primitive_value.h"
@@ -420,6 +421,74 @@
   }
 }
 
+TEST(CSSMathExpressionNode, TestExponentialFunctions) {
+  const struct TestCase {
+    const std::string input;
+    const double output;
+  } test_cases[] = {
+      {"hypot(3, 4)", 5.0f}, {"log(100, 10)", 2.0f}, {"sqrt(144)", 12.0f},
+      {"exp(0)", 1.0f},      {"pow(2, 2)", 4.0f},
+  };
+
+  for (const auto& test_case : test_cases) {
+    CSSTokenizer tokenizer(String(test_case.input.c_str()));
+    const auto tokens = tokenizer.TokenizeToEOF();
+    const CSSParserTokenRange range(tokens);
+    const CSSParserContext* context = MakeGarbageCollected<CSSParserContext>(
+        kHTMLStandardMode, SecureContextMode::kInsecureContext);
+    const CSSMathExpressionNode* res = CSSMathExpressionNode::ParseMathFunction(
+        CSSValueID::kCalc, range, *context, kCSSAnchorQueryTypesNone);
+    EXPECT_EQ(res->DoubleValue(), test_case.output);
+    CSSToLengthConversionData resolver;
+    scoped_refptr<const CalculationExpressionNode> node =
+        res->ToCalculationExpression(resolver);
+    EXPECT_EQ(node->Evaluate(FLT_MAX, nullptr), test_case.output);
+  }
+}
+
+TEST(CSSMathExpressionNode, TestExponentialFunctionsSerialization) {
+  const struct TestCase {
+    const String input;
+  } test_cases[] = {
+      {"hypot(3%, 4%)"},
+  };
+
+  for (const auto& test_case : test_cases) {
+    CSSTokenizer tokenizer(test_case.input);
+    const auto tokens = tokenizer.TokenizeToEOF();
+    const CSSParserTokenRange range(tokens);
+    const CSSParserContext* context = MakeGarbageCollected<CSSParserContext>(
+        kHTMLStandardMode, SecureContextMode::kInsecureContext);
+    const CSSMathExpressionNode* res = CSSMathExpressionNode::ParseMathFunction(
+        CSSValueID::kCalc, range, *context, kCSSAnchorQueryTypesNone);
+    EXPECT_EQ(res->CustomCSSText(), test_case.input);
+  }
+}
+
+TEST(CSSMathExpressionNode, TestExponentialFunctionsToCalculationExpression) {
+  const struct TestCase {
+    const CSSMathOperator op;
+    const double output;
+  } test_cases[] = {{CSSMathOperator::kHypot, 5.0f}};
+
+  for (const auto& test_case : test_cases) {
+    CSSMathExpressionOperation::Operands operands{
+        CSSMathExpressionNumericLiteral::Create(
+            3.0f, CSSPrimitiveValue::UnitType::kNumber),
+        CSSMathExpressionNumericLiteral::Create(
+            4.0f, CSSPrimitiveValue::UnitType::kNumber)};
+    const auto* operation = MakeGarbageCollected<CSSMathExpressionOperation>(
+        kCalcNumber, std::move(operands), test_case.op);
+    CSSToLengthConversionData resolver{};
+    scoped_refptr<const CalculationExpressionNode> node =
+        operation->ToCalculationExpression(resolver);
+    EXPECT_EQ(node->Evaluate(FLT_MAX, nullptr), test_case.output);
+    const CSSMathExpressionNode* css_node =
+        CSSMathExpressionOperation::Create(*node);
+    EXPECT_NE(css_node, nullptr);
+  }
+}
+
 }  // anonymous namespace
 
 }  // namespace blink

third_party/blink/renderer/core/css/css_math_operator.cc

diff --git a/third_party/blink/renderer/core/css/css_math_operator.cc b/third_party/blink/renderer/core/css/css_math_operator.cc
index be3de75..135caab 100644
--- a/third_party/blink/renderer/core/css/css_math_operator.cc
+++ b/third_party/blink/renderer/core/css/css_math_operator.cc
@@ -55,6 +55,8 @@
       return "mod";
     case CSSMathOperator::kRem:
       return "rem";
+    case CSSMathOperator::kHypot:
+      return "hypot";
     default:
       NOTREACHED();
       return String();

third_party/blink/renderer/core/css/css_math_operator.h

diff --git a/third_party/blink/renderer/core/css/css_math_operator.h b/third_party/blink/renderer/core/css/css_math_operator.h
index 970952e..eb3ca08 100644
--- a/third_party/blink/renderer/core/css/css_math_operator.h
+++ b/third_party/blink/renderer/core/css/css_math_operator.h
@@ -25,6 +25,7 @@
   kRoundToZero,
   kMod,
   kRem,
+  kHypot,
   kInvalid
 };
 

third_party/blink/renderer/core/css/css_value_keywords.json5

diff --git a/third_party/blink/renderer/core/css/css_value_keywords.json5 b/third_party/blink/renderer/core/css/css_value_keywords.json5
index 8e8472c..5592849 100644
--- a/third_party/blink/renderer/core/css/css_value_keywords.json5
+++ b/third_party/blink/renderer/core/css/css_value_keywords.json5
@@ -1403,6 +1403,13 @@
     "sign",
     "abs",
 
+    // Exponential functions
+    "pow",
+    "sqrt",
+    "hypot",
+    "log",
+    "exp",
+
     //<calc-constant>
     //https://drafts.csswg.org/css-values/#calc-syntax
     "infinity",

third_party/blink/renderer/core/frame/attribution_src_loader.cc

diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/third_party/blink/renderer/core/frame/attribution_src_loader.cc
index 2603dda5..f0116fb8 100644
--- a/third_party/blink/renderer/core/frame/attribution_src_loader.cc
+++ b/third_party/blink/renderer/core/frame/attribution_src_loader.cc
@@ -21,7 +21,6 @@
 #include "components/attribution_reporting/eligibility.h"
 #include "components/attribution_reporting/eligibility_error.mojom-shared.h"
 #include "components/attribution_reporting/os_registration.h"
-#include "components/attribution_reporting/os_support.mojom-shared.h"
 #include "components/attribution_reporting/registration_type.mojom-shared.h"
 #include "components/attribution_reporting/source_registration.h"
 #include "components/attribution_reporting/source_registration_error.mojom-shared.h"
@@ -29,10 +28,11 @@
 #include "components/attribution_reporting/trigger_registration.h"
 #include "components/attribution_reporting/trigger_registration_error.mojom-shared.h"
 #include "mojo/public/cpp/bindings/remote.h"
+#include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/trigger_attestation.h"
+#include "services/network/public/mojom/attribution.mojom-blink.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
-#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/navigation/impression.h"
 #include "third_party/blink/public/common/tokens/tokens.h"
 #include "third_party/blink/public/mojom/conversions/attribution_data_host.mojom-blink.h"
@@ -120,7 +120,7 @@
         web_trigger(map.Get(http_names::kAttributionReportingRegisterTrigger)),
         request_id(request_id) {
     if (base::FeatureList::IsEnabled(
-            blink::features::kAttributionReportingCrossAppWeb)) {
+            network::features::kAttributionReportingCrossAppWeb)) {
       os_source = map.Get(http_names::kAttributionReportingRegisterOSSource);
       os_trigger = map.Get(http_names::kAttributionReportingRegisterOSTrigger);
     }
@@ -448,14 +448,13 @@
   return !!ReportingOriginForUrlIfValid(url, element, request_id, log_issues);
 }
 
-AtomicString AttributionSrcLoader::GetSupportHeader() const {
-  return AtomicString(String::FromUTF8(attribution_reporting::GetSupportHeader(
-      Platform::Current()->GetOsSupportForAttributionReporting())));
+bool AttributionSrcLoader::HasOsSupport() const {
+  return GetOsSupport() == network::mojom::AttributionOsSupport::kEnabled;
 }
 
-bool AttributionSrcLoader::HasOsSupport() const {
-  return Platform::Current()->GetOsSupportForAttributionReporting() ==
-         attribution_reporting::mojom::OsSupport::kEnabled;
+network::mojom::AttributionOsSupport AttributionSrcLoader::GetOsSupport()
+    const {
+  return Platform::Current()->GetOsSupportForAttributionReporting();
 }
 
 bool AttributionSrcLoader::MaybeRegisterAttributionHeaders(

third_party/blink/renderer/core/frame/attribution_src_loader.h

diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.h b/third_party/blink/renderer/core/frame/attribution_src_loader.h
index 8caf607..715fc97 100644
--- a/third_party/blink/renderer/core/frame/attribution_src_loader.h
+++ b/third_party/blink/renderer/core/frame/attribution_src_loader.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include "components/attribution_reporting/registration_type.mojom-blink-forward.h"
+#include "services/network/public/mojom/attribution.mojom-forward.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/tokens/tokens.h"
 #include "third_party/blink/renderer/core/core_export.h"
@@ -84,10 +85,7 @@
 
   void Trace(Visitor* visitor) const;
 
-  // Returns proper value to populate `Attribution-Reporting-Support` request
-  // header. If OS-level attribution is supported, returns "web, os", otherwise
-  // returns "web".
-  AtomicString GetSupportHeader() const;
+  network::mojom::AttributionOsSupport GetOsSupport() const;
 
  private:
   class ResourceClient;

third_party/blink/renderer/core/frame/attribution_src_loader_test.cc

diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader_test.cc b/third_party/blink/renderer/core/frame/attribution_src_loader_test.cc
index 3cb68cb..1f3fa5d 100644
--- a/third_party/blink/renderer/core/frame/attribution_src_loader_test.cc
+++ b/third_party/blink/renderer/core/frame/attribution_src_loader_test.cc
@@ -12,19 +12,19 @@
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
-#include "components/attribution_reporting/os_support.mojom-shared.h"
 #include "components/attribution_reporting/registration_type.mojom-shared.h"
 #include "components/attribution_reporting/source_registration.h"
 #include "components/attribution_reporting/suitable_origin.h"
 #include "components/attribution_reporting/trigger_registration.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
 #include "net/http/structured_headers.h"
+#include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/trigger_attestation.h"
+#include "services/network/public/mojom/attribution.mojom-blink.h"
 #include "services/network/public/mojom/referrer_policy.mojom-blink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
-#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/mojom/conversions/attribution_data_host.mojom-blink.h"
 #include "third_party/blink/public/mojom/conversions/conversions.mojom-blink.h"
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
@@ -58,6 +58,8 @@
 using blink::url_test_helpers::RegisterMockedURLLoad;
 using blink::url_test_helpers::ToKURL;
 
+const char kAttributionReportingSupport[] = "Attribution-Reporting-Support";
+
 class AttributionSrcLocalFrameClient : public EmptyLocalFrameClient {
  public:
   AttributionSrcLocalFrameClient() = default;
@@ -488,7 +490,7 @@
   EXPECT_TRUE(dict->contains("trigger"));
 
   EXPECT_TRUE(client_->request_head()
-                  .HttpHeaderField(http_names::kAttributionReportingSupport)
+                  .HttpHeaderField(kAttributionReportingSupport)
                   .IsNull());
 }
 
@@ -513,7 +515,7 @@
   EXPECT_TRUE(dict->contains("navigation-source"));
 
   EXPECT_TRUE(client_->request_head()
-                  .HttpHeaderField(http_names::kAttributionReportingSupport)
+                  .HttpHeaderField(kAttributionReportingSupport)
                   .IsNull());
 }
 
@@ -538,13 +540,13 @@
 
 class AttributionTestingPlatformSupport : public TestingPlatformSupport {
  public:
-  attribution_reporting::mojom::OsSupport GetOsSupportForAttributionReporting()
+  network::mojom::AttributionOsSupport GetOsSupportForAttributionReporting()
       override {
     return os_support;
   }
 
-  attribution_reporting::mojom::OsSupport os_support =
-      attribution_reporting::mojom::OsSupport::kDisabled;
+  network::mojom::AttributionOsSupport os_support =
+      network::mojom::AttributionOsSupport::kDisabled;
 };
 
 class AttributionSrcLoaderCrossAppWebEnabledTest
@@ -554,13 +556,15 @@
 
  private:
   base::test::ScopedFeatureList scoped_feature_list_{
-      blink::features::kAttributionReportingCrossAppWeb};
+      network::features::kAttributionReportingCrossAppWeb};
 
  protected:
   ScopedTestingPlatformSupport<AttributionTestingPlatformSupport> platform_;
 };
 
 TEST_F(AttributionSrcLoaderCrossAppWebEnabledTest, SupportHeader_Register) {
+  platform_->os_support = network::mojom::AttributionOsSupport::kEnabled;
+
   KURL url = ToKURL("https://example1.com/foo.html");
   RegisterMockedURLLoad(url, test::CoreTestDataPath("foo.html"));
 
@@ -568,19 +572,14 @@
 
   url_test_helpers::ServeAsynchronousRequests();
 
-  const AtomicString& support = client_->request_head().HttpHeaderField(
-      http_names::kAttributionReportingSupport);
-  EXPECT_EQ(support, "web");
-
-  absl::optional<net::structured_headers::Dictionary> dict =
-      net::structured_headers::ParseDictionary(support.Utf8());
-  ASSERT_TRUE(dict);
-  ASSERT_EQ(dict->size(), 1u);
-  EXPECT_TRUE(dict->contains("web"));
+  EXPECT_EQ(client_->request_head().GetAttributionReportingOsSupport(),
+            network::mojom::AttributionOsSupport::kEnabled);
 }
 
 TEST_F(AttributionSrcLoaderCrossAppWebEnabledTest,
        SupportHeader_RegisterNavigation) {
+  platform_->os_support = network::mojom::AttributionOsSupport::kEnabled;
+
   KURL url = ToKURL("https://example1.com/foo.html");
   RegisterMockedURLLoad(url, test::CoreTestDataPath("foo.html"));
 
@@ -590,20 +589,13 @@
 
   url_test_helpers::ServeAsynchronousRequests();
 
-  const AtomicString& support = client_->request_head().HttpHeaderField(
-      http_names::kAttributionReportingSupport);
-  EXPECT_EQ(support, "web");
-
-  absl::optional<net::structured_headers::Dictionary> dict =
-      net::structured_headers::ParseDictionary(support.Utf8());
-  ASSERT_TRUE(dict);
-  ASSERT_EQ(dict->size(), 1u);
-  EXPECT_TRUE(dict->contains("web"));
+  EXPECT_EQ(client_->request_head().GetAttributionReportingOsSupport(),
+            network::mojom::AttributionOsSupport::kEnabled);
 }
 
 #if BUILDFLAG(IS_ANDROID)
 TEST_F(AttributionSrcLoaderCrossAppWebEnabledTest, RegisterOsTrigger) {
-  platform_->os_support = attribution_reporting::mojom::OsSupport::kEnabled;
+  platform_->os_support = network::mojom::AttributionOsSupport::kEnabled;
 
   KURL test_url = ToKURL("https://example1.com/foo.html");
 

third_party/blink/renderer/core/html/html_image_element.h

diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
index 202361a4..c80f20fc3 100644
--- a/third_party/blink/renderer/core/html/html_image_element.h
+++ b/third_party/blink/renderer/core/html/html_image_element.h
@@ -203,6 +203,8 @@
   static bool SupportedImageType(const String& type,
                                  const HashSet<String>* disabled_image_types);
 
+  bool is_lazy_loaded() const { return is_lazy_loaded_; }
+
  protected:
   // Controls how an image element appears in the layout. See:
   // https://html.spec.whatwg.org/C/#image-request

third_party/blink/renderer/core/html/lazy_load_image_observer_test.cc

diff --git a/third_party/blink/renderer/core/html/lazy_load_image_observer_test.cc b/third_party/blink/renderer/core/html/lazy_load_image_observer_test.cc
index 732ab8d..644e98f 100644
--- a/third_party/blink/renderer/core/html/lazy_load_image_observer_test.cc
+++ b/third_party/blink/renderer/core/html/lazy_load_image_observer_test.cc
@@ -210,6 +210,68 @@
       WebFeature::kLazyLoadImageLoadingAttributeLazy));
 }
 
+TEST_P(LazyLoadImagesSimTest, LazyLoadedImageSizeHistograms) {
+  if (!GetParam()) {  // Only test when LazyImage is enabled.
+    return;
+  }
+
+  HistogramTester histogram_tester;
+  SimRequest lazy_a_resource("https://example.com/lazy_a.png", "image/png");
+  SimRequest eager_resource("https://example.com/eager.png", "image/png");
+  SimRequest lazy_b_resource("https://example.com/lazy_b.png", "image/png");
+  LoadMainResource(R"HTML(
+      <img src="lazy_a.png" loading="lazy">
+      <img src="eager.png" loading="eager">
+      <img src="lazy_b.png" loading="lazy">
+    )HTML");
+  Compositor().BeginFrame();
+  test::RunPendingTasks();
+
+  // Initially, no lazy images should have loaded.
+  histogram_tester.ExpectTotalCount("Blink.LazyLoadedImage.Size", 0);
+  histogram_tester.ExpectTotalCount(
+      "Blink.LazyLoadedImageBeforeDocumentOnLoad.Size", 0);
+
+  // Load the first lazy loaded image.
+  lazy_a_resource.Complete(ReadTestImage());
+  Compositor().BeginFrame();
+  test::RunPendingTasks();
+
+  // We should have one lazy load sample, and one before-load lazy load sample.
+  histogram_tester.ExpectTotalCount("Blink.LazyLoadedImage.Size", 1);
+  int size_kb = ReadTestImage().size() / 1024;
+  histogram_tester.ExpectUniqueSample("Blink.LazyLoadedImage.Size", size_kb, 1);
+  ASSERT_FALSE(GetDocument().LoadEventFinished());
+  histogram_tester.ExpectTotalCount(
+      "Blink.LazyLoadedImageBeforeDocumentOnLoad.Size", 1);
+  histogram_tester.ExpectUniqueSample(
+      "Blink.LazyLoadedImageBeforeDocumentOnLoad.Size", size_kb, 1);
+
+  // Load the eager image which completes the document load.
+  eager_resource.Complete(ReadTestImage());
+  Compositor().BeginFrame();
+  test::RunPendingTasks();
+
+  // Load should finish, but because the eager image is not lazy, the lazy load
+  // metrics should not change.
+  ASSERT_TRUE(GetDocument().LoadEventFinished());
+  histogram_tester.ExpectTotalCount("Blink.LazyLoadedImage.Size", 1);
+  histogram_tester.ExpectTotalCount(
+      "Blink.LazyLoadedImageBeforeDocumentOnLoad.Size", 1);
+
+  // Load the second lazy loaded image.
+  lazy_b_resource.Complete(ReadTestImage());
+  Compositor().BeginFrame();
+  test::RunPendingTasks();
+
+  // We should still only have one before-load sample, but we should have two
+  // lazy load samples overall.
+  histogram_tester.ExpectTotalCount("Blink.LazyLoadedImage.Size", 2);
+  histogram_tester.ExpectUniqueSample("Blink.LazyLoadedImage.Size", size_kb, 2);
+  histogram_tester.ExpectTotalCount(
+      "Blink.LazyLoadedImageBeforeDocumentOnLoad.Size", 1);
+}
+
 INSTANTIATE_TEST_SUITE_P(All,
                          LazyLoadImagesSimTest,
                          ::testing::Bool() /*is_lazyload_image_enabled*/);

third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc

diff --git a/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc b/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc
index 837b907..4091171 100644
--- a/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc
+++ b/third_party/blink/renderer/core/html/parser/html_preload_scanner_test.cc
@@ -5,8 +5,9 @@
 #include "third_party/blink/renderer/core/html/parser/html_preload_scanner.h"
 
 #include <memory>
+
 #include "base/strings/stringprintf.h"
-#include "base/test/scoped_feature_list.h"
+#include "services/network/public/mojom/attribution.mojom-blink.h"
 #include "services/network/public/mojom/web_client_hints_types.mojom-blink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/features.h"
@@ -27,6 +28,7 @@
 #include "third_party/blink/renderer/platform/loader/fetch/client_hints_preferences.h"
 #include "third_party/blink/renderer/platform/network/http_names.h"
 #include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
+#include "third_party/blink/renderer/platform/testing/testing_platform_support.h"
 #include "third_party/blink/renderer/platform/testing/url_loader_mock_factory.h"
 #include "third_party/blink/renderer/platform/testing/url_test_helpers.h"
 #include "third_party/blink/renderer/platform/weborigin/security_origin.h"
@@ -104,7 +106,8 @@
   const char* base_url;
   const char* input_html;
   const char* expected_eligible_header;
-  const char* expected_support_header;
+  network::mojom::AttributionOsSupport os_support =
+      network::mojom::AttributionOsSupport::kDisabled;
 };
 
 class HTMLMockHTMLResourcePreloader : public ResourcePreloader {
@@ -246,9 +249,10 @@
     }
   }
 
-  void AttributionSrcRequestVerification(Document* document,
-                                         const char* expected_eligible_header,
-                                         const char* expected_support_header) {
+  void AttributionSrcRequestVerification(
+      Document* document,
+      const char* expected_eligible_header,
+      network::mojom::AttributionOsSupport expected_os_support) {
     ASSERT_TRUE(preload_request_.get());
     Resource* resource = preload_request_->Start(document);
     ASSERT_TRUE(resource);
@@ -256,9 +260,9 @@
     EXPECT_EQ(expected_eligible_header,
               resource->GetResourceRequest().HttpHeaderField(
                   http_names::kAttributionReportingEligible));
-    EXPECT_EQ(expected_support_header,
-              resource->GetResourceRequest().HttpHeaderField(
-                  http_names::kAttributionReportingSupport));
+    EXPECT_EQ(
+        expected_os_support,
+        resource->GetResourceRequest().GetAttributionReportingOsSupport());
   }
 
  protected:
@@ -434,6 +438,10 @@
 
   void Test(AttributionSrcTestCase test_case) {
     SCOPED_TRACE(test_case.input_html);
+
+    ScopedTestingPlatformSupport<AttributionTestingPlatformSupport> platform;
+    platform->os_support = test_case.os_support;
+
     HTMLMockHTMLResourcePreloader preloader(GetDocument().Url());
     KURL base_url(test_case.base_url);
     scanner_->AppendToEnd(String(test_case.input_html));
@@ -441,10 +449,21 @@
     preloader.TakePreloadData(std::move(preload_data));
     preloader.AttributionSrcRequestVerification(
         &GetDocument(), test_case.expected_eligible_header,
-        test_case.expected_support_header);
+        test_case.os_support);
   }
 
  private:
+  class AttributionTestingPlatformSupport : public TestingPlatformSupport {
+   public:
+    network::mojom::AttributionOsSupport GetOsSupportForAttributionReporting()
+        override {
+      return os_support;
+    }
+
+    network::mojom::AttributionOsSupport os_support =
+        network::mojom::AttributionOsSupport::kDisabled;
+  };
+
   std::unique_ptr<HTMLPreloadScanner> scanner_;
 };
 
@@ -1098,9 +1117,6 @@
 }
 
 TEST_F(HTMLPreloadScannerTest, testAttributionSrc) {
-  base::test::ScopedFeatureList scoped_feature_list_{
-      blink::features::kAttributionReportingCrossAppWeb};
-
   static constexpr bool kSecureDocumentUrl = true;
   static constexpr bool kInsecureDocumentUrl = false;
 
@@ -1110,29 +1126,31 @@
   AttributionSrcTestCase test_cases[] = {
       // Insecure context
       {kInsecureDocumentUrl, kSecureBaseURL,
-       "<img src='/image' attributionsrc>", nullptr, nullptr},
+       "<img src='/image' attributionsrc>", nullptr},
       {kInsecureDocumentUrl, kSecureBaseURL,
-       "<script src='/script' attributionsrc></script>", nullptr, nullptr},
+       "<script src='/script' attributionsrc></script>", nullptr},
       // No attributionsrc attribute
-      {kSecureDocumentUrl, kSecureBaseURL, "<img src='/image'>", nullptr,
-       nullptr},
+      {kSecureDocumentUrl, kSecureBaseURL, "<img src='/image'>", nullptr},
       {kSecureDocumentUrl, kSecureBaseURL, "<script src='/script'></script>",
-       nullptr, nullptr},
+       nullptr},
       // Irrelevant element type
       {kSecureDocumentUrl, kSecureBaseURL,
-       "<video poster='/image' attributionsrc>", nullptr, nullptr},
+       "<video poster='/image' attributionsrc>", nullptr},
       // Not potentially trustworthy reporting origin
       {kSecureDocumentUrl, kInsecureBaseURL,
-       "<img src='/image' attributionsrc>", nullptr, nullptr},
+       "<img src='/image' attributionsrc>", nullptr},
       {kSecureDocumentUrl, kInsecureBaseURL,
-       "<script src='/script' attributionsrc></script>", nullptr, nullptr},
+       "<script src='/script' attributionsrc></script>", nullptr},
       // Secure context, potentially trustworthy reporting origin,
       // attributionsrc attribute
       {kSecureDocumentUrl, kSecureBaseURL, "<img src='/image' attributionsrc>",
-       kAttributionEligibleEventSourceAndTrigger, "web"},
+       kAttributionEligibleEventSourceAndTrigger},
       {kSecureDocumentUrl, kSecureBaseURL,
        "<script src='/script' attributionsrc></script>",
-       kAttributionEligibleEventSourceAndTrigger, "web"},
+       kAttributionEligibleEventSourceAndTrigger},
+      {kSecureDocumentUrl, kSecureBaseURL, "<img src='/image' attributionsrc>",
+       kAttributionEligibleEventSourceAndTrigger,
+       network::mojom::AttributionOsSupport::kEnabled},
   };
 
   for (const auto& test_case : test_cases) {

third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc

diff --git a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
index d4eaf32..af5ab889 100644
--- a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+++ b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
@@ -1930,9 +1930,13 @@
   ComputeUsedTrackSizes(sizing_subtree, track_direction, sizing_constraint,
                         /* opt_needs_additional_pass */ nullptr);
 
-  return sizing_subtree.LayoutData()
-      .SizingCollection(track_direction)
-      .TotalTrackSize();
+  const auto border_scrollbar_padding =
+      (track_direction == kForColumns) ? BorderScrollbarPadding().InlineSum()
+                                       : BorderScrollbarPadding().BlockSum();
+
+  return border_scrollbar_padding + sizing_subtree.LayoutData()
+                                        .SizingCollection(track_direction)
+                                        .TotalTrackSize();
 }
 
 // Helpers for the track sizing algorithm.

third_party/blink/renderer/core/layout/ng/ng_fieldset_layout_algorithm_test.cc

diff --git a/third_party/blink/renderer/core/layout/ng/ng_fieldset_layout_algorithm_test.cc b/third_party/blink/renderer/core/layout/ng/ng_fieldset_layout_algorithm_test.cc
index 83176173..d110967 100644
--- a/third_party/blink/renderer/core/layout/ng/ng_fieldset_layout_algorithm_test.cc
+++ b/third_party/blink/renderer/core/layout/ng/ng_fieldset_layout_algorithm_test.cc
@@ -280,11 +280,7 @@
   EXPECT_EQ(expectation, dump);
 }
 
-// Disabled because out-of-flow positioned objects enter legacy code (regardless
-// of the out-of-flow positioned object being laid out by NG or not). Invoking
-// layout on our own outside of the lifecycle machinery will eventually fail a
-// CHECK in SubtreeLayoutScope::SubtreeLayoutScope().
-TEST_F(NGFieldsetLayoutAlgorithmTest, DISABLED_AbsposChild) {
+TEST_F(NGFieldsetLayoutAlgorithmTest, AbsposChild) {
   SetBodyInnerHTML(R"HTML(
     <style>
       fieldset {
@@ -306,7 +302,7 @@
     offset:0,0 size:126x126
       offset:13,0 size:30x30
       offset:3,30 size:120x93
-      offset:3,30 size:120x93
+        offset:0,0 size:120x93
 )DUMP";
   EXPECT_EQ(expectation, dump);
 }

third_party/blink/renderer/core/loader/frame_fetch_context.cc

diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
index eacd6330..88aa530 100644
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -47,7 +47,6 @@
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/common/client_hints/client_hints.h"
 #include "third_party/blink/public/common/device_memory/approximated_device_memory.h"
-#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
 #include "third_party/blink/public/mojom/loader/request_context_frame_type.mojom-blink.h"
 #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h"
@@ -292,21 +291,6 @@
 
   if (GetResourceFetcherProperties().IsDetached())
     return;
-
-  // TODO(crbug.com/1375791): Consider overriding Attribution-Reporting-Support
-  // header.
-  if (base::FeatureList::IsEnabled(
-          blink::features::kAttributionReportingCrossAppWeb) &&
-      !request.HttpHeaderField(http_names::kAttributionReportingEligible)
-           .IsNull() &&
-      request.HttpHeaderField(http_names::kAttributionReportingSupport)
-          .IsNull()) {
-    if (AttributionSrcLoader* attribution_src_loader =
-            GetFrame()->GetAttributionSrcLoader()) {
-      request.AddHttpHeaderField(http_names::kAttributionReportingSupport,
-                                 attribution_src_loader->GetSupportHeader());
-    }
-  }
 }
 
 // TODO(toyoshim, arthursonzogni): PlzNavigate doesn't use this function to set
@@ -378,6 +362,12 @@
   if (document_loader_->ForceFetchCacheMode())
     request.SetCacheMode(*document_loader_->ForceFetchCacheMode());
 
+  if (AttributionSrcLoader* attribution_src_loader =
+          GetFrame()->GetAttributionSrcLoader()) {
+    request.SetAttributionReportingOsSupport(
+        attribution_src_loader->GetOsSupport());
+  }
+
   GetLocalFrameClient()->DispatchWillSendRequest(request);
   FrameScheduler* frame_scheduler = GetFrame()->GetFrameScheduler();
   if (!for_redirect && frame_scheduler) {

third_party/blink/renderer/core/loader/lazy_image_helper.cc

diff --git a/third_party/blink/renderer/core/loader/lazy_image_helper.cc b/third_party/blink/renderer/core/loader/lazy_image_helper.cc
index 41f07d1..465a39bd 100644
--- a/third_party/blink/renderer/core/loader/lazy_image_helper.cc
+++ b/third_party/blink/renderer/core/loader/lazy_image_helper.cc
@@ -4,6 +4,8 @@
 
 #include "third_party/blink/renderer/core/loader/lazy_image_helper.h"
 
+#include "base/metrics/histogram_macros.h"
+#include "base/numerics/safe_conversions.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/element.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
@@ -19,6 +21,16 @@
 
 namespace {
 
+// Records |bytes| to |histogram_name| in kilobytes (i.e., bytes / 1024).
+// https://almanac.httparchive.org/en/2022/page-weight#fig-12 reports the 90th
+// percentile of jpeg images is 213KB with a max of ~64MB. The max bucket size
+// has been set at 64MB to capture this range with as much granularity as
+// possible.
+#define IMAGE_BYTES_HISTOGRAM(histogram_name, bytes)                        \
+  UMA_HISTOGRAM_CUSTOM_COUNTS(histogram_name,                               \
+                              base::saturated_cast<int>((bytes) / 1024), 1, \
+                              64 * 1024, 50)
+
 // Returns true if absolute dimension is specified in the width and height
 // attributes or in the inline style.
 bool IsDimensionAbsoluteLarge(const HTMLImageElement& html_image) {
@@ -149,6 +161,19 @@
 
 void LazyImageHelper::RecordMetricsOnLoadFinished(
     HTMLImageElement* image_element) {
+  if (image_element->is_lazy_loaded()) {
+    if (ImageResourceContent* content = image_element->CachedImage()) {
+      int64_t response_size = content->GetResponse().EncodedDataLength();
+      IMAGE_BYTES_HISTOGRAM("Blink.LazyLoadedImage.Size", response_size);
+      if (Document* document = GetRootDocumentOrNull(image_element)) {
+        if (!document->LoadEventFinished()) {
+          IMAGE_BYTES_HISTOGRAM(
+              "Blink.LazyLoadedImageBeforeDocumentOnLoad.Size", response_size);
+        }
+      }
+    }
+  }
+
   if (!RuntimeEnabledFeatures::LazyImageVisibleLoadTimeMetricsEnabled())
     return;
   if (Document* document = GetRootDocumentOrNull(image_element)) {

third_party/blink/renderer/core/paint/svg_object_painter.cc

diff --git a/third_party/blink/renderer/core/paint/svg_object_painter.cc b/third_party/blink/renderer/core/paint/svg_object_painter.cc
index 15d07bf..2b92e42 100644
--- a/third_party/blink/renderer/core/paint/svg_object_painter.cc
+++ b/third_party/blink/renderer/core/paint/svg_object_painter.cc
@@ -84,8 +84,9 @@
     const Longhand& property = apply_to_fill
                                    ? To<Longhand>(GetCSSPropertyFill())
                                    : To<Longhand>(GetCSSPropertyStroke());
-    const Color color = style.VisitedDependentColor(property);
-    flags.setColor(ScaleAlpha(color.Rgb(), alpha));
+    flags.setColor(style.VisitedDependentColor(property)
+                       .CombineWithAlpha(alpha)
+                       .toSkColor4f());
     flags.setShader(nullptr);
     ApplyColorInterpolation(style, flags);
     return true;

third_party/blink/renderer/platform/geometry/calculation_expression_node.cc

diff --git a/third_party/blink/renderer/platform/geometry/calculation_expression_node.cc b/third_party/blink/renderer/platform/geometry/calculation_expression_node.cc
index ce0c5e4..497ebf9 100644
--- a/third_party/blink/renderer/platform/geometry/calculation_expression_node.cc
+++ b/third_party/blink/renderer/platform/geometry/calculation_expression_node.cc
@@ -4,6 +4,10 @@
 
 #include "third_party/blink/renderer/platform/geometry/calculation_expression_node.h"
 
+#include <cfloat>
+#include <numeric>
+
+#include "base/memory/scoped_refptr.h"
 #include "base/notreached.h"
 #include "base/ranges/algorithm.h"
 #include "third_party/blink/renderer/platform/geometry/length_functions.h"
@@ -200,6 +204,31 @@
             std::move(children), op);
       }
     }
+    case CalculationOperator::kHypot: {
+      DCHECK_GE(children.size(), 1u);
+      Vector<float> operand_pixels;
+      operand_pixels.reserve(children.size());
+      bool can_simplify = true;
+      for (auto& child : children) {
+        const auto* pixels_and_percent =
+            DynamicTo<CalculationExpressionPixelsAndPercentNode>(*child);
+        if (!pixels_and_percent || pixels_and_percent->Percent()) {
+          can_simplify = false;
+          break;
+        }
+        operand_pixels.push_back(pixels_and_percent->Pixels());
+      }
+      if (can_simplify) {
+        float value = 0;
+        for (float operand : operand_pixels) {
+          value = std::hypot(value, operand);
+        }
+        return base::MakeRefCounted<CalculationExpressionPixelsAndPercentNode>(
+            PixelsAndPercent(value, 0));
+      }
+      return base::MakeRefCounted<CalculationExpressionOperationNode>(
+          std::move(children), op);
+    }
     case CalculationOperator::kInvalid:
       NOTREACHED();
       return nullptr;
@@ -284,6 +313,15 @@
       float b = children_[1]->Evaluate(max_value, anchor_evaluator);
       return EvaluateSteppedValueFunction(operator_, a, b);
     }
+    case CalculationOperator::kHypot: {
+      DCHECK_GE(children_.size(), 1u);
+      float value = 0;
+      for (scoped_refptr<const CalculationExpressionNode> operand : children_) {
+        float a = operand->Evaluate(max_value, anchor_evaluator);
+        value = std::hypot(value, a);
+      }
+      return value;
+    }
     case CalculationOperator::kInvalid:
       break;
       // TODO(crbug.com/1284199): Support other math functions.
@@ -330,7 +368,8 @@
     case CalculationOperator::kRoundDown:
     case CalculationOperator::kRoundToZero:
     case CalculationOperator::kMod:
-    case CalculationOperator::kRem: {
+    case CalculationOperator::kRem:
+    case CalculationOperator::kHypot: {
       DCHECK(children_.size());
       Vector<scoped_refptr<const CalculationExpressionNode>> cloned_operands;
       cloned_operands.reserve(children_.size());
@@ -385,7 +424,8 @@
     case CalculationOperator::kRoundDown:
     case CalculationOperator::kRoundToZero:
     case CalculationOperator::kMod:
-    case CalculationOperator::kRem: {
+    case CalculationOperator::kRem:
+    case CalculationOperator::kHypot: {
       DCHECK(children_.size());
       auto first_child_type = children_.front()->ResolvedResultType();
       for (const auto& child : children_) {

third_party/blink/renderer/platform/geometry/calculation_expression_node.h

diff --git a/third_party/blink/renderer/platform/geometry/calculation_expression_node.h b/third_party/blink/renderer/platform/geometry/calculation_expression_node.h
index 8f292c24..82464ed2 100644
--- a/third_party/blink/renderer/platform/geometry/calculation_expression_node.h
+++ b/third_party/blink/renderer/platform/geometry/calculation_expression_node.h
@@ -28,6 +28,7 @@
   kRoundToZero,
   kMod,
   kRem,
+  kHypot,
   kInvalid
 };
 

third_party/blink/renderer/platform/geometry/calculation_expression_node_test.cc

diff --git a/third_party/blink/renderer/platform/geometry/calculation_expression_node_test.cc b/third_party/blink/renderer/platform/geometry/calculation_expression_node_test.cc
index a150e28..e33fe0b 100644
--- a/third_party/blink/renderer/platform/geometry/calculation_expression_node_test.cc
+++ b/third_party/blink/renderer/platform/geometry/calculation_expression_node_test.cc
@@ -92,6 +92,42 @@
   EXPECT_EQ(operation_rem_two_mods->Evaluate(FLT_MAX, nullptr), 1.f);
 }
 
+static scoped_refptr<CalculationExpressionOperationNode>
+BuildHypotOperationNode(Vector<float> numbers) {
+  CalculationExpressionOperationNode::Children operands;
+  for (float number : numbers) {
+    scoped_refptr<CalculationExpressionNumberNode> operand =
+        base::MakeRefCounted<CalculationExpressionNumberNode>(number);
+    operands.push_back(operand);
+  }
+  scoped_refptr<CalculationExpressionOperationNode> operation =
+      base::MakeRefCounted<CalculationExpressionOperationNode>(
+          std::move(operands), CalculationOperator::kHypot);
+  return operation;
+}
+
+TEST(CalculationExpressionOperationNodeTest, ExponentialFunctions) {
+  EXPECT_EQ(BuildHypotOperationNode({3.f, 4.f})->Evaluate(FLT_MAX, nullptr),
+            5.f);
+  EXPECT_EQ(BuildHypotOperationNode({3e37f, 4e37f})->Evaluate(FLT_MAX, nullptr),
+            5e37f);
+  EXPECT_EQ(
+      BuildHypotOperationNode({8e-46f, 15e-46f})->Evaluate(FLT_MAX, nullptr),
+      17e-46f);
+  EXPECT_EQ(BuildHypotOperationNode({6e37f, 6e37f, 17e37})
+                ->Evaluate(FLT_MAX, nullptr),
+            19e37f);
+  EXPECT_EQ(BuildHypotOperationNode({-3.f, 4.f})->Evaluate(FLT_MAX, nullptr),
+            5.f);
+  EXPECT_EQ(BuildHypotOperationNode({-3.f, -4.f})->Evaluate(FLT_MAX, nullptr),
+            5.f);
+  EXPECT_EQ(BuildHypotOperationNode({-0.f, +0.f})->Evaluate(FLT_MAX, nullptr),
+            +0.f);
+  EXPECT_EQ(BuildHypotOperationNode({6e37f, -6e37f, -17e37})
+                ->Evaluate(FLT_MAX, nullptr),
+            19e37f);
+}
+
 }  // namespace
 
 }  // namespace blink

third_party/blink/renderer/platform/graphics/canvas_resource.cc

diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource.cc b/third_party/blink/renderer/platform/graphics/canvas_resource.cc
index 7d8e5aa..7e7a905 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_resource.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_resource.cc
@@ -1047,16 +1047,27 @@
   sync_token_ = sii->GenVerifiedSyncToken();
   raster_interface->WaitSyncTokenCHROMIUM(sync_token_.GetData());
 
+  // Relinquish shared image access before copy when using legacy GL raster.
+  if (!use_oop_rasterization_) {
+    raster_interface->EndSharedImageAccessDirectCHROMIUM(
+        back_buffer_texture_id_);
+  }
   // PresentSwapChain() flips the front and back buffers, but the mailboxes
   // still refer to the current front and back buffer after present.  So the
   // front buffer contains the content we just rendered, and it needs to be
   // copied into the back buffer to support a retained mode like canvas expects.
   // The wait sync token ensure that the present executes before we do the copy.
+  // Don't generate sync token after the copy so that it's not on critical path.
   raster_interface->CopySharedImage(front_buffer_mailbox_, back_buffer_mailbox_,
                                     GL_TEXTURE_2D, 0, 0, 0, 0, size_.width(),
                                     size_.height(), false /* unpack_flip_y */,
                                     false /* unpack_premultiply_alpha */);
-  // Don't generate sync token here so that the copy is not on critical path.
+  // Restore shared image access after copy when using legacy GL raster.
+  if (!use_oop_rasterization_) {
+    raster_interface->BeginSharedImageAccessDirectCHROMIUM(
+        back_buffer_texture_id_,
+        GL_SHARED_IMAGE_ACCESS_MODE_READWRITE_CHROMIUM);
+  }
 }
 
 base::WeakPtr<WebGraphicsContext3DProviderWrapper>

third_party/blink/renderer/platform/graphics/color.cc

diff --git a/third_party/blink/renderer/platform/graphics/color.cc b/third_party/blink/renderer/platform/graphics/color.cc
index ce3b6c4b..dd9984e 100644
--- a/third_party/blink/renderer/platform/graphics/color.cc
+++ b/third_party/blink/renderer/platform/graphics/color.cc
@@ -63,10 +63,6 @@
   return static_cast<int>(c / alpha);
 }
 
-int ColorFloatToRGBAByte(float f) {
-  return ClampTo(static_cast<int>(lroundf(255.0f * f)), 0, 255);
-}
-
 // originally moved here from the CSS parser
 template <typename CharacterType>
 inline bool ParseHexColorInternal(const CharacterType* name,
@@ -1011,12 +1007,6 @@
                static_cast<int>(multiplier * b * scale_factor), Alpha());
 }
 
-Color Color::CombineWithAlpha(float other_alpha) const {
-  RGBA32 rgb_only = Rgb() & 0x00FFFFFF;
-  float override_alpha = (Alpha() / 255.f) * other_alpha;
-  return Color(rgb_only | ColorFloatToRGBAByte(override_alpha) << 24);
-}
-
 Color Color::Blend(const Color& source) const {
   // TODO(https://crbug.com/1333988): Implement CSS Color level 4 blending.
   if (!Alpha() || !source.HasAlpha())

third_party/blink/renderer/platform/graphics/color.h

diff --git a/third_party/blink/renderer/platform/graphics/color.h b/third_party/blink/renderer/platform/graphics/color.h
index 30ebe52..2b8dadd 100644
--- a/third_party/blink/renderer/platform/graphics/color.h
+++ b/third_party/blink/renderer/platform/graphics/color.h
@@ -297,7 +297,16 @@
   Color Light() const;
   Color Dark() const;
 
-  Color CombineWithAlpha(float other_alpha) const;
+  Color CombineWithAlpha(float other_alpha) const& {
+    Color color = *this;
+    color.alpha_ *= other_alpha;
+    return color;
+  }
+
+  Color&& CombineWithAlpha(float other_alpha) && {
+    alpha_ *= other_alpha;
+    return std::move(*this);
+  }
 
   // This is an implementation of Porter-Duff's "source-over" equation
   // TODO(https://crbug.com/1333988): Implement CSS Color level 4 blending,

third_party/blink/renderer/platform/graphics/color_test.cc

diff --git a/third_party/blink/renderer/platform/graphics/color_test.cc b/third_party/blink/renderer/platform/graphics/color_test.cc
index 6837c51..034593c30 100644
--- a/third_party/blink/renderer/platform/graphics/color_test.cc
+++ b/third_party/blink/renderer/platform/graphics/color_test.cc
@@ -36,6 +36,10 @@
 namespace blink {
 namespace {
 
+using ::testing::TestParamInfo;
+using ::testing::TestWithParam;
+using ::testing::ValuesIn;
+
 Color CreateSRGBColor(float r, float g, float b, float a) {
   return Color::FromColorSpace(Color::ColorSpace::kSRGB, r, g, b, a);
 }
@@ -659,4 +663,82 @@
   }
 }
 
+namespace {
+
+struct CombineWithAlphaParams {
+  std::string testcase_name;
+  Color color;
+  float alpha;
+  Color expected;
+};
+
+using CombineWithAlphaTest = TestWithParam<CombineWithAlphaParams>;
+
+TEST_P(CombineWithAlphaTest, LValueColor) {
+  Color color = GetParam().color;
+  EXPECT_EQ(color.CombineWithAlpha(GetParam().alpha), GetParam().expected);
+  EXPECT_EQ(color, GetParam().color);
+}
+
+TEST_P(CombineWithAlphaTest, RValueColor) {
+  Color color = GetParam().color;
+  EXPECT_EQ(std::move(color).CombineWithAlpha(GetParam().alpha),
+            GetParam().expected);
+  EXPECT_EQ(color, GetParam().expected);  // NOLINT(bugprone-use-after-move)
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    CombineWithAlphaTests,
+    CombineWithAlphaTest,
+    ValuesIn<CombineWithAlphaParams>({
+        {.testcase_name = "OpaqueOpaque",
+         .color = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 1.0f),
+         .alpha = 1.0f,
+         .expected = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 1.0f)},
+
+        {.testcase_name = "TransparentOpaque",
+         .color = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.6f),
+         .alpha = 1.0f,
+         .expected = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.6f)},
+
+        {.testcase_name = "OpaqueTransparent",
+         .color = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 1.0f),
+         .alpha = 0.6f,
+         .expected = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.6f)},
+
+        {.testcase_name = "TransparentTransparent",
+         .color = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.6f),
+         .alpha = 0.6f,
+         .expected = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.36f)},
+
+        {.testcase_name = "ColorAlphaLargerThanOne",
+         .color = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 2.0f),
+         .alpha = 0.25f,
+         .expected = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.5f)},
+
+        {.testcase_name = "OtherAlphaLargerThanOne",
+         .color = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.25f),
+         .alpha = 2.0f,
+         .expected = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 0.5f)},
+
+        {.testcase_name = "ResultAlphaLargerThanOne",
+         .color = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 1.5f),
+         .alpha = 2.0f,
+         .expected = Color::FromRGBAFloat(0.4f, 0.5f, 0.6f, 3.0f)},
+
+        {.testcase_name = "NonDefaultColorSpace",
+         .color = Color::FromHSLA(0.4f, 0.5f, 0.6f, 0.6f),
+         .alpha = 0.6f,
+         .expected = Color::FromHSLA(0.4f, 0.5f, 0.6f, 0.36f)},
+
+        {.testcase_name = "IntegerColors",
+         .color = Color::FromRGBA(100, 200, 60, 102),
+         .alpha = 0.5f,
+         .expected = Color::FromRGBA(100, 200, 60, 51)},
+    }),
+    [](const TestParamInfo<CombineWithAlphaParams>& info) {
+      return info.param.testcase_name;
+    });
+
+}  // namespace
 }  // namespace blink

third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc

diff --git a/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc b/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc
index b06a15dd9..86ff7d2 100644
--- a/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc
+++ b/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc
@@ -28,11 +28,13 @@
 #include <memory>
 #include <utility>
 
+#include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
+#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/renderer/platform/graphics/decoding_image_generator.h"
 #include "third_party/blink/renderer/platform/graphics/image_decoding_store.h"
 #include "third_party/blink/renderer/platform/graphics/image_frame_generator.h"
@@ -384,6 +386,13 @@
 }
 
 void DeferredImageDecoder::ActivateLazyGainmapDecoding() {
+  // Gate this behind a feature flag.
+  static bool feature_enabled =
+      base::FeatureList::IsEnabled(blink::features::kGainmapHdrImages);
+  if (!feature_enabled) {
+    return;
+  }
+
   // Early-out if we have excluded the possibility that this image has a
   // gainmap, or if we have already created the gainmap frame generator.
   if (!might_have_gainmap_ || gainmap_) {

third_party/blink/renderer/platform/loader/fetch/resource_request.cc

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.cc b/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
index a48882e7..671d7fb 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.cc
@@ -222,6 +222,7 @@
   request->SetRecursivePrefetchToken(RecursivePrefetchToken());
   request->SetFetchLikeAPI(IsFetchLikeAPI());
   request->SetFavicon(IsFavicon());
+  request->SetAttributionReportingOsSupport(GetAttributionReportingOsSupport());
 
   return request;
 }

third_party/blink/renderer/platform/loader/fetch/resource_request.h

diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.h b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
index 6ea7afa7..73eda7d 100644
--- a/third_party/blink/renderer/platform/loader/fetch/resource_request.h
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
@@ -36,6 +36,7 @@
 #include "net/cookies/site_for_cookies.h"
 #include "net/filter/source_stream.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
+#include "services/network/public/mojom/attribution.mojom-blink.h"
 #include "services/network/public/mojom/chunked_data_pipe_getter.mojom-blink-forward.h"
 #include "services/network/public/mojom/cors.mojom-blink-forward.h"
 #include "services/network/public/mojom/fetch_api.mojom-blink.h"
@@ -551,6 +552,16 @@
   }
   bool GetHasStorageAccess() const { return has_storage_access_; }
 
+  network::mojom::AttributionOsSupport GetAttributionReportingOsSupport()
+      const {
+    return attribution_reporting_os_support_;
+  }
+
+  void SetAttributionReportingOsSupport(
+      network::mojom::AttributionOsSupport os_support) {
+    attribution_reporting_os_support_ = os_support;
+  }
+
  private:
   const CacheControlHeader& GetCacheControlHeader() const;
 
@@ -670,6 +681,9 @@
       devtools_accepted_stream_types_;
 
   bool has_storage_access_ = false;
+
+  network::mojom::AttributionOsSupport attribution_reporting_os_support_ =
+      network::mojom::AttributionOsSupport::kDisabled;
 };
 
 class PLATFORM_EXPORT ResourceRequestBody {

third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc

diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc
index 03d26352..7fffc8e6 100644
--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/request_conversion.cc
@@ -402,6 +402,9 @@
   }
 
   dest->has_storage_access = src.GetHasStorageAccess();
+
+  dest->attribution_reporting_os_support =
+      src.GetAttributionReportingOsSupport();
 }
 
 }  // namespace blink

third_party/blink/renderer/platform/network/http_names.json5

diff --git a/third_party/blink/renderer/platform/network/http_names.json5 b/third_party/blink/renderer/platform/network/http_names.json5
index c835a3d..23fcdca 100644
--- a/third_party/blink/renderer/platform/network/http_names.json5
+++ b/third_party/blink/renderer/platform/network/http_names.json5
@@ -30,7 +30,6 @@
     "Attribution-Reporting-Register-OS-Trigger",
     "Attribution-Reporting-Register-Source",
     "Attribution-Reporting-Register-Trigger",
-    "Attribution-Reporting-Support",
     "Cache-Control",
     "Content-DPR",
     "Content-Disposition",

third_party/blink/renderer/platform/runtime_enabled_features.json5

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 009feff..92334d4 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -800,6 +800,10 @@
       base_feature: "none",
     },
     {
+      name: "CSSExponentialFunctions",
+      status: "experimental",
+    },
+    {
       name: "CSSFocusVisible",
       status: "stable",
       base_feature: "none",
@@ -2747,6 +2751,7 @@
     },
     {
       name: "QuickIntensiveWakeUpThrottlingAfterLoading",
+      status: "stable",
     },
     {
       name: "QuotaChange",

third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc

diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc
index 161b298..1c58fb0 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc
@@ -2182,8 +2182,9 @@
   mock_main_thread_scheduler.Shutdown();
 }
 
-// Verify that tasks run at the expected time in frame that is same-origin with
-// the main frame with intensive wake up throttling.
+// Verify that tasks run at the expected time in a frame that is same-origin
+// with the main frame, on a page that isn't loading when hidden ("quick"
+// intensive wake up throttling kicks in).
 TEST_P(FrameSchedulerImplTestWithIntensiveWakeUpThrottling,
        TaskExecutionSameOriginFrame) {
   ASSERT_FALSE(frame_scheduler_->IsCrossOriginToNearestMainFrame());
@@ -2199,6 +2200,7 @@
   const base::TimeTicks test_start = base::TimeTicks::Now();
 
   // Hide the page. This starts the delay to throttle background wake ups.
+  EXPECT_FALSE(page_scheduler_->IsLoading());
   EXPECT_TRUE(page_scheduler_->IsPageVisible());
   page_scheduler_->SetPageVisible(false);
 
@@ -2229,16 +2231,20 @@
   // Test that wake ups are 1-second aligned if there is no recent wake up.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(5));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(1));
     std::vector<base::TimeTicks> run_times;
 
-    task_runner->PostDelayedTask(FROM_HERE,
-                                 base::BindOnce(&RecordRunTime, &run_times),
-                                 kDefaultThrottledWakeUpInterval);
+    // Schedule task to run 1 minute after the last one.
+    const base::TimeTicks last_task_run_at = test_start + base::Seconds(5);
+    const base::TimeDelta delay =
+        last_task_run_at + kIntensiveThrottledWakeUpInterval - scope_start;
+    EXPECT_EQ(delay, base::Seconds(5));
 
-    task_environment_.FastForwardBy(kDefaultThrottledWakeUpInterval);
-    EXPECT_THAT(run_times,
-                testing::ElementsAre(scope_start + base::Seconds(1)));
+    task_runner->PostDelayedTask(
+        FROM_HERE, base::BindOnce(&RecordRunTime, &run_times), delay);
+
+    task_environment_.FastForwardBy(delay);
+    EXPECT_THAT(run_times, testing::ElementsAre(scope_start + delay));
   }
 
   // Test that if there is a recent wake up:
@@ -2246,7 +2252,7 @@
   //   Otherwise:                               Wake ups are 1-second aligned
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(5) + base::Seconds(1));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(1) + base::Seconds(5));
     std::vector<base::TimeTicks> run_times;
 
     for (int i = 0; i < kNumTasks; ++i) {
@@ -2258,7 +2264,10 @@
     FastForwardToAlignedTime(kIntensiveThrottledWakeUpInterval);
 
     if (IsIntensiveThrottlingExpected()) {
-      const base::TimeTicks aligned_time = scope_start + base::Seconds(59);
+      const base::TimeTicks aligned_time = scope_start + base::Seconds(55);
+      EXPECT_EQ(aligned_time.SnappedToNextTick(
+                    base::TimeTicks(), kIntensiveThrottledWakeUpInterval),
+                aligned_time);
       EXPECT_THAT(run_times,
                   testing::ElementsAre(aligned_time, aligned_time, aligned_time,
                                        aligned_time, aligned_time));
@@ -2277,7 +2286,7 @@
   // otherwise.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(6));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(2));
     std::vector<base::TimeTicks> run_times;
 
     task_runner->PostDelayedTask(FROM_HERE,
@@ -2296,7 +2305,7 @@
   // minute.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(7));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(3));
     std::vector<base::TimeTicks> run_times;
 
     const base::TimeDelta kLongDelay =
@@ -2315,7 +2324,7 @@
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
     EXPECT_EQ(scope_start,
-              test_start + base::Minutes(12) + kDefaultThrottledWakeUpInterval);
+              test_start + base::Minutes(8) + kDefaultThrottledWakeUpInterval);
     std::vector<base::TimeTicks> run_times;
 
     page_scheduler_->OnTitleOrFaviconUpdated();
@@ -2402,7 +2411,7 @@
   // the last minute). Otherwise, it should be 1-second aligned.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(5));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(1));
     std::vector<base::TimeTicks> run_times;
 
     task_runner->PostDelayedTask(FROM_HERE,
@@ -2419,7 +2428,7 @@
   // otherwise.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(6));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(2));
     std::vector<base::TimeTicks> run_times;
 
     for (int i = 0; i < kNumTasks; ++i) {
@@ -2451,7 +2460,7 @@
   // otherwise.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(7));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(3));
     std::vector<base::TimeTicks> run_times;
 
     task_runner->PostDelayedTask(FROM_HERE,
@@ -2470,7 +2479,7 @@
   // should be 1-second aligned.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(8));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(4));
     std::vector<base::TimeTicks> run_times;
 
     const base::TimeDelta kLongDelay = kIntensiveThrottledWakeUpInterval * 6;
@@ -2488,7 +2497,7 @@
   // or favicon update. Otherwise, they should be 1-second aligned.
   {
     const base::TimeTicks scope_start = base::TimeTicks::Now();
-    EXPECT_EQ(scope_start, test_start + base::Minutes(14));
+    EXPECT_EQ(scope_start, test_start + base::Minutes(10));
     std::vector<base::TimeTicks> run_times;
 
     page_scheduler_->OnTitleOrFaviconUpdated();
@@ -2581,6 +2590,72 @@
   }
 }
 
+// Verify that intensive wake up throttling starts after 5 minutes instead of 1
+// minute if the page is loading when hidden.
+TEST_P(FrameSchedulerImplTestWithIntensiveWakeUpThrottling,
+       TaskExecutionPageLoadingWhenHidden) {
+  ASSERT_FALSE(frame_scheduler_->IsCrossOriginToNearestMainFrame());
+
+  // Throttled TaskRunner to which tasks are posted in this test.
+  const scoped_refptr<base::SingleThreadTaskRunner> task_runner =
+      GetTaskRunner();
+
+  // Snap the time to a multiple of
+  // |kIntensiveThrottledWakeUpInterval|. Otherwise, the time at which
+  // tasks can run after throttling is enabled will vary.
+  FastForwardToAlignedTime(kIntensiveThrottledWakeUpInterval);
+  const base::TimeTicks test_start = base::TimeTicks::Now();
+
+  // Create a main frame and simulate a load in it.
+  std::unique_ptr<FrameSchedulerImpl> main_frame_scheduler =
+      CreateFrameScheduler(page_scheduler_.get(),
+                           frame_scheduler_delegate_.get(),
+                           /*is_in_embedded_frame_tree=*/false,
+                           FrameScheduler::FrameType::kMainFrame);
+  main_frame_scheduler->DidCommitProvisionalLoad(
+      /*is_web_history_inert_commit=*/false,
+      /*navigation_type=*/FrameScheduler::NavigationType::kOther);
+  EXPECT_TRUE(page_scheduler_->IsLoading());
+
+  // Hide the page. This starts the delay to throttle background wake ups.
+  EXPECT_TRUE(page_scheduler_->IsPageVisible());
+  page_scheduler_->SetPageVisible(false);
+
+  // Wake ups are only "intensively" throttled after 5 minutes.
+  std::vector<base::TimeTicks> run_times;
+  task_runner->PostDelayedTask(
+      FROM_HERE, base::BindOnce(&RecordRunTime, &run_times), base::Seconds(59));
+  task_runner->PostDelayedTask(FROM_HERE,
+                               base::BindOnce(&RecordRunTime, &run_times),
+                               base::Seconds(297));
+  task_runner->PostDelayedTask(FROM_HERE,
+                               base::BindOnce(&RecordRunTime, &run_times),
+                               base::Seconds(298));
+  task_runner->PostDelayedTask(FROM_HERE,
+                               base::BindOnce(&RecordRunTime, &run_times),
+                               base::Seconds(300));
+  task_runner->PostDelayedTask(FROM_HERE,
+                               base::BindOnce(&RecordRunTime, &run_times),
+                               base::Seconds(301));
+
+  task_environment_.FastForwardBy(base::Minutes(7));
+
+  if (IsIntensiveThrottlingExpected()) {
+    EXPECT_THAT(run_times, testing::ElementsAre(test_start + base::Seconds(59),
+                                                test_start + base::Seconds(297),
+                                                test_start + base::Seconds(298),
+                                                test_start + base::Seconds(300),
+                                                test_start + base::Minutes(6)));
+  } else {
+    EXPECT_THAT(run_times,
+                testing::ElementsAre(test_start + base::Seconds(59),
+                                     test_start + base::Seconds(297),
+                                     test_start + base::Seconds(298),
+                                     test_start + base::Seconds(300),
+                                     test_start + base::Seconds(301)));
+  }
+}
+
 // Verify that intensive throttling is disabled when there is an opt-out.
 TEST_P(FrameSchedulerImplTestWithIntensiveWakeUpThrottling,
        AggressiveThrottlingOptOut) {

third_party/blink/web_tests/TestExpectations

diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index fb12f56..55333a9 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -6863,4 +6863,4 @@
 crbug.com/1432448 external/wpt/webnn/* [ Failure ]
 
 # Sheriff 2023-04-13
-crbug.com/1432763 [ Linux ] external/wpt/fetch/metadata/generated/element-picture.https.sub.html [ Crash Pass Timeout ]
\ No newline at end of file
+crbug.com/1432763 [ Linux ] external/wpt/fetch/metadata/generated/element-picture.https.sub.html [ Crash Pass Timeout ]

third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json

diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
index 3a155c89..900fb2e 100644
--- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
+++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
@@ -269813,11 +269813,11 @@
   "support": {
    ".cache": {
     "gitignore2.json": [
-     "3aac8d3af3f5429aa2df64b62fd8fdc799d1f28e",
+     "2974606dfd61fd50081a3ff3cb92b88ad669f833",
      []
     ],
     "mtime.json": [
-     "58d22a6a1a7c1b688da68c6b54b657483fe27ef3",
+     "475b2dbc5076b7483788c571a2cdca6f6950791b",
      []
     ]
    },
@@ -304679,7 +304679,7 @@
        []
       ],
       "baseline-001.html.ini": [
-       "4c85dd9b7193428d24f01b2fc1e9ca7d29415d19",
+       "a190c9ea8cad34718b1b705e83851ad935be55ed",
        []
       ],
       "grid-gap-001-ref.html": [
@@ -321718,6 +321718,10 @@
       }
      },
      "word-break": {
+      "break-boundary-2-chars-001.html.ini": [
+       "80724a7cb833d2a8ee2423d51b370340997cf1fe",
+       []
+      ],
       "reference": {
        "break-boundary-2-chars-001-ref.html": [
         "e0702afce52b2cc3eadbdc200e91180239e8a6b1",
@@ -323813,6 +323817,10 @@
       "4213558575242110a545f45c46c0513103bb6fe2",
       []
      ],
+     "preserve3d-and-flattening-z-order-006.html.ini": [
+      "742b4b38e8fd59687657c1c7f2200b604afff8d9",
+      []
+     ],
      "preserve3d-and-flattening-z-order-008.html.ini": [
       "a6cc0fb84f8871f3372b6fe8398d0e654f54ed89",
       []
@@ -326598,6 +326606,10 @@
        "0d57390a693bd6e3996478bca6da9c10e6b64d75",
        []
       ],
+      "kind-of-widget-fallback-input-reset-border-image-outset-001.html.ini": [
+       "70fbacf048827134451d579d246a600a42a5c92c",
+       []
+      ],
       "kind-of-widget-fallback-input-reset-border-image-source-001.html.ini": [
        "a911df1e36bb92f5c4da85931bc273900eb17c2c",
        []
@@ -326855,7 +326867,7 @@
        []
       ],
       "kind-of-widget-fallback-input-submit-border-image-repeat-001.html.ini": [
-       "8ea1424e8d0d268bbdc7b5373d1c6f87b5bd62bd",
+       "8231ecbb222b79927cb28b3b18a1a29ed1bff0b5",
        []
       ],
       "kind-of-widget-fallback-input-submit-border-image-slice-001.html.ini": [
@@ -333772,7 +333784,7 @@
       []
      ],
      "backdrop-filter-clip-rounded-clip.html.ini": [
-      "6f3f2000b90673e54c0040b1d8b1e73fe3d7a4b3",
+      "ab583f54ad82674c03ae38c49ccd9a44d3305d8d",
       []
      ],
      "backdrop-filter-clipped-ref.html": [
@@ -353175,6 +353187,18 @@
         "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
         []
        ],
+       "iframe-popup-about-blank.https.window-expected.txt": [
+        "4d7977ccb09ac52c9798d779f680d39ea2584a70",
+        []
+       ],
+       "iframe-popup-about-blank.https.window.js.headers": [
+        "19d0dbe4e18df8ba52c2a564853f5614a0469b95",
+        []
+       ],
+       "iframe-popup-about-blank.https.window.js.ini": [
+        "c4933cfe35557073d0c405357a57ea9607124979",
+        []
+       ],
        "iframe-popup-to-so.https.html.headers": [
         "d5c99062d2bb8f9660b68c172754867b598ed43f",
         []
@@ -378202,7 +378226,7 @@
       []
      ],
      "mock-pressure-service.js": [
-      "21811ed52da2cd4f6782b390d848d0085d0849cc",
+      "02d10f856ae458a055844cded2c83e205a732bb4",
       []
      ],
      "mock-pressure-service.js.headers": [
@@ -423254,7 +423278,7 @@
      ]
     ],
     "compute_pressure_duplicate_updates.tentative.https.any.js": [
-     "b5d7690d18295b82bf052faa3a7c93cc5ecc024a",
+     "dde92932dd14e7d8d2b65fcd49c947db8dda5fff",
      [
       "compute-pressure/compute_pressure_duplicate_updates.tentative.https.any.html",
       {
@@ -423314,7 +423338,7 @@
      ]
     ],
     "compute_pressure_factors.tentative.https.any.js": [
-     "7486a70f91170c180ea12f8a0acee46a2626b640",
+     "60d38d3f336cfcd931e85a2e26ccae164f1d2216",
      [
       "compute-pressure/compute_pressure_factors.tentative.https.any.html",
       {
@@ -423792,7 +423816,7 @@
      ]
     ],
     "compute_pressure_update_toJSON.tentative.https.any.js": [
-     "c1cd240a3bc52b4b9dc79cb594d48ebdd7f64ec7",
+     "0024d6975490619d1824b75814c5719c63120bcf",
      [
       "compute-pressure/compute_pressure_update_toJSON.tentative.https.any.html",
       {
@@ -505745,14 +505769,14 @@
      ]
     ],
     "FileSystemSyncAccessHandle-read-write.https.tentative.worker.js": [
-     "8fa3799a67a4f1bb0fdc2c623638bb60d6ae2c3c",
+     "a22608a2c7da86e80d747a119759c95321d86f73",
      [
       "fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.html",
       {}
      ]
     ],
     "FileSystemSyncAccessHandle-truncate.https.tentative.worker.js": [
-     "f2cd51ef1a1d9711343461888018a61600243885",
+     "e5f557e070caba40b861fd83bac7f2bae3bea492",
      [
       "fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.html",
       {}
@@ -536676,6 +536700,28 @@
          }
         ]
        ],
+       "iframe-popup-about-blank.https.window.js": [
+        "d63b69e83f33fe10d88c5e9aad59da0f596606e1",
+        [
+         "html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.html",
+         {
+          "script_metadata": [
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/common/dispatcher/dispatcher.js"
+           ]
+          ]
+         }
+        ]
+       ],
        "iframe-popup-to-so.https.html": [
         "740ff2595aa5891cfaf99a04cd281e71e4d4bc74",
         [
@@ -595331,7 +595377,7 @@
       ]
      ],
      "scroll-timeline-attachment.html": [
-      "78ca257437322a5b24281f9bd45cffabf728cad2",
+      "96033859e29ed624921361110fc2fdbaa546179c",
       [
        null,
        {}
@@ -595527,7 +595573,7 @@
       ]
      ],
      "view-timeline-attachment.html": [
-      "47f4444b0dcad286f9a9d538e0e85d05623c3ea3",
+      "ff98ed78258c47f58678f3f00f5fb04eb3678f82",
       [
        null,
        {}

third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/baseline-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/baseline-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/baseline-001.html.ini
index 4c85dd9b..a190c9ea 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/baseline-001.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-grid/subgrid/baseline-001.html.ini
@@ -1,4 +1,2 @@
 [baseline-001.html]
-  expected:
-    if (product == "content_shell") and (os == "win") and (port == "win10.20h2"): CRASH
-    FAIL
+  expected: FAIL

third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html

diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html b/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html
index cbfa8ba..0ba7a00 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html
+++ b/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html
@@ -2,7 +2,7 @@
 <html class="reftest-wait">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation">
 <link rel="match" href="clip-path-animation-filter-ref.html">
-<meta name="fuzzy" content="maxDifference=0-10; totalPixels=0-150">
+<meta name="fuzzy" content="maxDifference=0-10; totalPixels=0-151">
 <style>
 .container {
   width: 100px;

third_party/blink/web_tests/external/wpt/css/css-text/word-break/break-boundary-2-chars-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-text/word-break/break-boundary-2-chars-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-text/word-break/break-boundary-2-chars-001.html.ini
new file mode 100644
index 0000000..80724a7
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-text/word-break/break-boundary-2-chars-001.html.ini
@@ -0,0 +1,3 @@
+[break-boundary-2-chars-001.html]
+  expected:
+    if (product == "content_shell") and (os == "mac") and (port == "mac13-arm64"): FAIL

third_party/blink/web_tests/external/wpt/css/css-transforms/preserve3d-and-flattening-z-order-006.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-transforms/preserve3d-and-flattening-z-order-006.html.ini b/third_party/blink/web_tests/external/wpt/css/css-transforms/preserve3d-and-flattening-z-order-006.html.ini
new file mode 100644
index 0000000..742b4b3
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-transforms/preserve3d-and-flattening-z-order-006.html.ini
@@ -0,0 +1,3 @@
+[preserve3d-and-flattening-z-order-006.html]
+  expected:
+    if (product == "content_shell") and (os == "mac") and (port == "mac13-arm64"): FAIL

third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html.ini
new file mode 100644
index 0000000..70fbacf
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-reset-border-image-outset-001.html.ini
@@ -0,0 +1,3 @@
+[kind-of-widget-fallback-input-reset-border-image-outset-001.html]
+  expected:
+    if (product == "content_shell") and (os == "linux"): FAIL

third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html.ini
index 8ea1424..8231ecb 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/css-ui/compute-kind-widget-generated/kind-of-widget-fallback-input-submit-border-image-repeat-001.html.ini
@@ -1,3 +1,4 @@
 [kind-of-widget-fallback-input-submit-border-image-repeat-001.html]
   expected:
+    if (product == "content_shell") and (os == "mac") and (port == "mac12"): FAIL
     if (product == "content_shell") and (os == "win") and (port == "win11"): FAIL

third_party/blink/web_tests/external/wpt/css/css-values/exp-log-compute-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/exp-log-compute-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-values/exp-log-compute-expected.txt
deleted file mode 100644
index 497cf5f..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-values/exp-log-compute-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a testharness.js-based test.
-FAIL log(1) should be used-value-equivalent to 0 assert_not_equals: log(1) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL log(10, 10) should be used-value-equivalent to 1 assert_not_equals: log(10, 10) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL exp(0) should be used-value-equivalent to 1 assert_not_equals: exp(0) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log(e) ) should be used-value-equivalent to 1 assert_not_equals: calc(log(e) ) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(e - exp(1)) should be used-value-equivalent to 0 assert_not_equals: calc(e - exp(1)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log( 1 + 1 + 2 /2 - 2) ) should be used-value-equivalent to 0 assert_not_equals: calc(log( 1 + 1 + 2 /2 - 2) ) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log(1) + exp(0)) should be used-value-equivalent to 1 assert_not_equals: calc(log(1) + exp(0)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(exp(log(1) + exp(0)*2)) should be used-value-equivalent to 7.4 assert_not_equals: calc(exp(log(1) + exp(0)*2)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log(log(1) + exp(0)*10)) should be used-value-equivalent to 2.3 assert_not_equals: calc(log(log(1) + exp(0)*10)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log(log(1) + exp(0)*20, 10)) should be used-value-equivalent to 1.3 assert_not_equals: calc(log(log(1) + exp(0)*20, 10)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log(e)  / log(e) + exp(0)*2 * log(e)) should be used-value-equivalent to 3 assert_not_equals: calc(log(e)  / log(e) + exp(0)*2 * log(e)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log((1 + 1) /2)  / log(e) + exp(0*1)*2 * log(e)) should be used-value-equivalent to 2 assert_not_equals: calc(log((1 + 1) /2)  / log(e) + exp(0*1)*2 * log(e)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log((3 + 1) /2, 2)  / log(e) + exp(0*1)*2 * log(e)) should be used-value-equivalent to 3 assert_not_equals: calc(log((3 + 1) /2, 2)  / log(e) + exp(0*1)*2 * log(e)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log((3 + 1) /2, 2)  / log(e, e) + exp(0*1)*2 * log(e, e)) should be used-value-equivalent to 3 assert_not_equals: calc(log((3 + 1) /2, 2)  / log(e, e) + exp(0*1)*2 * log(e, e)) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(exp(0) + 1) should be used-value-equivalent to 2 assert_not_equals: calc(exp(0) + 1) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log(exp(1))) should be used-value-equivalent to 1 assert_not_equals: calc(log(exp(1))) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL calc(log(exp(log(e)))) should be used-value-equivalent to 1 assert_not_equals: calc(log(exp(log(e)))) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/external/wpt/css/css-values/exp-log-serialize-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/exp-log-serialize-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-values/exp-log-serialize-expected.txt
index 4538042..16ba188 100644
--- a/third_party/blink/web_tests/external/wpt/css/css-values/exp-log-serialize-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/css/css-values/exp-log-serialize-expected.txt
@@ -1,22 +1,22 @@
 This is a testharness.js-based test.
-FAIL 'exp(0)' as a specified value should serialize as 'calc(1)'. assert_not_equals: 'exp(0)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(exp(0))' as a specified value should serialize as 'scale(calc(1))'. assert_not_equals: 'scale(exp(0))' should be valid in transform. got disallowed value ""
+PASS 'exp(0)' as a specified value should serialize as 'calc(1)'.
+PASS 'scale(exp(0))' as a specified value should serialize as 'scale(calc(1))'.
 PASS 'exp(0)' as a computed value should serialize as '1'.
-FAIL 'scale(exp(0))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'. assert_equals: 'scale(exp(0))' and 'matrix(1, 0, 0, 1, 0, 0)' should serialize the same in computed values. expected "matrix(1, 0, 0, 1, 0, 0)" but got "none"
-FAIL 'log(1)' as a specified value should serialize as 'calc(0)'. assert_not_equals: 'log(1)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(log(1))' as a specified value should serialize as 'scale(calc(0))'. assert_not_equals: 'scale(log(1))' should be valid in transform. got disallowed value ""
-FAIL 'log(1)' as a computed value should serialize as '0'. assert_equals: 'log(1)' and '0' should serialize the same in computed values. expected "0" but got "1"
-FAIL 'scale(log(1))' as a computed value should serialize as 'matrix(0, 0, 0, 0, 0, 0)'. assert_equals: 'scale(log(1))' and 'matrix(0, 0, 0, 0, 0, 0)' should serialize the same in computed values. expected "matrix(0, 0, 0, 0, 0, 0)" but got "none"
-FAIL 'calc(exp(0) + log(1) + log(1))' as a specified value should serialize as 'calc(1)'. assert_not_equals: 'calc(exp(0) + log(1) + log(1))' should be valid in opacity. got disallowed value ""
-FAIL 'scale(calc(exp(0) + log(1) + log(1)))' as a specified value should serialize as 'scale(calc(1))'. assert_not_equals: 'scale(calc(exp(0) + log(1) + log(1)))' should be valid in transform. got disallowed value ""
+PASS 'scale(exp(0))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.
+PASS 'log(1)' as a specified value should serialize as 'calc(0)'.
+PASS 'scale(log(1))' as a specified value should serialize as 'scale(calc(0))'.
+PASS 'log(1)' as a computed value should serialize as '0'.
+PASS 'scale(log(1))' as a computed value should serialize as 'matrix(0, 0, 0, 0, 0, 0)'.
+PASS 'calc(exp(0) + log(1) + log(1))' as a specified value should serialize as 'calc(1)'.
+PASS 'scale(calc(exp(0) + log(1) + log(1)))' as a specified value should serialize as 'scale(calc(1))'.
 PASS 'calc(exp(0) + log(1) + log(1))' as a computed value should serialize as '1'.
-FAIL 'scale(calc(exp(0) + log(1) + log(1)))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'. assert_equals: 'scale(calc(exp(0) + log(1) + log(1)))' and 'matrix(1, 0, 0, 1, 0, 0)' should serialize the same in computed values. expected "matrix(1, 0, 0, 1, 0, 0)" but got "none"
-FAIL 'calc(log(1) + 0.5)' as a specified value should serialize as 'calc(0.5)'. assert_not_equals: 'calc(log(1) + 0.5)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(calc(log(1) + 0.5))' as a specified value should serialize as 'scale(calc(0.5))'. assert_not_equals: 'scale(calc(log(1) + 0.5))' should be valid in transform. got disallowed value ""
-FAIL 'calc(log(1) + 0.5)' as a computed value should serialize as '0.5'. assert_equals: 'calc(log(1) + 0.5)' and '0.5' should serialize the same in computed values. expected "0.5" but got "1"
-FAIL 'scale(calc(log(1) + 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'. assert_equals: 'scale(calc(log(1) + 0.5))' and 'matrix(0.5, 0, 0, 0.5, 0, 0)' should serialize the same in computed values. expected "matrix(0.5, 0, 0, 0.5, 0, 0)" but got "none"
-FAIL 'calc(log(0))' as a specified value should serialize as 'calc(-infinity)'. assert_not_equals: 'calc(log(0))' should be valid in opacity. got disallowed value ""
-FAIL 'scale(calc(log(0)))' as a specified value should serialize as 'scale(calc(-infinity))'. assert_not_equals: 'scale(calc(log(0)))' should be valid in transform. got disallowed value ""
+PASS 'scale(calc(exp(0) + log(1) + log(1)))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.
+PASS 'calc(log(1) + 0.5)' as a specified value should serialize as 'calc(0.5)'.
+PASS 'scale(calc(log(1) + 0.5))' as a specified value should serialize as 'scale(calc(0.5))'.
+PASS 'calc(log(1) + 0.5)' as a computed value should serialize as '0.5'.
+PASS 'scale(calc(log(1) + 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.
+PASS 'calc(log(0))' as a specified value should serialize as 'calc(-infinity)'.
+PASS 'scale(calc(log(0)))' as a specified value should serialize as 'scale(calc(-infinity))'.
 FAIL 'calc(log(0))' as a computed value should serialize as '-infinity'. assert_equals: '-infinity' should round-trip exactly in computed values. expected "-infinity" but got "1"
 FAIL 'scale(calc(log(0)))' as a computed value should serialize as 'matrix(-infinity, 0, 0, -infinity, 0, 0)'. assert_equals: 'matrix(-infinity, 0, 0, -infinity, 0, 0)' should round-trip exactly in computed values. expected "matrix(-infinity, 0, 0, -infinity, 0, 0)" but got "none"
 Harness: the test ran to completion.

third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-computed-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-computed-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-computed-expected.txt
deleted file mode 100644
index 857ea19..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-computed-expected.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-This is a testharness.js-based test.
-FAIL pow(1,1) should be used-value-equivalent to 1 assert_not_equals: pow(1,1) isn't valid in 'z-index'; got the default value instead. got disallowed value "auto"
-FAIL sqrt(1) should be used-value-equivalent to 1 assert_not_equals: sqrt(1) isn't valid in 'z-index'; got the default value instead. got disallowed value "auto"
-FAIL hypot(1) should be used-value-equivalent to 1 assert_not_equals: hypot(1) isn't valid in 'z-index'; got the default value instead. got disallowed value "auto"
-FAIL sqrt(pow(1,1)) should be used-value-equivalent to 1 assert_not_equals: sqrt(pow(1,1)) isn't valid in 'z-index'; got the default value instead. got disallowed value "auto"
-FAIL hypot(pow(1, sqrt(1))) should be used-value-equivalent to 1 assert_not_equals: hypot(pow(1, sqrt(1))) isn't valid in 'z-index'; got the default value instead. got disallowed value "auto"
-FAIL calc(hypot(pow((1 + sqrt(1)) / 2, sqrt(1)))) should be used-value-equivalent to 1 assert_not_equals: calc(hypot(pow((1 + sqrt(1)) / 2, sqrt(1)))) isn't valid in 'z-index'; got the default value instead. got disallowed value "auto"
-FAIL calc(100px * pow(2, pow(2, 2))) should be used-value-equivalent to 1600px assert_not_equals: calc(100px * pow(2, pow(2, 2))) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(1px * pow(2, 3)) should be used-value-equivalent to 8px assert_not_equals: calc(1px * pow(2, 3)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(100px * sqrt(100)) should be used-value-equivalent to 1000px assert_not_equals: calc(100px * sqrt(100)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(1px * pow(2, sqrt(100)) should be used-value-equivalent to 1024px assert_not_equals: calc(1px * pow(2, sqrt(100)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(3px, 4px) should be used-value-equivalent to 5px assert_not_equals: hypot(3px, 4px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(3e+9px, 4e+9px) should be used-value-equivalent to 5e+9px assert_not_equals: hypot(3e+9px, 4e+9px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(100px * hypot(3, 4)) should be used-value-equivalent to 500px assert_not_equals: calc(100px * hypot(3, 4)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(-5px) should be used-value-equivalent to 5px assert_not_equals: hypot(-5px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(1px * hypot(-5)) should be used-value-equivalent to 5px assert_not_equals: calc(1px * hypot(-5)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(1px * hypot(10000)) should be used-value-equivalent to 10000px assert_not_equals: calc(1px * hypot(10000)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(2px * sqrt(100000000)) should be used-value-equivalent to 20000px assert_not_equals: calc(2px * sqrt(100000000)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(3px * pow(20, 4)) should be used-value-equivalent to 480000px assert_not_equals: calc(3px * pow(20, 4)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL calc(-2 * hypot(3px, 4px)) should be used-value-equivalent to -10px assert_not_equals: calc(-2 * hypot(3px, 4px)) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(0% + 3px, 0% + 4px) should be used-value-equivalent to 5px assert_not_equals: hypot(0% + 3px, 0% + 4px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(0% + 772.333px) should be used-value-equivalent to calc(0% + 772.333px) assert_not_equals: hypot(0% + 772.333px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(0% + 772.35px) should be used-value-equivalent to calc(0% + 772.35px) assert_not_equals: hypot(0% + 772.35px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(0% + 600px, 0% + 800px) should be used-value-equivalent to 1000px assert_not_equals: hypot(0% + 600px, 0% + 800px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1px) should be used-value-equivalent to 1px assert_not_equals: hypot(1px) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1cm) should be used-value-equivalent to 1cm assert_not_equals: hypot(1cm) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1mm) should be used-value-equivalent to 1mm assert_not_equals: hypot(1mm) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1Q) should be used-value-equivalent to 1Q assert_not_equals: hypot(1Q) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1in) should be used-value-equivalent to 1in assert_not_equals: hypot(1in) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1pc) should be used-value-equivalent to 1pc assert_not_equals: hypot(1pc) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1pt) should be used-value-equivalent to 1pt assert_not_equals: hypot(1pt) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1em) should be used-value-equivalent to 1em assert_not_equals: hypot(1em) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1ex) should be used-value-equivalent to 1ex assert_not_equals: hypot(1ex) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1ch) should be used-value-equivalent to 1ch assert_not_equals: hypot(1ch) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1rem) should be used-value-equivalent to 1rem assert_not_equals: hypot(1rem) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1vh) should be used-value-equivalent to 1vh assert_not_equals: hypot(1vh) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1vw) should be used-value-equivalent to 1vw assert_not_equals: hypot(1vw) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1vmin) should be used-value-equivalent to 1vmin assert_not_equals: hypot(1vmin) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1vmax) should be used-value-equivalent to 1vmax assert_not_equals: hypot(1vmax) isn't valid in 'margin-left'; got the default value instead. got disallowed value "0px"
-FAIL hypot(1s) should be used-value-equivalent to 1s assert_not_equals: hypot(1s) isn't valid in 'transition-delay'; got the default value instead. got disallowed value "0s"
-FAIL hypot(1ms) should be used-value-equivalent to 1ms assert_not_equals: hypot(1ms) isn't valid in 'transition-delay'; got the default value instead. got disallowed value "0s"
-FAIL hypot(1deg) should be used-value-equivalent to 1deg assert_not_equals: hypot(1deg) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL hypot(1grad) should be used-value-equivalent to 1grad assert_not_equals: hypot(1grad) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL hypot(1rad) should be used-value-equivalent to 1rad assert_not_equals: hypot(1rad) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-FAIL hypot(1turn) should be used-value-equivalent to 1turn assert_not_equals: hypot(1turn) isn't valid in 'transform'; got the default value instead. got disallowed value "none"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-serialize-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-serialize-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-serialize-expected.txt
deleted file mode 100644
index 4635a58..0000000
--- a/third_party/blink/web_tests/external/wpt/css/css-values/hypot-pow-sqrt-serialize-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a testharness.js-based test.
-FAIL 'pow(1,1)' as a specified value should serialize as 'calc(1)'. assert_not_equals: 'pow(1,1)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(pow(1,1))' as a specified value should serialize as 'scale(calc(1))'. assert_not_equals: 'scale(pow(1,1))' should be valid in transform. got disallowed value ""
-PASS 'pow(1,1)' as a computed value should serialize as '1'.
-FAIL 'scale(pow(1,1))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'. assert_equals: 'scale(pow(1,1))' and 'matrix(1, 0, 0, 1, 0, 0)' should serialize the same in computed values. expected "matrix(1, 0, 0, 1, 0, 0)" but got "none"
-FAIL 'hypot(1)' as a specified value should serialize as 'calc(1)'. assert_not_equals: 'hypot(1)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(hypot(1))' as a specified value should serialize as 'scale(calc(1))'. assert_not_equals: 'scale(hypot(1))' should be valid in transform. got disallowed value ""
-PASS 'hypot(1)' as a computed value should serialize as '1'.
-FAIL 'scale(hypot(1))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'. assert_equals: 'scale(hypot(1))' and 'matrix(1, 0, 0, 1, 0, 0)' should serialize the same in computed values. expected "matrix(1, 0, 0, 1, 0, 0)" but got "none"
-FAIL 'sqrt(1)' as a specified value should serialize as 'calc(1)'. assert_not_equals: 'sqrt(1)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(sqrt(1))' as a specified value should serialize as 'scale(calc(1))'. assert_not_equals: 'scale(sqrt(1))' should be valid in transform. got disallowed value ""
-PASS 'sqrt(1)' as a computed value should serialize as '1'.
-FAIL 'scale(sqrt(1))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'. assert_equals: 'scale(sqrt(1))' and 'matrix(1, 0, 0, 1, 0, 0)' should serialize the same in computed values. expected "matrix(1, 0, 0, 1, 0, 0)" but got "none"
-FAIL 'calc(pow(1,1) - 0.5)' as a specified value should serialize as 'calc(0.5)'. assert_not_equals: 'calc(pow(1,1) - 0.5)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(calc(pow(1,1) - 0.5))' as a specified value should serialize as 'scale(calc(0.5))'. assert_not_equals: 'scale(calc(pow(1,1) - 0.5))' should be valid in transform. got disallowed value ""
-FAIL 'calc(pow(1,1) - 0.5)' as a computed value should serialize as '0.5'. assert_equals: 'calc(pow(1,1) - 0.5)' and '0.5' should serialize the same in computed values. expected "0.5" but got "1"
-FAIL 'scale(calc(pow(1,1) - 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'. assert_equals: 'scale(calc(pow(1,1) - 0.5))' and 'matrix(0.5, 0, 0, 0.5, 0, 0)' should serialize the same in computed values. expected "matrix(0.5, 0, 0, 0.5, 0, 0)" but got "none"
-FAIL 'calc(hypot(1) * 0.5)' as a specified value should serialize as 'calc(0.5)'. assert_not_equals: 'calc(hypot(1) * 0.5)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(calc(hypot(1) * 0.5))' as a specified value should serialize as 'scale(calc(0.5))'. assert_not_equals: 'scale(calc(hypot(1) * 0.5))' should be valid in transform. got disallowed value ""
-FAIL 'calc(hypot(1) * 0.5)' as a computed value should serialize as '0.5'. assert_equals: 'calc(hypot(1) * 0.5)' and '0.5' should serialize the same in computed values. expected "0.5" but got "1"
-FAIL 'scale(calc(hypot(1) * 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'. assert_equals: 'scale(calc(hypot(1) * 0.5))' and 'matrix(0.5, 0, 0, 0.5, 0, 0)' should serialize the same in computed values. expected "matrix(0.5, 0, 0, 0.5, 0, 0)" but got "none"
-FAIL 'calc(sqrt(1) - 1)' as a specified value should serialize as 'calc(0)'. assert_not_equals: 'calc(sqrt(1) - 1)' should be valid in opacity. got disallowed value ""
-FAIL 'scale(calc(sqrt(1) - 1))' as a specified value should serialize as 'scale(calc(0))'. assert_not_equals: 'scale(calc(sqrt(1) - 1))' should be valid in transform. got disallowed value ""
-FAIL 'calc(sqrt(1) - 1)' as a computed value should serialize as '0'. assert_equals: 'calc(sqrt(1) - 1)' and '0' should serialize the same in computed values. expected "0" but got "1"
-FAIL 'scale(calc(sqrt(1) - 1))' as a computed value should serialize as 'matrix(0, 0, 0, 0, 0, 0)'. assert_equals: 'scale(calc(sqrt(1) - 1))' and 'matrix(0, 0, 0, 0, 0, 0)' should serialize the same in computed values. expected "matrix(0, 0, 0, 0, 0, 0)" but got "none"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/external/wpt/css/filter-effects/backdrop-filter-clip-rounded-clip.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/css/filter-effects/backdrop-filter-clip-rounded-clip.html.ini b/third_party/blink/web_tests/external/wpt/css/filter-effects/backdrop-filter-clip-rounded-clip.html.ini
index 6f3f2000..ab583f5 100644
--- a/third_party/blink/web_tests/external/wpt/css/filter-effects/backdrop-filter-clip-rounded-clip.html.ini
+++ b/third_party/blink/web_tests/external/wpt/css/filter-effects/backdrop-filter-clip-rounded-clip.html.ini
@@ -1,3 +1,4 @@
 [backdrop-filter-clip-rounded-clip.html]
   expected:
     if (product == "content_shell") and (os == "mac") and (port == "mac12"): FAIL
+    if (product == "content_shell") and (os == "mac") and (port == "mac13"): FAIL

third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js

diff --git a/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js b/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js
index 8fa3799..a22608a2 100644
--- a/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js
+++ b/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js
@@ -195,6 +195,7 @@
 
   const bufferLength = expected.length;
   const readBuffer = new Uint8Array(expected.length);
+  // No options parameter provided, should read at offset 0.
   const readBytes = handle.read(readBuffer, {at: 0});
   assert_equals(expected.length, readBytes, 'Check that all bytes were read');
   const actual = new TextDecoder().decode(readBuffer);
@@ -238,62 +239,64 @@
 
   const readBuffer = new Uint8Array(24);
   const readBytes = handle.read(readBuffer, {at: 0});
+
   assert_equals(0, readBytes, 'Check that no bytes were written');
 }, 'Test writing at a negative offset fails.');
 
 sync_access_handle_test((t, handle) => {
-  const text = 'foobar';
-  const writeBuffer = new TextEncoder().encode(text);
-  let writtenBytes = handle.write(writeBuffer);
-  assert_equals(
-      writeBuffer.byteLength, writtenBytes,
-      'Check that all bytes were written.');
+  if (!('TextEncoder' in self)) {
+    return;
+  }
 
-  // This should double the file size, not overwrite the existing bytes.
-  writtenBytes = handle.write(writeBuffer);
-  assert_equals(
-      writeBuffer.byteLength, writtenBytes,
-      'Check that all bytes were written.');
-
-  // Reading at the cursor will read zero bytes at the end of the file.
-  const expectedFileSize = text.length * 2;
-  const readBuffer = new Uint8Array(expectedFileSize);
-  let readBytes = handle.read(readBuffer);
-  assert_equals(0, readBytes, 'Check that no bytes were read');
-
-  // Reading from the start of the file.
-  readBytes = handle.read(readBuffer, {at: 0});
-  assert_equals(expectedFileSize, readBytes, 'Check that all bytes were read');
-}, 'Test that writing moves the file position cursor');
-
-sync_access_handle_test((t, handle) => {
+  const encoder = new TextEncoder();
   const decoder = new TextDecoder();
 
-  const text = 'foobar';
-  const writeBuffer = new TextEncoder().encode(text);
+  let writeBuffer = encoder.encode("Hello ");
   let writtenBytes = handle.write(writeBuffer);
-  assert_equals(
-      writeBuffer.byteLength, writtenBytes,
-      'Check that all bytes were written.');
-
-  // Read the first half of the file.
-  let expected = 'foo';
-  const readBuffer = new Uint8Array(3);
+  writeBuffer = encoder.encode("World");
+  writtenBytes += handle.write(writeBuffer);
+  let readBuffer = new Uint8Array(256);
   let readBytes = handle.read(readBuffer, {at: 0});
-  assert_equals(3, readBytes, 'Check that all bytes were read');
-  let actual = decoder.decode(readBuffer);
+  assert_equals(readBytes, "Hello World".length, 'Check that all bytes were read');
+  let actual = decoder.decode(readBuffer).substring(0, readBytes);
   assert_equals(
-      expected, actual,
-      `Expected to read ${expected} but the actual value was ${actual}.`);
+    actual, "Hello World",
+    'Check content read from the handle');
 
-  // Read the second half of the file, without specifying an offset.
-  expected = 'bar';
+  readBuffer = new Uint8Array(5);
+  readBytes = handle.read(readBuffer, {at: 0});
+  assert_equals(readBytes, 5, 'Check that all bytes were read');
+  actual = decoder.decode(readBuffer).substring(0, readBytes);
+  assert_equals(
+    actual, "Hello",
+    'Check content read from the handle');
+
+  readBuffer = new Uint8Array(256);
   readBytes = handle.read(readBuffer);
-  assert_equals(3, readBytes, 'Check that all bytes were read');
+  assert_equals(readBytes, "Hello World".length - 5, 'Check that all bytes were read');
+  actual = decoder.decode(readBuffer).substring(0, readBytes);
+  assert_equals(
+    actual, " World",
+    'Check content read from the handle');
+
+  readBuffer = new Uint8Array(5);
+  readBytes = handle.read(readBuffer, {at: 0});
+  assert_equals(readBytes, 5, 'Check that all bytes were read');
   actual = decoder.decode(readBuffer);
   assert_equals(
-      expected, actual,
-      `Expected to read ${expected} but the actual value was ${actual}.`);
-}, 'Test that reading moves the file position cursor');
+    actual, "Hello",
+    'Check content read from the handle');
+  writeBuffer = encoder.encode(" X");
+  writtenBytes = handle.write(writeBuffer);
+  assert_equals(writtenBytes, 2, 'Check overwrite length');
+
+  readBuffer = new Uint8Array(256);
+  readBytes = handle.read(readBuffer, {at: 0});
+  assert_equals(readBytes, "Hello Xorld".length, 'Check that all bytes were read');
+  actual = decoder.decode(readBuffer).substring(0, readBytes);
+  assert_equals(
+    actual, "Hello Xorld",
+    'Check content read from the handle');
+}, 'Test reading and writing a file using the cursor');
 
 done();

third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js

diff --git a/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js b/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js
index f2cd51e..e5f557e 100644
--- a/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js
+++ b/third_party/blink/web_tests/external/wpt/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js
@@ -38,22 +38,33 @@
 }, 'test SyncAccessHandle.truncate after SyncAccessHandle.write');
 
 sync_access_handle_test((t, handle) => {
-  // The cursor will be at the end of the file after this write.
   const writeBuffer = new Uint8Array(4);
-  writeBuffer.set([0, 1, 2, 3]);
+  writeBuffer.set([96, 97, 98, 99]);
+  handle.write(writeBuffer, {at: 0});
+
+  // Moves cursor to 2
+  handle.truncate(2);
+  let readBuffer = new Uint8Array(256);
+  assert_equals(handle.read(readBuffer), 0);
+
+  writeBuffer.set([100, 101, 102, 103]);
   handle.write(writeBuffer);
 
-  // Extending the file should not move the cursor.
-  handle.truncate(6);
-  let readBuffer = new Uint8Array(2);
-  let expected = new Uint8Array(2);
-  expected.set([0, 0]);
-  assert_equals(2, handle.read(readBuffer));
-  assert_array_equals(expected, readBuffer);
+  assert_equals(handle.read(readBuffer, {at: 0}), 6);
+  let expected = new Uint8Array(256);
+  expected.set([96, 97, 100, 101, 102, 103]);
+  assert_array_equals(readBuffer, expected);
 
-  // Shortening the file should move the cursor to the new end.
-  handle.truncate(2);
-  assert_equals(0, handle.read(readBuffer));
-}, 'test SyncAccessHandle.truncate resets the file position cursor');
+  // Resize the file to 10, expect that everything beyond the old size is '0'.
+  handle.truncate(10); // file cursor should still be at 6
+  // overwrite two bytes
+  const writeBuffer2 = new Uint8Array(2);
+  writeBuffer2.set([110, 111]);
+  handle.write(writeBuffer2);
+  expected = new Uint8Array(256);
+  expected.set([96, 97, 100, 101, 102, 103, 110, 111, 0, 0]);
+  assert_equals(handle.read(readBuffer, {at: 0}), 10);
+  assert_array_equals(readBuffer, expected);
+}, 'Test truncate effect on cursor');
 
 done();

third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https-expected.txt b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https-expected.txt
index e2acfde8..7adc6fa 100644
--- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https-expected.txt
+++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 240 tests; 220 PASS, 20 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 240 tests; 224 PASS, 16 FAIL, 0 TIMEOUT, 0 NOTRUN.
 PASS sRGB-FF0000FF.png, Context srgb, ImageData srgb, scaleImage=false
 PASS sRGB-FF0000FF.png, Context srgb, ImageData srgb, scaleImage=true
 PASS sRGB-FF0000FF.png, Context srgb, ImageData display-p3, scaleImage=false
@@ -230,15 +230,15 @@
 PASS Display-P3-1-0-0.svg, Context srgb, ImageData display-p3, scaleImage=true
 PASS Display-P3-1-0-0.svg, Context display-p3, ImageData srgb, scaleImage=false
 PASS Display-P3-1-0-0.svg, Context display-p3, ImageData srgb, scaleImage=true
-FAIL Display-P3-1-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=false assert_true: Actual pixel value 234,51,35,255 is approximately equal to 255,0,0,255. expected true got false
-FAIL Display-P3-1-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=true assert_true: Actual pixel value 234,51,35,255 is approximately equal to 255,0,0,255. expected true got false
+PASS Display-P3-1-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=false
+PASS Display-P3-1-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=true
 PASS Display-P3-0.7333-0-0.svg, Context srgb, ImageData srgb, scaleImage=false
 PASS Display-P3-0.7333-0-0.svg, Context srgb, ImageData srgb, scaleImage=true
 PASS Display-P3-0.7333-0-0.svg, Context srgb, ImageData display-p3, scaleImage=false
 PASS Display-P3-0.7333-0-0.svg, Context srgb, ImageData display-p3, scaleImage=true
 PASS Display-P3-0.7333-0-0.svg, Context display-p3, ImageData srgb, scaleImage=false
 PASS Display-P3-0.7333-0-0.svg, Context display-p3, ImageData srgb, scaleImage=true
-FAIL Display-P3-0.7333-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=false assert_true: Actual pixel value 188,39,26,255 is approximately equal to 187,0,0,255. expected true got false
-FAIL Display-P3-0.7333-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=true assert_true: Actual pixel value 188,39,26,255 is approximately equal to 187,0,0,255. expected true got false
+PASS Display-P3-0.7333-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=false
+PASS Display-P3-0.7333-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=true
 Harness: the test ran to completion.
 

third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html.ini
index b6b1b9c..9c80c1e 100644
--- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html.ini
+++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/wide-gamut-canvas/canvas-display-p3-drawImage.https.html.ini
@@ -23,18 +23,6 @@
   [Adobe-RGB-FFFF00000000CCCC.png, Context srgb, ImageData display-p3, scaleImage=true]
     expected: FAIL
 
-  [Display-P3-0.7333-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=false]
-    expected: FAIL
-
-  [Display-P3-0.7333-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=true]
-    expected: FAIL
-
-  [Display-P3-1-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=false]
-    expected: FAIL
-
-  [Display-P3-1-0-0.svg, Context display-p3, ImageData display-p3, scaleImage=true]
-    expected: FAIL
-
   [Display-P3-FF0000CC.png, Context srgb, ImageData display-p3, scaleImage=false]
     expected: FAIL
 

third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText-expected.txt b/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText-expected.txt
deleted file mode 100644
index 9a33e9d..0000000
--- a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Test if fillText can be used with a solid display-p3 color assert_array_equals: expected property 0 to be 255 but got 234 (expected array [255, 0, 0, 255] got [234, 51, 35, 255])
-Harness: the test ran to completion.
-

third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html.ini
deleted file mode 100644
index 5e3b6d27..0000000
--- a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.fillText.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.color.space.p3.fillText.html]
-  [Test if fillText can be used with a solid display-p3 color]
-    expected: FAIL

third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText-expected.txt

diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText-expected.txt b/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText-expected.txt
deleted file mode 100644
index c182877..0000000
--- a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL Test if strokeText can be used with a solid display-p3 color assert_array_equals: expected property 0 to be 255 but got 234 (expected array [255, 0, 0, 255] got [234, 51, 35, 255])
-Harness: the test ran to completion.
-

third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html.ini
deleted file mode 100644
index 7ad3788..0000000
--- a/third_party/blink/web_tests/external/wpt/html/canvas/element/wide-gamut-canvas/2d.color.space.p3.strokeText.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.color.space.p3.strokeText.html]
-  [Test if strokeText can be used with a solid display-p3 color]
-    expected: FAIL

third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.ini

diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.ini
new file mode 100644
index 0000000..c4933cf
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-about-blank.https.window.js.ini
@@ -0,0 +1,3 @@
+[iframe-popup-about-blank.https.window.html]
+  [iframe-popup-about-blank]
+    expected: FAIL

third_party/blink/web_tests/external/wpt/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html

diff --git a/third_party/blink/web_tests/external/wpt/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html b/third_party/blink/web_tests/external/wpt/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html
index e549445..50a85afc 100644
--- a/third_party/blink/web_tests/external/wpt/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html
+++ b/third_party/blink/web_tests/external/wpt/shadow-dom/offsetTop-offsetLeft-across-shadow-boundaries.html
@@ -2,6 +2,7 @@
 <link rel=author href="mailto:jarhar@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/declarative-shadow-dom-polyfill.js"></script>
 
 <style>
 .box {
@@ -80,19 +81,7 @@
 </div>
 
 <script>
-// TODO delete this when all browsers support declarative shadowdom
-(function attachShadowRoots(root) {
-  root.querySelectorAll("template[shadowrootmode]").forEach(template => {
-    const mode = template.getAttribute("shadowrootmode");
-    const shadowRoot = template.parentNode.attachShadow({ mode });
-    shadowRoot.appendChild(template.content);
-    template.remove();
-    attachShadowRoots(shadowRoot);
-  });
-})(document);
-</script>
-
-<script>
+polyfill_declarative_shadow_dom(document);
 test(() => {
   assert_equals(target1.offsetTop, 38);
 }, 'Verifies that HTMLElement.offsetTop accounts for shadow boundaries.');

third_party/blink/web_tests/flag-specific/highdpi/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
new file mode 100644
index 0000000..39d07faf
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/svg/as-background-image/svg-as-background-6-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/svg/as-background-image/svg-as-background-6-expected.png
new file mode 100644
index 0000000..62fb5ae9c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

third_party/blink/web_tests/flag-specific/highdpi/svg/transforms/text-with-mask-with-svg-transform-expected.png

diff --git a/third_party/blink/web_tests/flag-specific/highdpi/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/svg/transforms/text-with-mask-with-svg-transform-expected.png
new file mode 100644
index 0000000..46e3dd0
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/highdpi/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.png

diff --git a/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.png b/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.png
index 66b22d42..f7fd26c 100644
--- a/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.png
+++ b/third_party/blink/web_tests/paint/invalidation/svg/js-update-gradient-expected.png
Binary files differ

third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png

diff --git a/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png b/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
index 39d07faf..62bc0c3e 100644
--- a/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png

diff --git a/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
index 5c50391..f925d5f 100644
--- a/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png

diff --git a/third_party/blink/web_tests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png
index 62fb5ae9c..144e126 100644
--- a/third_party/blink/web_tests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

third_party/blink/web_tests/platform/linux/svg/custom/dominant-baseline-hanging-expected.png

diff --git a/third_party/blink/web_tests/platform/linux/svg/custom/dominant-baseline-hanging-expected.png b/third_party/blink/web_tests/platform/linux/svg/custom/dominant-baseline-hanging-expected.png
index a90f818936..ea176c9 100644
--- a/third_party/blink/web_tests/platform/linux/svg/custom/dominant-baseline-hanging-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/custom/dominant-baseline-hanging-expected.png
Binary files differ

third_party/blink/web_tests/platform/linux/svg/custom/gradient-stroke-width-expected.png

diff --git a/third_party/blink/web_tests/platform/linux/svg/custom/gradient-stroke-width-expected.png b/third_party/blink/web_tests/platform/linux/svg/custom/gradient-stroke-width-expected.png
index bad2eb5..016dda7 100644
--- a/third_party/blink/web_tests/platform/linux/svg/custom/gradient-stroke-width-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/custom/gradient-stroke-width-expected.png
Binary files differ

third_party/blink/web_tests/platform/linux/svg/custom/text-rotated-gradient-expected.png

diff --git a/third_party/blink/web_tests/platform/linux/svg/custom/text-rotated-gradient-expected.png b/third_party/blink/web_tests/platform/linux/svg/custom/text-rotated-gradient-expected.png
index 29ce4fa9f..9c91acc7 100644
--- a/third_party/blink/web_tests/platform/linux/svg/custom/text-rotated-gradient-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/custom/text-rotated-gradient-expected.png
Binary files differ

third_party/blink/web_tests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png
index 46e3dd0..7833ecc9 100644
--- a/third_party/blink/web_tests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/svg/js-update-gradient-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/svg/js-update-gradient-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/svg/js-update-gradient-expected.png
deleted file mode 100644
index 09ff0b09..0000000
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/svg/js-update-gradient-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
index 98b91bc..4f6f65d 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/svg/as-background-image/svg-as-background-6-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/as-background-image/svg-as-background-6-expected.png
index 5d7ba9e5..6e6f24c 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/svg/custom/gradient-stroke-width-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/custom/gradient-stroke-width-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/custom/gradient-stroke-width-expected.png
index 23f5a4b9..66c7658f2 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/custom/gradient-stroke-width-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/custom/gradient-stroke-width-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac11-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
index ab62cb0b..4ed12f8 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/svg/js-update-gradient-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/svg/js-update-gradient-expected.png b/third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/svg/js-update-gradient-expected.png
deleted file mode 100644
index 09ff0b09..0000000
--- a/third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/svg/js-update-gradient-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac-mac12-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
index 98b91bc..4f6f65d 100644
--- a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac12-arm64/svg/as-background-image/svg-as-background-6-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/as-background-image/svg-as-background-6-expected.png
index 5d7ba9e5..6e6f24c 100644
--- a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac12-arm64/svg/custom/gradient-stroke-width-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/custom/gradient-stroke-width-expected.png b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/custom/gradient-stroke-width-expected.png
index 23f5a4b9..66c7658f2 100644
--- a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/custom/gradient-stroke-width-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/custom/gradient-stroke-width-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac12-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
index ab62cb0b..4ed12f8 100644
--- a/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac12-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/svg/js-update-gradient-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/svg/js-update-gradient-expected.png b/third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/svg/js-update-gradient-expected.png
deleted file mode 100644
index 09ff0b09..0000000
--- a/third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/svg/js-update-gradient-expected.png
+++ /dev/null
Binary files differ

third_party/blink/web_tests/platform/mac-mac13-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
index 98b91bc..4f6f65d 100644
--- a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac13-arm64/svg/as-background-image/svg-as-background-6-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/as-background-image/svg-as-background-6-expected.png
index 5d7ba9e5..6e6f24c 100644
--- a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac13-arm64/svg/custom/gradient-stroke-width-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/custom/gradient-stroke-width-expected.png b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/custom/gradient-stroke-width-expected.png
index 23f5a4b9..66c7658f2 100644
--- a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/custom/gradient-stroke-width-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/custom/gradient-stroke-width-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac-mac13-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
index ab62cb0b..4ed12f8 100644
--- a/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac13-arm64/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png b/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
index b99af92..21ccc3c 100644
--- a/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
+++ b/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
index 1c7a0bcf..1db68a3 100644
--- a/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ b/third_party/blink/web_tests/platform/mac/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png
index dcea45b..47cb8f8 100644
--- a/third_party/blink/web_tests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/blink/web_tests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png b/third_party/blink/web_tests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png
index 915cbe98..074ab9f3 100644
--- a/third_party/blink/web_tests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png
+++ b/third_party/blink/web_tests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/svg/custom/text-rotated-gradient-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/svg/custom/text-rotated-gradient-expected.png b/third_party/blink/web_tests/platform/mac/svg/custom/text-rotated-gradient-expected.png
index d3316688..c6d89e06 100644
--- a/third_party/blink/web_tests/platform/mac/svg/custom/text-rotated-gradient-expected.png
+++ b/third_party/blink/web_tests/platform/mac/svg/custom/text-rotated-gradient-expected.png
Binary files differ

third_party/blink/web_tests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png
index 08e9a42..cda9a71 100644
--- a/third_party/blink/web_tests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/blink/web_tests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png

diff --git a/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png b/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
index 5d5fe0c..51acc3c3 100644
--- a/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
+++ b/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/masking-mask-01-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png

diff --git a/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png b/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
index a32f921..231fc98 100644
--- a/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
+++ b/third_party/blink/web_tests/platform/win/svg/W3C-SVG-1.1/pservers-grad-05-b-expected.png
Binary files differ

third_party/blink/web_tests/platform/win/svg/as-background-image/svg-as-background-6-expected.png

diff --git a/third_party/blink/web_tests/platform/win/svg/as-background-image/svg-as-background-6-expected.png b/third_party/blink/web_tests/platform/win/svg/as-background-image/svg-as-background-6-expected.png
index 1cba70f..1e2c228 100644
--- a/third_party/blink/web_tests/platform/win/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/blink/web_tests/platform/win/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

third_party/blink/web_tests/platform/win/svg/custom/dominant-baseline-hanging-expected.png

diff --git a/third_party/blink/web_tests/platform/win/svg/custom/dominant-baseline-hanging-expected.png b/third_party/blink/web_tests/platform/win/svg/custom/dominant-baseline-hanging-expected.png
index 92a59e9b..4a3aa62 100644
--- a/third_party/blink/web_tests/platform/win/svg/custom/dominant-baseline-hanging-expected.png
+++ b/third_party/blink/web_tests/platform/win/svg/custom/dominant-baseline-hanging-expected.png
Binary files differ

third_party/blink/web_tests/platform/win/svg/custom/text-rotated-gradient-expected.png

diff --git a/third_party/blink/web_tests/platform/win/svg/custom/text-rotated-gradient-expected.png b/third_party/blink/web_tests/platform/win/svg/custom/text-rotated-gradient-expected.png
index 10ca47f..7002e1d 100644
--- a/third_party/blink/web_tests/platform/win/svg/custom/text-rotated-gradient-expected.png
+++ b/third_party/blink/web_tests/platform/win/svg/custom/text-rotated-gradient-expected.png
Binary files differ

third_party/blink/web_tests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png

diff --git a/third_party/blink/web_tests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png
index f14d8fb8..f8005dc5 100644
--- a/third_party/blink/web_tests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/blink/web_tests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

third_party/blink/web_tests/svg/custom/gradient-stroke-width-expected.png

diff --git a/third_party/blink/web_tests/svg/custom/gradient-stroke-width-expected.png b/third_party/blink/web_tests/svg/custom/gradient-stroke-width-expected.png
index 26a91bc..e96a007 100644
--- a/third_party/blink/web_tests/svg/custom/gradient-stroke-width-expected.png
+++ b/third_party/blink/web_tests/svg/custom/gradient-stroke-width-expected.png
Binary files differ

third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/helpers.js

diff --git a/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/helpers.js b/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/helpers.js
index 88b143c..2769f357 100644
--- a/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/helpers.js
+++ b/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/helpers.js
@@ -7,15 +7,21 @@
 const attribution_reporting_promise_test = (f, name) =>
     promise_test(async t => {
       t.add_cleanup(() => internals.resetAttributionReporting());
-      t.add_cleanup(() => resetAttributionReports(eventLevelReportsUrl));
-      t.add_cleanup(() => resetAttributionReports(aggregatableReportsUrl));
-      t.add_cleanup(() => resetAttributionReports(eventLevelDebugReportsUrl));
-      t.add_cleanup(() => resetAttributionReports(aggregatableDebugReportsUrl));
-      t.add_cleanup(() => resetAttributionReports(verboseDebugReportsUrl));
-      t.add_cleanup(() => resetRegisteredSources());
+      t.add_cleanup(() => resetWptServerStash());
+
+      await resetWptServerStash();
       return f(t);
     }, name);
 
+const resetWptServerStash = () => Promise.all([
+  resetAttributionReports(eventLevelReportsUrl),
+  resetAttributionReports(aggregatableReportsUrl),
+  resetAttributionReports(eventLevelDebugReportsUrl),
+  resetAttributionReports(aggregatableDebugReportsUrl),
+  resetAttributionReports(verboseDebugReportsUrl),
+  resetRegisteredSources(),
+]);
+
 const eventLevelReportsUrl =
     '/.well-known/attribution-reporting/report-event-attribution';
 const eventLevelDebugReportsUrl =
@@ -93,7 +99,7 @@
     });
     headers.push({
       name: allowHeadersHeader,
-      value: `${eligibleHeader}, ${supportHeader}`,
+      value: `${eligibleHeader}`,
     })
   } else {
     headers.push({
@@ -115,7 +121,6 @@
 };
 
 const eligibleHeader = 'Attribution-Reporting-Eligible';
-const supportHeader = 'Attribution-Reporting-Support';
 
 const registerAttributionSrc = async (t, {
   source,

third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/reporting_origin.py

diff --git a/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/reporting_origin.py b/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/reporting_origin.py
index 0e02ad9..c198215 100644
--- a/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/reporting_origin.py
+++ b/third_party/blink/web_tests/wpt_internal/attribution-reporting/resources/reporting_origin.py
@@ -34,6 +34,7 @@
         if not sources_set:
             return False
         if source_id not in sources_set:
+            stash.put(SOURCES, sources_set)
             return False
 
         sources_set.remove(source_id)

third_party/blink/web_tests/wpt_internal/attribution-reporting/source-registration.sub.https.html

diff --git a/third_party/blink/web_tests/wpt_internal/attribution-reporting/source-registration.sub.https.html b/third_party/blink/web_tests/wpt_internal/attribution-reporting/source-registration.sub.https.html
index 6d24d5a..265e01d 100644
--- a/third_party/blink/web_tests/wpt_internal/attribution-reporting/source-registration.sub.https.html
+++ b/third_party/blink/web_tests/wpt_internal/attribution-reporting/source-registration.sub.https.html
@@ -34,6 +34,8 @@
     cookie: attributionDebugCookie,
   });
 
+  console.log('source-event-id', source.source_event_id);
+
   await waitForSourceToBeRegistered(source.source_event_id);
   await registerAttributionSrc(t, {
     trigger: {
@@ -43,6 +45,7 @@
   });
 
   const payload = await pollEventLevelReports(reportingOrigin);
+  console.log('event-level-reports', JSON.stringify(payload));
   assert_equals(payload.reports.length, 1);
 
   const report = JSON.parse(payload.reports[0].body);
@@ -50,6 +53,7 @@
   assert_equals(report.source_type, sourceType);
 
   const debugReportPayload = await pollVerboseDebugReports(reportingOrigin);
+  console.log('verbose-debug-reports', JSON.stringify(debugReportPayload));
   assert_equals(debugReportPayload.reports.length, 1);
   const debugReport = JSON.parse(debugReportPayload.reports[0].body);
   assert_equals(debugReport.length, 1);

third_party/blink/web_tests/wpt_internal/css/css-values/hypot-function-edge-cases.html

diff --git a/third_party/blink/web_tests/wpt_internal/css/css-values/hypot-function-edge-cases.html b/third_party/blink/web_tests/wpt_internal/css/css-values/hypot-function-edge-cases.html
new file mode 100644
index 0000000..9cfe83e
--- /dev/null
+++ b/third_party/blink/web_tests/wpt_internal/css/css-values/hypot-function-edge-cases.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<title>hypot() function extreme cases</title>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/numeric-testcommon.js"></script>
+
+<meta name=author content="sakhapov@chromium.org">
+<link rel=help href="https://drafts.csswg.org/css-values-4/#round-func">
+
+<div id=target></div>
+<script>
+test_math_used('hypot(3,4)', '5', {type:'number'});
+test_math_used('hypot(3e-154,4e-154)', '5e-154', {type:'number'});
+test_math_used('hypot(pow(10, 300), pow(10, 300), pow(10, 300), pow(10, 300))', 'calc(2 * pow(10, 300))', {type:'number'});
+</script>

third_party/freetype/README.chromium

diff --git a/third_party/freetype/README.chromium b/third_party/freetype/README.chromium
index e921590..1ad0eee4 100644
--- a/third_party/freetype/README.chromium
+++ b/third_party/freetype/README.chromium
@@ -1,7 +1,7 @@
 Name: FreeType
 URL: http://www.freetype.org/
-Version: VER-2-13-0-71-gc4fe77c3f
-Revision: c4fe77c3f072fab930267f95510562e7aeb03302
+Version: VER-2-13-0-70-gea9fca0ad
+Revision: ea9fca0add69e1613eee3290e18c1f8cb4d17a43
 CPEPrefix: cpe:/a:freetype:freetype:2.12.1
 License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
          JPEG Group) licenses"

tools/metrics/histograms/enums.xml

diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index af2108f..4dd73b5a 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -42300,6 +42300,10 @@
   <int value="32" label="NotSignedInWithIdp"/>
   <int value="33" label="AccountsListEmpty"/>
   <int value="34" label="WellKnownListEmpty"/>
+  <int value="35" label="WellKnownInvalidContentType"/>
+  <int value="36" label="ConfigInvalidContentType"/>
+  <int value="37" label="AccountsInvalidContentType"/>
+  <int value="38" label="IdTokenInvalidContentType"/>
 </enum>
 
 <enum name="FedCmReturningAccounts">
@@ -58723,6 +58727,7 @@
   <int value="-1793010019" label="DesktopPWAsKeepAlive:enabled"/>
   <int value="-1792162033" label="WebID:enabled"/>
   <int value="-1791226955" label="BreakingNewsPush:enabled"/>
+  <int value="-1790251283" label="GainmapHdrImages:disabled"/>
   <int value="-1790227231" label="show-autofill-signatures"/>
   <int value="-1789139269" label="SmbFs:disabled"/>
   <int value="-1788763369" label="PrintingPpdChannel:disabled"/>
@@ -60061,6 +60066,7 @@
       label="ContextMenuSearchAndShopWithGoogleLens:enabled"/>
   <int value="-1080893507" label="MessagesForAndroidStackingAnimation:enabled"/>
   <int value="-1080300455" label="ProductivityLauncherImageSearch:disabled"/>
+  <int value="-1080220553" label="PrinterSettingsRevamp:enabled"/>
   <int value="-1078892725" label="ReduceAcceptLanguage:enabled"/>
   <int value="-1078093206" label="ash-debug-shortcuts"/>
   <int value="-1077752943" label="enable-password-generation"/>
@@ -61399,6 +61405,7 @@
   <int value="-349057743" label="extensions-on-chrome-urls"/>
   <int value="-347654657" label="CSSColorSchemeUARendering:enabled"/>
   <int value="-347036716" label="OmniboxDomainSuggestions:disabled"/>
+  <int value="-346600492" label="GainmapHdrImages:enabled"/>
   <int value="-346413328" label="UseNewAcceptLanguageHeader:disabled"/>
   <int value="-345838366" label="enable-hosted-apps-in-windows"/>
   <int value="-345324571" label="enable-quirks-client"/>
@@ -61968,6 +61975,8 @@
   <int value="-36503306" label="HomepageLocationPolicy:enabled"/>
   <int value="-36234530" label="PluginVmShowMicrophonePermissions:enabled"/>
   <int value="-36077995" label="SplitCacheByNetworkIsolationKey:disabled"/>
+  <int value="-36007541"
+      label="DataRetentionPoliciesDisableSyncTypesNeeded:enabled"/>
   <int value="-35745997" label="TabSearch:enabled"/>
   <int value="-35528548" label="LensImageFormatOptimizations:disabled"/>
   <int value="-35388407" label="AshNewSystemMenu:disabled"/>
@@ -62291,6 +62300,8 @@
   <int value="127789400" label="PrivacyElevatedAndroid:enabled"/>
   <int value="128086566" label="D3D11VideoDecoder:enabled"/>
   <int value="128323385" label="WebUIOmniboxPopup:enabled"/>
+  <int value="128569277"
+      label="DataRetentionPoliciesDisableSyncTypesNeeded:disabled"/>
   <int value="129246815" label="AudioSettingsPage:disabled"/>
   <int value="129458360" label="LiteVideo:disabled"/>
   <int value="130059719" label="ThreadedPreloadScanner:disabled"/>
@@ -65514,6 +65525,7 @@
   <int value="1888665816"
       label="AutofillTouchToFillForCreditCardsAndroid:disabled"/>
   <int value="1888812860" label="ChromeModernAlternateCardLayout:enabled"/>
+  <int value="1888896587" label="PrinterSettingsRevamp:disabled"/>
   <int value="1889038381" label="AppManagementAppDetails:disabled"/>
   <int value="1889051856" label="eol-reset-dismissed-prefs:enabled"/>
   <int value="1889076955" label="disable-app-link"/>
@@ -102742,6 +102754,7 @@
   <int value="517482723" label="IFX 9655 rev 38 fw 4.32 build 036f"/>
   <int value="533446617" label="CROS Cr50 0.5.111"/>
   <int value="545386023" label="IFX 9670 rev 15 fw 6.43 build 00f3"/>
+  <int value="555754648" label="CROS Ti50 0.23.21"/>
   <int value="562513455" label="CROS Cr50 0.4.12"/>
   <int value="563952990" label="CROS Cr50 0.6.51"/>
   <int value="618235807" label="CROS Cr50 0.3.18"/>

tools/metrics/histograms/metadata/autofill/histograms.xml

diff --git a/tools/metrics/histograms/metadata/autofill/histograms.xml b/tools/metrics/histograms/metadata/autofill/histograms.xml
index 7a04201..b818fd5 100644
--- a/tools/metrics/histograms/metadata/autofill/histograms.xml
+++ b/tools/metrics/histograms/metadata/autofill/histograms.xml
@@ -278,7 +278,7 @@
 </variants>
 
 <histogram name="Autocomplete.DaysSinceLastUse" units="days"
-    expires_after="2023-10-08">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-team@google.com</owner>
   <summary>
@@ -290,7 +290,7 @@
 </histogram>
 
 <histogram name="Autocomplete.Events" enum="AutocompleteEvents"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-team@google.com</owner>
   <summary>
@@ -367,7 +367,7 @@
 </histogram>
 
 <histogram name="Autofill.AddressesDeletedForDisuse" units="addresses"
-    expires_after="2023-08-27">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -378,7 +378,7 @@
 </histogram>
 
 <histogram name="Autofill.AddressesSuppressedForDisuse" units="addresses"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -392,7 +392,7 @@
 
 <histogram name="Autofill.AddressProfileImportCountrySpecificFieldRequirements"
     enum="AutofillAddressProfileImportCountrySpecificFieldRequirement"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>koerber@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -403,7 +403,7 @@
 </histogram>
 
 <histogram name="Autofill.AddressProfileImportRequirements"
-    enum="AutofillAddressProfileImportRequirement" expires_after="2023-08-20">
+    enum="AutofillAddressProfileImportRequirement" expires_after="2023-12-12">
   <owner>koerber@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -413,7 +413,7 @@
 </histogram>
 
 <histogram name="Autofill.AddressProfileImportStatus"
-    enum="AutofillAddressProfileImportStatus" expires_after="2023-08-20">
+    enum="AutofillAddressProfileImportStatus" expires_after="2023-12-12">
   <owner>koerber@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -422,7 +422,7 @@
 </histogram>
 
 <histogram name="Autofill.AddressSuggestionsCount" units="units"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -1259,7 +1259,7 @@
 </histogram>
 
 <histogram name="Autofill.CreditCardFillingInfoBar"
-    enum="AutofillCreditCardInfoBar" expires_after="2023-09-30">
+    enum="AutofillCreditCardInfoBar" expires_after="2023-12-12">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -1270,7 +1270,7 @@
 </histogram>
 
 <histogram name="Autofill.CreditCardInfoBar{AutofillCreditCardInfoBarSaveType}"
-    enum="AutofillCreditCardInfoBar" expires_after="2023-09-30">
+    enum="AutofillCreditCardInfoBar" expires_after="2023-12-12">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -1371,7 +1371,7 @@
 </histogram>
 
 <histogram name="Autofill.CreditCardsDeletedForDisuse" units="units"
-    expires_after="2023-09-30">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -1382,7 +1382,7 @@
 </histogram>
 
 <histogram name="Autofill.CreditCardsSuppressedForDisuse" units="units"
-    expires_after="2023-06-18">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -1444,7 +1444,7 @@
 </histogram>
 
 <histogram name="Autofill.DaysSinceLastUse.CreditCard" units="days"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -1465,7 +1465,7 @@
 </histogram>
 
 <histogram name="Autofill.DaysSinceLastUse.StoredCreditCard" units="days"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
 <!-- Name completed by histogram_suffixes name="AutofillCreditCardType" -->
@@ -1491,7 +1491,7 @@
 </histogram>
 
 <histogram name="Autofill.DaysSinceLastUse.StoredProfile" units="days"
-    expires_after="2023-06-18">
+    expires_after="2023-12-12">
   <obsolete>
     Deprecated in M111. Subsumed by
     Autofill.DaysSinceLastUse.StoredProfile.Legacy.
@@ -1507,7 +1507,7 @@
 </histogram>
 
 <histogram name="Autofill.DaysSinceLastUse.StoredProfile.{Category}"
-    units="days" expires_after="2023-12-31">
+    units="days" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -1531,7 +1531,7 @@
 </histogram>
 
 <histogram name="Autofill.EditedAutofilledFieldAtSubmission.Aggregate"
-    enum="AutofilledFieldUserEditingStatus" expires_after="2023-08-20">
+    enum="AutofilledFieldUserEditingStatus" expires_after="2023-12-12">
   <owner>koerber@google.com</owner>
   <owner>battre@google.com</owner>
   <summary>
@@ -1542,7 +1542,7 @@
 
 <histogram name="Autofill.EditedAutofilledFieldAtSubmission.ByFieldType"
     enum="AutofilledFieldUserEditingStatusByFieldType"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>koerber@google.com</owner>
   <owner>battre@google.com</owner>
   <summary>
@@ -1552,7 +1552,7 @@
 </histogram>
 
 <histogram name="Autofill.EditedAutofilledFieldAtSubmission2.Aggregate"
-    enum="AutofilledFieldUserEditingStatus" expires_after="2023-10-08">
+    enum="AutofilledFieldUserEditingStatus" expires_after="2023-12-12">
   <owner>koerber@google.com</owner>
   <owner>battre@google.com</owner>
   <summary>
@@ -1564,7 +1564,7 @@
 
 <histogram name="Autofill.EditedAutofilledFieldAtSubmission2.ByFieldType"
     enum="AutofilledFieldUserEditingStatusByFieldType"
-    expires_after="2023-10-08">
+    expires_after="2023-12-12">
   <owner>koerber@google.com</owner>
   <owner>battre@google.com</owner>
   <summary>
@@ -1732,7 +1732,7 @@
 </histogram>
 
 <histogram name="Autofill.FieldCount" units="form fields"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -2039,7 +2039,7 @@
 </histogram>
 
 <histogram name="Autofill.FormEvents.CreditCard{AutofillDataAvailability}"
-    enum="AutofillFormEvent" expires_after="2023-09-01">
+    enum="AutofillFormEvent" expires_after="2023-12-12">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -2133,7 +2133,7 @@
 </histogram>
 
 <histogram name="Autofill.FormSubmittedState" enum="AutofillFormSubmittedState"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>The autofill state related to a submitted form.</summary>
@@ -2383,7 +2383,7 @@
 </histogram>
 
 <histogram name="Autofill.IsEnabled.Startup" enum="BooleanEnabled"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -2846,7 +2846,7 @@
 </histogram>
 
 <histogram name="Autofill.NumberOfEditedAutofilledFieldsAtSubmission"
-    units="fields" expires_after="2023-08-20">
+    units="fields" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -2856,7 +2856,7 @@
 </histogram>
 
 <histogram name="Autofill.NumberOfProfilesConsideredForDedupe" units="profiles"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -2874,7 +2874,7 @@
 </histogram>
 
 <histogram name="Autofill.NumElementsMatchesNumFields" enum="Boolean"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -3332,7 +3332,7 @@
 </histogram>
 
 <histogram name="Autofill.ProfileActionOnFormSubmitted"
-    enum="AutofillProfileAction" expires_after="2023-08-20">
+    enum="AutofillProfileAction" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -3607,7 +3607,7 @@
 </histogram>
 
 <histogram name="Autofill.ProfileSuggestionsMadeWithFormatter"
-    enum="BooleanCreated" expires_after="2023-10-30">
+    enum="BooleanCreated" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/components/autofill/OWNERS</owner>
   <summary>
@@ -3834,7 +3834,7 @@
 </histogram>
 
 <histogram name="Autofill.ScanCreditCard.Completed" enum="BooleanCompleted"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>Whether a credit card scan was completed or cancelled.</summary>
@@ -3855,7 +3855,7 @@
 </histogram>
 
 <histogram name="Autofill.ScanCreditCardPrompt"
-    enum="AutofillScanCreditCardPrompt" expires_after="2023-08-20">
+    enum="AutofillScanCreditCardPrompt" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>jsaul@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -3886,7 +3886,7 @@
 </histogram>
 
 <histogram name="Autofill.ServerCardLinkClicked" enum="AutofillSyncState"
-    expires_after="2023-09-30">
+    expires_after="2023-12-12">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
@@ -3978,7 +3978,7 @@
 </histogram>
 
 <histogram name="Autofill.SkippingFormFillDueToChangedFieldCount"
-    enum="Boolean" expires_after="2023-08-20">
+    enum="Boolean" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -4013,7 +4013,7 @@
 </histogram>
 
 <histogram name="Autofill.StoredCreditCardCount" units="cards"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
 <!-- Name completed by histogram_suffixes name="AutofillCreditCardType" -->
@@ -4045,7 +4045,7 @@
 </histogram>
 
 <histogram name="Autofill.StoredCreditCardDisusedCount" units="cards"
-    expires_after="2023-07-09">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
 <!-- Name completed by histogram_suffixes name="AutofillCreditCardType" -->
@@ -4095,7 +4095,7 @@
 </histogram>
 
 <histogram name="Autofill.StoredProfileCount" units="units"
-    expires_after="2023-06-18">
+    expires_after="2023-12-12">
   <obsolete>
     Deprecated in M111. Subsumed by Autofill.StoredProfileCount.Legacy.
   </obsolete>
@@ -4107,7 +4107,7 @@
 </histogram>
 
 <histogram name="Autofill.StoredProfileCount.{Category}" units="Profiles"
-    expires_after="2023-12-31">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -4128,7 +4128,7 @@
 </histogram>
 
 <histogram name="Autofill.StoredProfileDisusedCount" units="units"
-    expires_after="2023-06-18">
+    expires_after="2023-12-12">
   <obsolete>
     Deprecated in M111. Subsumed by Autofill.StoredProfileDisusedCount.Legacy.
   </obsolete>
@@ -4143,7 +4143,7 @@
 </histogram>
 
 <histogram name="Autofill.StoredProfileDisusedCount.{Category}"
-    units="Profiles" expires_after="2023-12-31">
+    units="Profiles" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -4399,7 +4399,7 @@
 </histogram>
 
 <histogram name="Autofill.SubmittedValuePatterns" enum="AutofillValuePatterns"
-    expires_after="2023-08-20">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>jsaul@google.com</owner>
   <owner>koerber@google.com</owner>
@@ -4422,7 +4422,7 @@
 </histogram>
 
 <histogram name="Autofill.SuggestionAcceptedIndex.Autocomplete"
-    units="position" expires_after="2023-08-20">
+    units="position" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill-alerts@google.com</owner>
   <summary>
@@ -4487,7 +4487,7 @@
 </histogram>
 
 <histogram name="Autofill.Timing.{AutofillTimedFunction}" units="ms"
-    expires_after="2023-06-30">
+    expires_after="2023-12-12">
   <owner>schwering@chromium.org</owner>
   <owner>kenjitoyama@chromium.org</owner>
   <owner>battre@chromium.org</owner>
@@ -5253,14 +5253,14 @@
 </histogram>
 
 <histogram name="Autofill.WebView.AutofillSession" enum="AutofillSessionStates"
-    expires_after="2023-06-01">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>Records the state of an autofill session.</summary>
 </histogram>
 
 <histogram name="Autofill.WebView.AwGIsCurrentService" enum="BooleanYesNo"
-    expires_after="2023-06-01">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -5271,14 +5271,14 @@
 </histogram>
 
 <histogram name="Autofill.WebView.CreatedByActivityContext"
-    enum="BooleanEnabled" expires_after="2023-06-01">
+    enum="BooleanEnabled" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>Whether the autofill is created by activity context.</summary>
 </histogram>
 
 <histogram name="Autofill.WebView.Enabled" enum="BooleanEnabled"
-    expires_after="2023-06-01">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -5423,7 +5423,7 @@
 </histogram>
 
 <histogram name="Autofill.WebView.ServerPrediction.AwGSuggestionAvailability"
-    enum="AutofillAwGSuggestionAvailability" expires_after="2023-06-01">
+    enum="AutofillAwGSuggestionAvailability" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -5434,7 +5434,7 @@
 </histogram>
 
 <histogram name="Autofill.WebView.ServerPredicton.HasValidServerPrediction"
-    enum="BooleanYesNo" expires_after="2023-06-01">
+    enum="BooleanYesNo" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -5446,7 +5446,7 @@
 </histogram>
 
 <histogram name="Autofill.WebView.ServerPredicton.PredictionAvailability"
-    enum="AutofillServerPredictionAvailability" expires_after="2023-06-01">
+    enum="AutofillServerPredictionAvailability" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -5459,21 +5459,21 @@
 </histogram>
 
 <histogram name="Autofill.WebView.SubmissionSource"
-    enum="AutofillSubmissionSource" expires_after="2023-06-01">
+    enum="AutofillSubmissionSource" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>Records the source of form submission.</summary>
 </histogram>
 
 <histogram name="Autofill.WebView.SuggestionTime" units="ms"
-    expires_after="2023-06-01">
+    expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>The time taken to display suggestion.</summary>
 </histogram>
 
 <histogram name="Autofill.WebView.UserChangedAutofilledField"
-    enum="BooleanEnabled" expires_after="2023-06-01">
+    enum="BooleanEnabled" expires_after="2023-12-12">
   <owner>battre@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>Whether the user changed autofilled field.</summary>

tools/metrics/histograms/metadata/blink/histograms.xml

diff --git a/tools/metrics/histograms/metadata/blink/histograms.xml b/tools/metrics/histograms/metadata/blink/histograms.xml
index 72bf8bf..eddc2b8 100644
--- a/tools/metrics/histograms/metadata/blink/histograms.xml
+++ b/tools/metrics/histograms/metadata/blink/histograms.xml
@@ -2201,6 +2201,29 @@
   </summary>
 </histogram>
 
+<histogram name="Blink.LazyLoadedImage.Size" units="KB"
+    expires_after="2023-10-10">
+  <owner>pdr@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Total network response size for each lazy loaded image that has loaded. This
+    is recorded at the point that the image element completes loading. This
+    includes all entries in `Blink.LazyLoadedImageBeforeDocumentOnLoad.Size` as
+    well as lazy loaded images that load after document load.
+  </summary>
+</histogram>
+
+<histogram name="Blink.LazyLoadedImageBeforeDocumentOnLoad.Size" units="KB"
+    expires_after="2023-10-10">
+  <owner>pdr@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Total network response size for each lazy loaded image that has loaded
+    before the document has finished loading. This is recorded at the point that
+    the image element completes loading.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Blink.LazyLoadIntersectionObserver.UpdateTime"
     units="microseconds" expires_after="2023-12-11">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->

tools/metrics/histograms/metadata/browser/histograms.xml

diff --git a/tools/metrics/histograms/metadata/browser/histograms.xml b/tools/metrics/histograms/metadata/browser/histograms.xml
index 8043832..59d378ef 100644
--- a/tools/metrics/histograms/metadata/browser/histograms.xml
+++ b/tools/metrics/histograms/metadata/browser/histograms.xml
@@ -292,7 +292,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.CompressedOnDiskSize" units="KB"
-    expires_after="2023-05-27">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -303,7 +303,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.NumberOfFramesCaptured"
-    units="units" expires_after="2023-05-27">
+    units="units" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -313,7 +313,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.Success" enum="BooleanSuccess"
-    expires_after="2023-05-27">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -323,7 +323,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.TotalCaptureDuration" units="ms"
-    expires_after="2023-07-30">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -334,7 +334,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.CompositorProcessStartedCorrectly"
-    enum="BooleanSuccess" expires_after="2023-07-30">
+    enum="BooleanSuccess" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -344,7 +344,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.CompositorProcessStartupTime"
-    units="ms" expires_after="2023-07-30">
+    units="ms" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -354,7 +354,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.LinkClicked" enum="BooleanSuccess"
-    expires_after="2023-07-30">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -362,7 +362,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.TimeToFirstBitmap" units="ms"
-    expires_after="2023-10-01">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -373,7 +373,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.CompositorFailureReason"
-    enum="TabbedPaintPreviewCompositorFailureReason" expires_after="2023-05-27">
+    enum="TabbedPaintPreviewCompositorFailureReason" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -385,7 +385,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.ExitCause"
-    enum="TabbedPaintPreviewExitCause" expires_after="2023-07-30">
+    enum="TabbedPaintPreviewExitCause" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -396,7 +396,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.FirstPaintBeforeTabLoad"
-    enum="Boolean" expires_after="2023-07-30">
+    enum="Boolean" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -407,7 +407,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.HadCapture" enum="Boolean"
-    expires_after="2023-05-27">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -419,7 +419,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.SnackbarCount" units="units"
-    expires_after="2023-05-27">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -430,7 +430,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.TimeToFirstBitmap"
-    units="ms" expires_after="2023-10-01">
+    units="ms" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -442,7 +442,7 @@
 
 <histogram
     name="Browser.PaintPreview.TabbedPlayer.UpTime{TabbedPaintPreviewPlayerUptime}"
-    units="ms" expires_after="2023-05-27">
+    units="ms" expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>chrome-fdt@google.com</owner>
@@ -469,7 +469,7 @@
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabService.DiskUsageAtStartup" units="KB"
-    expires_after="2023-05-27">
+    expires_after="2023-11-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <summary>

tools/metrics/histograms/metadata/histogram_suffixes_list.xml

diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
index a2b039d..f240db3 100644
--- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -3281,7 +3281,6 @@
       name="PageLoad.DocumentTiming.NavigationToDOMContentLoadedEventFired"/>
   <affected-histogram
       name="PageLoad.DocumentTiming.NavigationToLoadEventFired"/>
-  <affected-histogram name="PageLoad.Experimental.Bytes.Network"/>
   <affected-histogram
       name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.PaintTiming.NavigationToFirstImagePaint"/>
@@ -3381,8 +3380,6 @@
   <affected-histogram
       name="PageLoad.DocumentTiming.NavigationToLoadEventFired"/>
   <affected-histogram
-      name="PageLoad.Experimental.Bytes.NetworkIncludingHeaders"/>
-  <affected-histogram
       name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad"/>
 </histogram_suffixes>
@@ -3417,8 +3414,6 @@
   <affected-histogram
       name="PageLoad.DocumentTiming.NavigationToLoadEventFired"/>
   <affected-histogram
-      name="PageLoad.Experimental.Bytes.NetworkIncludingHeaders"/>
-  <affected-histogram
       name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad"/>
 </histogram_suffixes>
@@ -3509,8 +3504,6 @@
       name="PageLoad.Clients.ServiceWorker2.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram
       name="PageLoad.Clients.ServiceWorker2.ParseTiming.NavigationToParseStart"/>
-  <affected-histogram name="PageLoad.Experimental.Bytes.Network"/>
-  <affected-histogram name="PageLoad.Experimental.Bytes.Total2"/>
   <affected-histogram
       name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.NavigationToParseStart"/>

tools/metrics/histograms/metadata/page/histograms.xml

diff --git a/tools/metrics/histograms/metadata/page/histograms.xml b/tools/metrics/histograms/metadata/page/histograms.xml
index 2f2f635..82ee8ac 100644
--- a/tools/metrics/histograms/metadata/page/histograms.xml
+++ b/tools/metrics/histograms/metadata/page/histograms.xml
@@ -1597,40 +1597,6 @@
   </summary>
 </histogram>
 
-<histogram name="PageLoad.Experimental.Bytes.Network" units="KB"
-    expires_after="2022-10-09">
-  <owner>jkarlin@chromium.org</owner>
-  <summary>
-    The number of prefiltered (e.g., compressed) response body KiloBytes loaded
-    over the network via the browser process for a page load. Does not include
-    any header or overhead bytes. Recorded when the page load is terminated.
-    Only recorded for complete resources.
-  </summary>
-</histogram>
-
-<histogram name="PageLoad.Experimental.Bytes.NetworkIncludingHeaders"
-    units="KB" expires_after="2022-08-21">
-  <owner>jkarlin@chromium.org</owner>
-  <summary>
-    The number of prefiltered (e.g., compressed) KiloBytes loaded over the
-    network via the browser process for a page load. This includes network
-    headers/overhead. Recorded when the page load is terminated. Recorded for
-    incomplete resources.
-  </summary>
-</histogram>
-
-<histogram name="PageLoad.Experimental.Bytes.Total2" units="KB"
-    expires_after="2022-08-21">
-  <owner>jkarlin@chromium.org</owner>
-  <owner>johnidel@chromium.org</owner>
-  <summary>
-    The number of prefiltered (e.g., compressed) response body KiloBytes loaded
-    via the browser process for a page load. Does not include any header or
-    overhead bytes. Recorded when the page load is terminated. Only recorded for
-    complete resources. Includes resources from both the http and memory cache.
-  </summary>
-</histogram>
-
 <histogram name="PageLoad.Experimental.ClickInputBurst" units="count"
     expires_after="2024-02-24">
   <owner>dougarnett@chromium.org</owner>

tools/metrics/histograms/metadata/sb_client/histograms.xml

diff --git a/tools/metrics/histograms/metadata/sb_client/histograms.xml b/tools/metrics/histograms/metadata/sb_client/histograms.xml
index 73de140..7657a2a 100644
--- a/tools/metrics/histograms/metadata/sb_client/histograms.xml
+++ b/tools/metrics/histograms/metadata/sb_client/histograms.xml
@@ -655,8 +655,8 @@
 </histogram>
 
 <histogram name="SBClientPhishing.FlatBufferScorer.CreationStatus"
-    enum="SBClientPhishingScorerCreationStatus" expires_after="2023-04-25">
-  <owner>drubery@chromium.org</owner>
+    enum="SBClientPhishingScorerCreationStatus" expires_after="2024-04-25">
+  <owner>andysjlim@chromium.org</owner>
   <owner>chrome-counter-abuse-alerts@google.com</owner>
   <summary>
     Records the status when we create a FlatBuffer scorer object for the

tools/perf/benchmark.csv

diff --git a/tools/perf/benchmark.csv b/tools/perf/benchmark.csv
index 58bc181..f4fc987 100644
--- a/tools/perf/benchmark.csv
+++ b/tools/perf/benchmark.csv
@@ -69,14 +69,12 @@
 speedometer2,"cbruni@chromium.org, vahl@chromium.org",Blink>JavaScript,,all
 speedometer2-future,"cbruni@chromium.org, vahl@chromium.org",Blink>JavaScript,,all
 speedometer2-minormc,omerkatz@chromium.org,Blink>JavaScript>GarbageCollection,,all
-speedometer2-pcscan,tmrts@chromium.org,Blink>JavaScript,,all
 startup.mobile,"pasko@chromium.org, lizeb@chromium.org",Speed>Metrics>SystemHealthRegressions,,
 sync_performance_tests,mastiz@chromium.org,Services>Sync,https://chromium.googlesource.com/chromium/src/+/HEAD/components/sync/README.md,
 system_health.common_desktop,"charliea@chromium.org, sullivan@chromium.org, tdresser@chromium.org, chrome-speed-metrics-dev@chromium.org",Speed>Metrics>SystemHealthRegressions,https://bit.ly/system-health-benchmarks,"2016,2018,2019,2020,2021,accessibility,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy,keyboard_input,scroll,tabs_switching,wasm,webgl"
 system_health.common_mobile,"charliea@chromium.org, sullivan@chromium.org, tdresser@chromium.org, chrome-speed-metrics-dev@chromium.org",Speed>Metrics>SystemHealthRegressions,https://bit.ly/system-health-benchmarks,"2016,2018,2019,2020,2021,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy"
 system_health.memory_desktop,"pasko@chromium.org, lizeb@chromium.org",,https://bit.ly/system-health-benchmarks,"2016,2018,2019,2020,2021,accessibility,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy,keyboard_input,scroll,tabs_switching,wasm,webgl"
 system_health.memory_mobile,"pasko@chromium.org, lizeb@chromium.org",,https://bit.ly/system-health-benchmarks,"2016,2018,2019,2020,2021,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy"
-system_health.pcscan,"tmrts@chromium.org, mlippautz@chromium.org",Blink,https://bit.ly/36XBtpn,"2021,health_check,javascript_heavy"
 system_health.webview_startup,"oksamyt@chromium.org, torne@chromium.org, changwan@chromium.org",Mobile>WebView>Perf,,2016
 tab_switching.typical_25,vovoy@chromium.org,OS>Performance,,"2016,tabs_switching"
 tracing.tracing_with_background_memory_infra,ssid@chromium.org,,,

tools/perf/benchmarks/speedometer2.py

diff --git a/tools/perf/benchmarks/speedometer2.py b/tools/perf/benchmarks/speedometer2.py
index 2fdf3a3..551351f1 100644
--- a/tools/perf/benchmarks/speedometer2.py
+++ b/tools/perf/benchmarks/speedometer2.py
@@ -143,22 +143,6 @@
     options.AppendExtraBrowserArgs('--enable-features=V8VmFuture')
 
 
-@benchmark.Info(emails=['tmrts@chromium.org'], component='Blink>JavaScript')
-class Speedometer2PCScan(Speedometer2):
-  """Speedometer2 benchmark with the PCScanRendererOnly flag.
-
-  Shows the performance of upcoming PCScan feature.
-  """
-
-  @classmethod
-  def Name(cls):
-    return 'speedometer2-pcscan'
-
-  def SetExtraBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs(
-        '--enable-features=PartitionAllocPCScanRendererOnly')
-
-
 @benchmark.Info(emails=['omerkatz@chromium.org'],
                 component='Blink>JavaScript>GarbageCollection')
 class Speedometer2MinorMC(Speedometer2):

tools/perf/benchmarks/system_health.py

diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py
index 4438011..8148f95 100644
--- a/tools/perf/benchmarks/system_health.py
+++ b/tools/perf/benchmarks/system_health.py
@@ -271,29 +271,3 @@
   @classmethod
   def Name(cls):
     return 'system_health.webview_startup'
-
-
-@benchmark.Info(emails=['tmrts@chromium.org', 'mlippautz@chromium.org'],
-                component='Blink',
-                documentation_url='https://bit.ly/36XBtpn')
-class PCScanSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
-  """PCScan feature benchmark
-
-  Benchmark that enables PCScan feature.
-  """
-  options = {'pageset_repeat': 20}
-  SUPPORTED_PLATFORM_TAGS = [platforms.DESKTOP, platforms.MOBILE]
-  SUPPORTED_PLATFORMS = [
-      story.expectations.ALL_DESKTOP, story.expectations.ALL_MOBILE
-  ]
-
-  def CreateStorySet(self, options):
-    return page_sets.SystemHealthPCScanStorySet()
-
-  @classmethod
-  def Name(cls):
-    return 'system_health.pcscan'
-
-  def SetExtraBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs(
-        '--enable-features=PartitionAllocPCScanBrowserOnly')

tools/perf/benchmarks/system_health_unittest.py

diff --git a/tools/perf/benchmarks/system_health_unittest.py b/tools/perf/benchmarks/system_health_unittest.py
index d0f7256..215cdece 100644
--- a/tools/perf/benchmarks/system_health_unittest.py
+++ b/tools/perf/benchmarks/system_health_unittest.py
@@ -29,16 +29,13 @@
   def testNamePrefix(self):
     for b in _GetAllSystemHealthBenchmarks():
       self.assertTrue(
-          b.Name().startswith('system_health.')
-          or b.Name().startswith('UNSCHEDULED_system_health.'),
+          b.Name().startswith('system_health.'),
           '%r must have name starting with "system_health." prefix' % b)
 
   def testSystemHealthStorySetIsUsed(self):
     for b in _GetAllSystemHealthBenchmarks():
       if b is system_health_benchmark.WebviewStartupSystemHealthBenchmark:
         continue
-      if b is system_health_benchmark.PCScanSystemHealthBenchmark:
-        continue
       self.assertIsInstance(
           b().CreateStorySet(None),
           system_health_stories.SystemHealthStorySet,

tools/perf/contrib/cluster_telemetry/ad_tagging_ct.py

diff --git a/tools/perf/contrib/cluster_telemetry/ad_tagging_ct.py b/tools/perf/contrib/cluster_telemetry/ad_tagging_ct.py
index 208f9c1d..ae244472 100644
--- a/tools/perf/contrib/cluster_telemetry/ad_tagging_ct.py
+++ b/tools/perf/contrib/cluster_telemetry/ad_tagging_ct.py
@@ -14,13 +14,13 @@
 _NAVIGATION_TIMEOUT = 180
 _QUIESCENCE_TIMEOUT = 30
 
+
 # Benchmark to measure various UMA histograms relevant to AdTagging as well as
 # CPU usage on page loads. These measurements will help to determine the
 # accuracy of AdTagging.
-@benchmark.Info(emails=['alexmt@chromium.org','johnidel@chromium.org'],
+@benchmark.Info(emails=['alexmt@chromium.org', 'johnidel@chromium.org'],
                 component='UI>Browser>AdFilter')
 class AdTaggingClusterTelemetry(perf_benchmark.PerfBenchmark):
-
   @classmethod
   def AddBenchmarkCommandLineArgs(cls, parser):
     ct_benchmarks_util.AddBenchmarkCommandLineArgs(parser)
@@ -28,14 +28,12 @@
         '--additional-histograms',
         action='store',
         help='Comma-separated list of additional UMA histograms to record.')
-    parser.add_option(
-        '--verbose-cpu-metrics',
-        action='store_true',
-        help='Enables non-UMA CPU metrics.')
-    parser.add_option(
-        '--verbose-memory-metrics',
-        action='store_true',
-        help='Enables non-UMA memory metrics.')
+    parser.add_option('--verbose-cpu-metrics',
+                      action='store_true',
+                      help='Enables non-UMA CPU metrics.')
+    parser.add_option('--verbose-memory-metrics',
+                      action='store_true',
+                      help='Enables non-UMA memory metrics.')
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
@@ -75,7 +73,6 @@
         'PageLoad.Clients.Ads.FrameCounts.AdFrames.Total',
         'PageLoad.Clients.Ads.Resources.Bytes.Ads2',
         'PageLoad.Cpu.TotalUsage',
-        'PageLoad.Experimental.Bytes.NetworkIncludingHeaders',
         'PageLoad.PaintTiming.NavigationToFirstContentfulPaint',
     ]
     uma_histograms.extend(self.additional_histograms)
@@ -113,7 +110,9 @@
                              timeout_in_seconds=_NAVIGATION_TIMEOUT)
 
     return page_set.CTPageSet(
-        options.urls_list, options.user_agent, options.archive_data_file,
+        options.urls_list,
+        options.user_agent,
+        options.archive_data_file,
         run_navigate_steps_callback=NavigateToPageAndLeavePage,
         cache_temperature=cache_temperature.COLD)
 

tools/perf/core/perfetto_binary_roller/binary_deps.json

diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json
index 986a869..62b2f80 100644
--- a/tools/perf/core/perfetto_binary_roller/binary_deps.json
+++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json
@@ -5,24 +5,24 @@
             "full_remote_path": "perfetto-luci-artifacts/adbbb6c78e3a86c5e87b0338d9e42eb6b4ddbf4d/linux-arm64/trace_processor_shell"
         },
         "win": {
-            "hash": "b808fba708df2c6bc8796062e8e3d9297f5c1cd2",
-            "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/afb60fd2038ee1e383382b779a894edf83e66b5d/trace_processor_shell.exe"
+            "hash": "40f50ae700acb2db6c0792adb25377e608f92943",
+            "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/win/ef2774e07ca5e6e6484c5dff043ebc331dd0de9d/trace_processor_shell.exe"
         },
         "linux_arm": {
             "hash": "1d229abc94dea54ab4bb4327e78e18f942d08bf9",
             "full_remote_path": "perfetto-luci-artifacts/adbbb6c78e3a86c5e87b0338d9e42eb6b4ddbf4d/linux-arm/trace_processor_shell"
         },
         "mac": {
-            "hash": "eb69e424adf3465dafefbd3cbe3d169f19f6b538",
-            "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/mac/d4fef5be9b97f8fa00cb04a66949d8e1b27f03f9/trace_processor_shell"
+            "hash": "eeb75e95493d95099e8d89a9f7631cb8feffebdc",
+            "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/mac/ef2774e07ca5e6e6484c5dff043ebc331dd0de9d/trace_processor_shell"
         },
         "mac_arm64": {
             "hash": "7a4026b8718994145a52586fdec6e9447573345a",
             "full_remote_path": "perfetto-luci-artifacts/adbbb6c78e3a86c5e87b0338d9e42eb6b4ddbf4d/mac-arm64/trace_processor_shell"
         },
         "linux": {
-            "hash": "702973f14b6fac3354964e7edcc09d1b863f1565",
-            "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/linux/d4fef5be9b97f8fa00cb04a66949d8e1b27f03f9/trace_processor_shell"
+            "hash": "8a8c5a4a97ec66fc537a6978151f333d49df65ac",
+            "full_remote_path": "chromium-telemetry/perfetto_binaries/trace_processor_shell/linux/ef2774e07ca5e6e6484c5dff043ebc331dd0de9d/trace_processor_shell"
         }
     },
     "power_profile.sql": {

tools/perf/core/shard_maps/android-pixel2-perf-calibration_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel2-perf-calibration_map.json b/tools/perf/core/shard_maps/android-pixel2-perf-calibration_map.json
index 3cd538c..d3a9ea4 100644
--- a/tools/perf/core/shard_maps/android-pixel2-perf-calibration_map.json
+++ b/tools/perf/core/shard_maps/android-pixel2-perf-calibration_map.json
@@ -392,9 +392,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -449,9 +446,6 @@
                 "begin": 47,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             }

tools/perf/core/shard_maps/android-pixel2-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel2-perf-pgo_map.json b/tools/perf/core/shard_maps/android-pixel2-perf-pgo_map.json
index 80a8f5e..6419c42 100644
--- a/tools/perf/core/shard_maps/android-pixel2-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/android-pixel2-perf-pgo_map.json
@@ -303,9 +303,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -342,9 +339,6 @@
                 "begin": 34,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel2-perf_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel2-perf_map.json b/tools/perf/core/shard_maps/android-pixel2-perf_map.json
index a37b039..20453d9 100644
--- a/tools/perf/core/shard_maps/android-pixel2-perf_map.json
+++ b/tools/perf/core/shard_maps/android-pixel2-perf_map.json
@@ -422,12 +422,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel2_webview-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel2_webview-perf-pgo_map.json b/tools/perf/core/shard_maps/android-pixel2_webview-perf-pgo_map.json
index 8ac33a3..f2d198c5 100644
--- a/tools/perf/core/shard_maps/android-pixel2_webview-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/android-pixel2_webview-perf-pgo_map.json
@@ -247,9 +247,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -277,9 +274,6 @@
                 "begin": 21,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel2_webview-perf_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel2_webview-perf_map.json b/tools/perf/core/shard_maps/android-pixel2_webview-perf_map.json
index 9a1c9d0..781c58b 100644
--- a/tools/perf/core/shard_maps/android-pixel2_webview-perf_map.json
+++ b/tools/perf/core/shard_maps/android-pixel2_webview-perf_map.json
@@ -206,9 +206,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -272,9 +269,6 @@
                 "begin": 71,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel4-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel4-perf-pgo_map.json b/tools/perf/core/shard_maps/android-pixel4-perf-pgo_map.json
index 80a8f5e..6419c42 100644
--- a/tools/perf/core/shard_maps/android-pixel4-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/android-pixel4-perf-pgo_map.json
@@ -303,9 +303,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -342,9 +339,6 @@
                 "begin": 34,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel4-perf_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel4-perf_map.json b/tools/perf/core/shard_maps/android-pixel4-perf_map.json
index 8da9b714..d0b222c3 100644
--- a/tools/perf/core/shard_maps/android-pixel4-perf_map.json
+++ b/tools/perf/core/shard_maps/android-pixel4-perf_map.json
@@ -324,9 +324,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -414,9 +411,6 @@
                 "begin": 74,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel4_webview-perf_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel4_webview-perf_map.json b/tools/perf/core/shard_maps/android-pixel4_webview-perf_map.json
index ae476e3..b64b1ec 100644
--- a/tools/perf/core/shard_maps/android-pixel4_webview-perf_map.json
+++ b/tools/perf/core/shard_maps/android-pixel4_webview-perf_map.json
@@ -250,9 +250,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -326,9 +323,6 @@
                 "begin": 67,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel6-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel6-perf-pgo_map.json b/tools/perf/core/shard_maps/android-pixel6-perf-pgo_map.json
index 5f5ea57..283da62 100644
--- a/tools/perf/core/shard_maps/android-pixel6-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/android-pixel6-perf-pgo_map.json
@@ -303,9 +303,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -341,9 +338,6 @@
             "system_health.memory_mobile": {
                 "begin": 32,
                 "abridged": false
-            },
-            "system_health.pcscan": {
-                "abridged": false
             }
         }
     },

tools/perf/core/shard_maps/android-pixel6-perf_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel6-perf_map.json b/tools/perf/core/shard_maps/android-pixel6-perf_map.json
index 5f5ea57..283da62 100644
--- a/tools/perf/core/shard_maps/android-pixel6-perf_map.json
+++ b/tools/perf/core/shard_maps/android-pixel6-perf_map.json
@@ -303,9 +303,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -341,9 +338,6 @@
             "system_health.memory_mobile": {
                 "begin": 32,
                 "abridged": false
-            },
-            "system_health.pcscan": {
-                "abridged": false
             }
         }
     },

tools/perf/core/shard_maps/android-pixel6-pro-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel6-pro-perf-pgo_map.json b/tools/perf/core/shard_maps/android-pixel6-pro-perf-pgo_map.json
index a101429d..ec150447 100644
--- a/tools/perf/core/shard_maps/android-pixel6-pro-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/android-pixel6-pro-perf-pgo_map.json
@@ -213,9 +213,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -243,9 +240,6 @@
                 "begin": 10,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/android-pixel6-pro-perf_map.json

diff --git a/tools/perf/core/shard_maps/android-pixel6-pro-perf_map.json b/tools/perf/core/shard_maps/android-pixel6-pro-perf_map.json
index a101429d..ec150447 100644
--- a/tools/perf/core/shard_maps/android-pixel6-pro-perf_map.json
+++ b/tools/perf/core/shard_maps/android-pixel6-pro-perf_map.json
@@ -213,9 +213,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "startup.mobile": {
                 "abridged": false
             },
@@ -243,9 +240,6 @@
                 "begin": 10,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "system_health.webview_startup": {
                 "abridged": false
             },

tools/perf/core/shard_maps/lacros-x86-perf_map.json

diff --git a/tools/perf/core/shard_maps/lacros-x86-perf_map.json b/tools/perf/core/shard_maps/lacros-x86-perf_map.json
index bfc31cb..c209a56 100644
--- a/tools/perf/core/shard_maps/lacros-x86-perf_map.json
+++ b/tools/perf/core/shard_maps/lacros-x86-perf_map.json
@@ -222,9 +222,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 15,
                 "abridged": false
@@ -276,9 +273,6 @@
                 "begin": 79,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/linux-perf-calibration_map.json

diff --git a/tools/perf/core/shard_maps/linux-perf-calibration_map.json b/tools/perf/core/shard_maps/linux-perf-calibration_map.json
index 6e5cc06..a13907c 100644
--- a/tools/perf/core/shard_maps/linux-perf-calibration_map.json
+++ b/tools/perf/core/shard_maps/linux-perf-calibration_map.json
@@ -492,9 +492,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 30,
                 "abridged": false
@@ -558,9 +555,6 @@
                 "begin": 80,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/linux-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/linux-perf-pgo_map.json b/tools/perf/core/shard_maps/linux-perf-pgo_map.json
index 07c77eaf..55416e8 100644
--- a/tools/perf/core/shard_maps/linux-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/linux-perf-pgo_map.json
@@ -312,9 +312,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 11,
                 "abridged": false
@@ -357,9 +354,6 @@
                 "begin": 73,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/linux-perf_map.json

diff --git a/tools/perf/core/shard_maps/linux-perf_map.json b/tools/perf/core/shard_maps/linux-perf_map.json
index e4db8b16..dc0e637 100644
--- a/tools/perf/core/shard_maps/linux-perf_map.json
+++ b/tools/perf/core/shard_maps/linux-perf_map.json
@@ -595,9 +595,6 @@
             "speedometer2-minormc": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 9,
                 "abridged": false
@@ -664,9 +661,6 @@
                 "begin": 80,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/mac-laptop_high_end-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/mac-laptop_high_end-perf-pgo_map.json b/tools/perf/core/shard_maps/mac-laptop_high_end-perf-pgo_map.json
index cd89c3aa..4e0ddd0d 100644
--- a/tools/perf/core/shard_maps/mac-laptop_high_end-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/mac-laptop_high_end-perf-pgo_map.json
@@ -319,9 +319,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 1,
                 "abridged": false
@@ -364,9 +361,6 @@
                 "begin": 69,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/mac-laptop_high_end-perf_map.json

diff --git a/tools/perf/core/shard_maps/mac-laptop_high_end-perf_map.json b/tools/perf/core/shard_maps/mac-laptop_high_end-perf_map.json
index 8cb69283..58b4c5e 100644
--- a/tools/perf/core/shard_maps/mac-laptop_high_end-perf_map.json
+++ b/tools/perf/core/shard_maps/mac-laptop_high_end-perf_map.json
@@ -370,9 +370,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 7,
                 "abridged": false
@@ -436,9 +433,6 @@
                 "begin": 75,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/mac-laptop_low_end-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/mac-laptop_low_end-perf-pgo_map.json b/tools/perf/core/shard_maps/mac-laptop_low_end-perf-pgo_map.json
index 05db244..aea9700 100644
--- a/tools/perf/core/shard_maps/mac-laptop_low_end-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/mac-laptop_low_end-perf-pgo_map.json
@@ -311,9 +311,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 11,
                 "abridged": false
@@ -356,9 +353,6 @@
                 "begin": 72,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/mac-laptop_low_end-perf_map.json

diff --git a/tools/perf/core/shard_maps/mac-laptop_low_end-perf_map.json b/tools/perf/core/shard_maps/mac-laptop_low_end-perf_map.json
index 3cbcef7..8a2c44e 100644
--- a/tools/perf/core/shard_maps/mac-laptop_low_end-perf_map.json
+++ b/tools/perf/core/shard_maps/mac-laptop_low_end-perf_map.json
@@ -288,9 +288,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 23,
                 "abridged": false
@@ -351,9 +348,6 @@
                 "begin": 77,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/mac-m1_mini_2020-perf_map.json

diff --git a/tools/perf/core/shard_maps/mac-m1_mini_2020-perf_map.json b/tools/perf/core/shard_maps/mac-m1_mini_2020-perf_map.json
index 188c93b..8a991f1 100644
--- a/tools/perf/core/shard_maps/mac-m1_mini_2020-perf_map.json
+++ b/tools/perf/core/shard_maps/mac-m1_mini_2020-perf_map.json
@@ -416,9 +416,6 @@
             "speedometer2-minormc": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 47,
                 "abridged": false
@@ -488,9 +485,6 @@
                 "begin": 78,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/timing_data/android-pixel2-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/android-pixel2-perf_timing.json b/tools/perf/core/shard_maps/timing_data/android-pixel2-perf_timing.json
index ecff213..09a89a5 100644
--- a/tools/perf/core/shard_maps/timing_data/android-pixel2-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/android-pixel2-perf_timing.json
@@ -3832,10 +3832,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "57.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "58.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4452,10 +4448,6 @@
         "name": "system_health.memory_mobile/long_running:tools:gmail-foreground"
     },
     {
-        "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
         "duration": "10.0",
         "name": "tracing.tracing_with_background_memory_infra/Facebook"
     },

tools/perf/core/shard_maps/timing_data/android-pixel2_webview-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/android-pixel2_webview-perf_timing.json b/tools/perf/core/shard_maps/timing_data/android-pixel2_webview-perf_timing.json
index b08d56b..53ef42b 100644
--- a/tools/perf/core/shard_maps/timing_data/android-pixel2_webview-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/android-pixel2_webview-perf_timing.json
@@ -3764,10 +3764,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "50.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "51.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4372,10 +4368,6 @@
         "name": "system_health.memory_mobile/long_running:tools:gmail-foreground"
     },
     {
-        "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
         "duration": "23.0",
         "name": "system_health.webview_startup/load:chrome:blank"
     },

tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json b/tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json
index 2eca831..70fc4015 100644
--- a/tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json
@@ -3833,10 +3833,6 @@
     },
     {
         "duration": "32.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
-        "duration": "32.0",
         "name": "speedometer2/Speedometer2"
     },
     {
@@ -4456,10 +4452,6 @@
         "name": "system_health.memory_mobile/long_running:tools:gmail-foreground"
     },
     {
-        "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
         "duration": "8.0",
         "name": "tracing.tracing_with_background_memory_infra/Facebook"
     },

tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json b/tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json
index 7a946f5..0e07f8d1 100644
--- a/tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json
@@ -3764,10 +3764,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "31.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "32.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4372,10 +4368,6 @@
         "name": "system_health.memory_mobile/long_running:tools:gmail-foreground"
     },
     {
-        "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
         "duration": "18.0",
         "name": "system_health.webview_startup/load:chrome:blank"
     },

tools/perf/core/shard_maps/timing_data/lacros-x86-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/lacros-x86-perf_timing.json b/tools/perf/core/shard_maps/timing_data/lacros-x86-perf_timing.json
index 1ac762f..ee48e3a3 100644
--- a/tools/perf/core/shard_maps/timing_data/lacros-x86-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/lacros-x86-perf_timing.json
@@ -1468,26 +1468,6 @@
         "name": "desktop_ui/tab_search:top50:2020"
     },
     {
-        "duration": "90.0",
-        "name": "desktop_ui/webui_tab_strip:clean_slate"
-    },
-    {
-        "duration": "92.0",
-        "name": "desktop_ui/webui_tab_strip:measure_memory"
-    },
-    {
-        "duration": "90.0",
-        "name": "desktop_ui/webui_tab_strip:measure_memory:2window"
-    },
-    {
-        "duration": "129.0",
-        "name": "desktop_ui/webui_tab_strip:top10:2020"
-    },
-    {
-        "duration": "133.0",
-        "name": "desktop_ui/webui_tab_strip:top10:loading:2020"
-    },
-    {
         "duration": "33.0",
         "name": "dummy_benchmark.noisy_benchmark_1/dummy_page.html"
     },
@@ -3248,10 +3228,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "137.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "120.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -3884,10 +3860,6 @@
         "name": "system_health.memory_desktop/play:media:soundcloud:2018"
     },
     {
-        "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
         "duration": "161.0",
         "name": "tab_switching.typical_25/multitab:misc:typical24"
     },

tools/perf/core/shard_maps/timing_data/linux-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/linux-perf_timing.json b/tools/perf/core/shard_maps/timing_data/linux-perf_timing.json
index 0e7af10e..d2ddada 100644
--- a/tools/perf/core/shard_maps/timing_data/linux-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/linux-perf_timing.json
@@ -1748,26 +1748,6 @@
         "name": "desktop_ui/tab_search:top50:loading:2020"
     },
     {
-        "duration": "14.0",
-        "name": "desktop_ui/webui_tab_strip:clean_slate"
-    },
-    {
-        "duration": "16.0",
-        "name": "desktop_ui/webui_tab_strip:measure_memory"
-    },
-    {
-        "duration": "17.0",
-        "name": "desktop_ui/webui_tab_strip:measure_memory:2window"
-    },
-    {
-        "duration": "32.0",
-        "name": "desktop_ui/webui_tab_strip:top10:2020"
-    },
-    {
-        "duration": "18.0",
-        "name": "desktop_ui/webui_tab_strip:top10:loading:2020"
-    },
-    {
         "duration": "6.0",
         "name": "dummy_benchmark.noisy_benchmark_1/dummy_page.html"
     },
@@ -3872,10 +3852,6 @@
         "name": "speedometer2-minormc/Speedometer2"
     },
     {
-        "duration": "50.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "47.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4529,10 +4505,6 @@
     },
     {
         "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
-        "duration": "0.0",
         "name": "tab_switching.typical_25/multitab:misc:typical24"
     },
     {

tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json b/tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json
index 06e26ab..f1c6b446 100644
--- a/tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json
@@ -3728,10 +3728,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "65.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "62.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4385,10 +4381,6 @@
     },
     {
         "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
-        "duration": "0.0",
         "name": "tab_switching.typical_25/multitab:misc:typical24"
     },
     {

tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json b/tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json
index ef2d3df4..354f75d5 100644
--- a/tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json
@@ -3764,10 +3764,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "87.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "86.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4421,10 +4417,6 @@
     },
     {
         "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
-        "duration": "0.0",
         "name": "tab_switching.typical_25/multitab:misc:typical24"
     },
     {

tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json b/tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json
index 45a90579..8f97ae9 100644
--- a/tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json
@@ -3856,10 +3856,6 @@
         "name": "speedometer2-minormc/Speedometer2"
     },
     {
-        "duration": "34.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "31.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4513,10 +4509,6 @@
     },
     {
         "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
-        "duration": "0.0",
         "name": "tab_switching.typical_25/multitab:misc:typical24"
     },
     {

tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json b/tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json
index 7cf5c1d1..c2e6679 100644
--- a/tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json
@@ -3768,10 +3768,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "50.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "68.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4425,10 +4421,6 @@
     },
     {
         "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
-        "duration": "0.0",
         "name": "tab_switching.typical_25/multitab:misc:typical24"
     },
     {

tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json

diff --git a/tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json b/tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json
index ee1883c9..ec0edea 100644
--- a/tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json
+++ b/tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json
@@ -3728,10 +3728,6 @@
         "name": "speedometer2-future/Speedometer2"
     },
     {
-        "duration": "148.0",
-        "name": "speedometer2-pcscan/Speedometer2"
-    },
-    {
         "duration": "142.0",
         "name": "speedometer2/Speedometer2"
     },
@@ -4385,10 +4381,6 @@
     },
     {
         "duration": "0.0",
-        "name": "system_health.pcscan/browse:news:cnn:2021"
-    },
-    {
-        "duration": "0.0",
         "name": "tab_switching.typical_25/multitab:misc:typical24"
     },
     {

tools/perf/core/shard_maps/win-10-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/win-10-perf-pgo_map.json b/tools/perf/core/shard_maps/win-10-perf-pgo_map.json
index d4f2aa17..8a9ed88 100644
--- a/tools/perf/core/shard_maps/win-10-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/win-10-perf-pgo_map.json
@@ -307,9 +307,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 1,
                 "abridged": false
@@ -352,9 +349,6 @@
                 "begin": 69,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/win-10-perf_map.json

diff --git a/tools/perf/core/shard_maps/win-10-perf_map.json b/tools/perf/core/shard_maps/win-10-perf_map.json
index 6c74d6f7..1f81e58 100644
--- a/tools/perf/core/shard_maps/win-10-perf_map.json
+++ b/tools/perf/core/shard_maps/win-10-perf_map.json
@@ -434,9 +434,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 9,
                 "abridged": false
@@ -500,9 +497,6 @@
                 "begin": 76,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/win-10_laptop_low_end-perf-pgo_map.json

diff --git a/tools/perf/core/shard_maps/win-10_laptop_low_end-perf-pgo_map.json b/tools/perf/core/shard_maps/win-10_laptop_low_end-perf-pgo_map.json
index 8bfc70f..da142df 100644
--- a/tools/perf/core/shard_maps/win-10_laptop_low_end-perf-pgo_map.json
+++ b/tools/perf/core/shard_maps/win-10_laptop_low_end-perf-pgo_map.json
@@ -359,9 +359,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 9,
                 "abridged": false
@@ -413,9 +410,6 @@
                 "begin": 62,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/shard_maps/win-10_laptop_low_end-perf_map.json

diff --git a/tools/perf/core/shard_maps/win-10_laptop_low_end-perf_map.json b/tools/perf/core/shard_maps/win-10_laptop_low_end-perf_map.json
index 8e2691d7..66a1aa92 100644
--- a/tools/perf/core/shard_maps/win-10_laptop_low_end-perf_map.json
+++ b/tools/perf/core/shard_maps/win-10_laptop_low_end-perf_map.json
@@ -421,9 +421,6 @@
             "speedometer2-future": {
                 "abridged": false
             },
-            "speedometer2-pcscan": {
-                "abridged": false
-            },
             "system_health.common_desktop": {
                 "end": 20,
                 "abridged": false
@@ -493,9 +490,6 @@
                 "begin": 76,
                 "abridged": false
             },
-            "system_health.pcscan": {
-                "abridged": false
-            },
             "tab_switching.typical_25": {
                 "abridged": false
             },

tools/perf/core/undocumented_benchmarks.py

diff --git a/tools/perf/core/undocumented_benchmarks.py b/tools/perf/core/undocumented_benchmarks.py
index 5564cd5..daee59e 100644
--- a/tools/perf/core/undocumented_benchmarks.py
+++ b/tools/perf/core/undocumented_benchmarks.py
@@ -20,7 +20,6 @@
     'speedometer2',
     'speedometer2-future',
     'speedometer2-minormc',
-    'speedometer2-pcscan',
     'startup.mobile',
     'system_health.webview_startup',
     'tab_switching.typical_25',

tools/perf/expectations.config

diff --git a/tools/perf/expectations.config b/tools/perf/expectations.config
index 3159eeb..85e28ad 100644
--- a/tools/perf/expectations.config
+++ b/tools/perf/expectations.config
@@ -574,10 +574,6 @@
 crbug.com/1421060 [ android-pixel-6 ] system_health.memory_mobile/browse:news:globo:2019 [ Skip ]
 crbug.com/1421060 [ android-pixel-6-pro ] system_health.memory_mobile/browse:news:globo:2019 [ Skip ]
 
-# Benchmark: system_health.pcscan
-crbug.com/v8/11180 [ android ] system_health.pcscan/browse:news:cnn:2021 [ Skip ]
-crbug.com/v8/11180 [ desktop ] system_health.pcscan/browse:news:cnn:2021 [ Skip ]
-
 # Benchmark: system_health.scroll_jank_mobile
 crbug.com/1362017 system_health.scroll_jank_mobile/browse:tech:discourse_infinite_scroll:2018 [ Skip ]
 crbug.com/1363191 [ android-pixel-4a ] system_health.scroll_jank_mobile/browse:media:youtube:2019 [ Skip ]

tools/perf/page_sets/system_health/system_health_stories.py

diff --git a/tools/perf/page_sets/system_health/system_health_stories.py b/tools/perf/page_sets/system_health/system_health_stories.py
index 528f49bd..9bb718ef 100644
--- a/tools/perf/page_sets/system_health/system_health_stories.py
+++ b/tools/perf/page_sets/system_health/system_health_stories.py
@@ -4,7 +4,7 @@
 
 import os
 
-from page_sets.system_health import browsing_stories, chrome_stories
+from page_sets.system_health import chrome_stories
 from page_sets.system_health import platforms
 from page_sets.system_health import story_tags
 from page_sets.system_health import system_health_story
@@ -101,11 +101,3 @@
       top_level_dir=os.path.dirname(start_dir),
       base_class=system_health_story.SystemHealthStory).items()):
     yield cls
-
-
-class SystemHealthPCScanStorySet(story.StorySet):
-  """A story set containing stories for benchmarking PCScan feature."""
-
-  def __init__(self, take_memory_measurement=False):
-    super(SystemHealthPCScanStorySet, self).__init__()
-    self.AddStory(browsing_stories.CnnStory2021(self, take_memory_measurement))

tools/traffic_annotation/safe_list.txt

diff --git a/tools/traffic_annotation/safe_list.txt b/tools/traffic_annotation/safe_list.txt
index b293f64..b03aa5c 100644
--- a/tools/traffic_annotation/safe_list.txt
+++ b/tools/traffic_annotation/safe_list.txt
@@ -88,7 +88,6 @@
 missing_new_fields,chrome/browser/ash/remote_apps/remote_apps_manager.cc
 missing_new_fields,chrome/browser/ash/smb_client/discovery/netbios_client.cc
 missing_new_fields,chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc
-missing_new_fields,chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc
 missing_new_fields,chrome/browser/autofill/autofill_gstatic_reader.cc
 missing_new_fields,chrome/browser/autofill/autofill_image_fetcher_impl.cc
 missing_new_fields,chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc
@@ -150,7 +149,6 @@
 missing_new_fields,chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc
 missing_new_fields,chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
 missing_new_fields,chrome/browser/supervised_user/chromeos/supervised_user_favicon_request_handler.cc
-missing_new_fields,chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.cc
 missing_new_fields,chrome/browser/supervised_user/supervised_user_service.cc
 missing_new_fields,chrome/browser/sync_file_system/drive_backend/sync_engine.cc
 missing_new_fields,chrome/browser/ui/ash/ambient/ambient_client_impl.cc

tools/traffic_annotation/summary/annotations.xml

diff --git a/tools/traffic_annotation/summary/annotations.xml b/tools/traffic_annotation/summary/annotations.xml
index e58811d..ca8c4cb 100644
--- a/tools/traffic_annotation/summary/annotations.xml
+++ b/tools/traffic_annotation/summary/annotations.xml
@@ -304,7 +304,7 @@
  <item id="family_info" added_in_milestone="98" content_hash_code="01831b1a" os_list="android,chromeos,linux,windows" file_path="chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc" />
  <item id="permission_request_creator" added_in_milestone="98" content_hash_code="04629d73" os_list="android,chromeos,linux,windows" file_path="chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc" />
  <item id="kids_chrome_management_client_classify_url" added_in_milestone="98" content_hash_code="003a8b30" os_list="android,chromeos,linux,windows" file_path="components/supervised_user/core/browser/kids_chrome_management_client.cc" />
- <item id="kids_chrome_management_list_family_members" added_in_milestone="106" content_hash_code="00458289" os_list="android,chromeos,linux,windows" file_path="chrome/browser/supervised_user/kids_chrome_management/kids_external_fetcher.cc" />
+ <item id="kids_chrome_management_list_family_members" added_in_milestone="106" content_hash_code="0709ea52" os_list="android,chromeos,linux,windows" file_path="components/supervised_user/core/browser/kids_external_fetcher.cc" />
  <item id="cached_image_fetcher" added_in_milestone="98" content_hash_code="06334a2d" os_list="android" file_path="components/image_fetcher/image_fetcher_bridge.cc" />
  <item id="chrome_cast_discovery_api" added_in_milestone="98" content_hash_code="0502b792" os_list="linux,windows,chromeos" file_path="chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc" />
  <item id="fedcm" added_in_milestone="98" content_hash_code="082197eb" os_list="linux,windows,chromeos,android" file_path="content/browser/webid/idp_network_request_manager.cc" />
@@ -348,7 +348,7 @@
  <item id="pending_beacon_api" added_in_milestone="105" content_hash_code="02288864" os_list="linux,windows,android,chromeos" file_path="content/browser/renderer_host/pending_beacon_service.cc" />
  <item id="printing_server_printers_query" added_in_milestone="106" content_hash_code="06f4759c" os_list="chromeos" file_path="chrome/browser/ash/printing/server_printers_fetcher.cc" />
  <item id="download_bubble_retry_download" added_in_milestone="105" content_hash_code="000b1439" os_list="linux,windows,chromeos" file_path="chrome/browser/download/bubble/download_bubble_ui_controller.cc" />
- <item id="wilco_dtc_supportd" added_in_milestone="108" content_hash_code="01050d07" os_list="chromeos" file_path="chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc" />
+ <item id="wilco_dtc_supportd" added_in_milestone="108" content_hash_code="068635d9" os_list="chromeos" file_path="chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc" />
  <item id="quick_answers_loader" added_in_milestone="105" content_hash_code="06f129c2" os_list="chromeos" file_path="chromeos/components/quick_answers/result_loader.cc" />
  <item id="chrome_search_suggest_service" added_in_milestone="105" content_hash_code="04d973c6" os_list="linux,windows,android,chromeos" file_path="components/search/start_suggest_service.cc" />
  <item id="speculation_rules_prefetch_probe" added_in_milestone="105" content_hash_code="04341e21" os_list="linux,windows,android,chromeos" file_path="content/browser/preloading/prefetch/prefetch_origin_prober.cc" />

ui/base/interaction/interactive_test.h

diff --git a/ui/base/interaction/interactive_test.h b/ui/base/interaction/interactive_test.h
index c6737fb..a1f56ec 100644
--- a/ui/base/interaction/interactive_test.h
+++ b/ui/base/interaction/interactive_test.h
@@ -696,10 +696,24 @@
 // static
 template <typename... Args>
 InteractiveTestApi::StepBuilder InteractiveTestApi::Log(Args... args) {
-  auto step = Do([=]() {
-    auto info = COMPACT_GOOGLE_LOG_INFO;
-    ((info.stream() << args), ...);
-  });
+  auto step = Do(base::BindOnce(
+      [](std::remove_cvref_t<Args>... args) {
+        auto info = COMPACT_GOOGLE_LOG_INFO;
+        ((info.stream() <<
+          [&]() {
+            if constexpr (internal::IsCallbackValue<Args>) {
+              return std::move(args).Run();
+            } else if constexpr (internal::IsFunctionPointerValue<Args>) {
+              return (*args)();
+            } else if constexpr (internal::IsCallableValue<Args>) {
+              return args();
+            } else {
+              return args;
+            }
+          }()),
+         ...);
+      },
+      std::move(args)...));
   step.SetDescription("Log()");
   return step;
 }

ui/base/interaction/interactive_test_unittest.cc

diff --git a/ui/base/interaction/interactive_test_unittest.cc b/ui/base/interaction/interactive_test_unittest.cc
index 962887b05..67452fd 100644
--- a/ui/base/interaction/interactive_test_unittest.cc
+++ b/ui/base/interaction/interactive_test_unittest.cc
@@ -146,6 +146,10 @@
   return el;
 }
 
+int ValueGeneratingFunction() {
+  return 5;
+}
+
 struct CallableObject {
   bool operator()() const { return i != 0; }
   int i = 0;
@@ -1175,7 +1179,7 @@
 // parameters. The output of this test must be verified manually.
 TEST_F(InteractiveTestTest, Log) {
   TestElement e1(kTestId1, kTestContext1);
-  int x = 0;
+  int x = 1;
   int y = 0;
   constexpr char kSomeString[] = "A string.";
   std::u16string deferred_string1;
@@ -1191,12 +1195,21 @@
         deferred_string2 = "Lorem ipsum";
         unnamed_struct_ptr = &unnamed_struct;
       })),
-      Log("literal int: ", x, " deferred int: ", std::ref(y),
-          " constexpr string: ", kSomeString,
-          " deferred string 1: ", std::ref(deferred_string1),
-          " deferred string 2: ", std::ref(deferred_string2),
-          " pointer to object: ", &unnamed_struct,
-          " deferred pointer to object: ", std::ref(unnamed_struct_ptr)));
+      Log(
+          "Log() output follows:\nliteral int: ", x,
+          "\ndeferred int: ", std::ref(y), "\nconstexpr string: ", kSomeString,
+          "\ndeferred string 1: ", std::ref(deferred_string1),
+          "\ndeferred string 2: ", std::ref(deferred_string2),
+          "\npointer to object: ", &unnamed_struct,
+          "\ndeferred pointer to object: ", std::ref(unnamed_struct_ptr),
+          "\nlambda - should be 7: ", [x, &y]() { return x + y + 4; },
+          "\nOnceCallback - should be 3: ",
+          base::BindOnce([](int x, int* y) { return x + *y; }, x,
+                         base::Unretained(&y)),
+          "\nRepeatingCallback - should be 4: ",
+          base::BindRepeating([](int x, int* y) { return x + *y + 1; }, x,
+                              base::Unretained(&y)),
+          "\nfunction pointer - should be 5: ", &ValueGeneratingFunction));
 }
 
 // This test ensures that binding of various types of functions and function

ui/gl/swap_chain_presenter.cc

diff --git a/ui/gl/swap_chain_presenter.cc b/ui/gl/swap_chain_presenter.cc
index 969242a29..7e79dae 100644
--- a/ui/gl/swap_chain_presenter.cc
+++ b/ui/gl/swap_chain_presenter.cc
@@ -335,6 +335,18 @@
   return overlay_type_str;
 }
 
+void DumpWithoutCrashingForToggleVpSuperResolutionError(HRESULT hr,
+                                                        UINT gpu_vendor_id) {
+  // ToggleVpSuperResolution() is called for all GPUs unless a flag disables it.
+  // Only generate dump for GPUs that supports VP Super Resolution.
+  if (gpu_vendor_id != 0x8086 && gpu_vendor_id != 0x10de) {
+    return;
+  }
+  SCOPED_CRASH_KEY_STRING256("", "vp_super_resolution_ext_error",
+                             base::NumberToString(hr));
+  base::debug::DumpWithoutCrashing();
+}
+
 }  // namespace
 
 SwapChainPresenter::PresentationHistory::PresentationHistory() = default;
@@ -1678,6 +1690,9 @@
                                   video_processor.Get(), !is_on_battery_power_);
       if (FAILED(hr)) {
         force_vp_super_resolution_off_ = true;
+        // TODO(crbug.com/1318380): Temporary only. Remove the crash dump once
+        // GPU data is collected.
+        DumpWithoutCrashingForToggleVpSuperResolutionError(hr, gpu_vendor_id_);
       }
       use_vp_super_resolution = !is_on_battery_power_ && SUCCEEDED(hr);
     }

ui/linux/linux_ui_factory.cc

diff --git a/ui/linux/linux_ui_factory.cc b/ui/linux/linux_ui_factory.cc
index cd2a605..95d7223 100644
--- a/ui/linux/linux_ui_factory.cc
+++ b/ui/linux/linux_ui_factory.cc
@@ -164,6 +164,7 @@
     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
     case base::nix::DESKTOP_ENVIRONMENT_KDE5:
+    case base::nix::DESKTOP_ENVIRONMENT_KDE6:
     case base::nix::DESKTOP_ENVIRONMENT_UKUI:
     case base::nix::DESKTOP_ENVIRONMENT_DEEPIN:
     case base::nix::DESKTOP_ENVIRONMENT_LXQT:

ui/ozone/common/features.cc

diff --git a/ui/ozone/common/features.cc b/ui/ozone/common/features.cc
index 92d4f044..98bc2f0b 100644
--- a/ui/ozone/common/features.cc
+++ b/ui/ozone/common/features.cc
@@ -26,6 +26,17 @@
 #endif
 );
 
+// Controls whether support for the fractional_scale_v1 protocol should be
+// enabled.
+BASE_FEATURE(kWaylandFractionalScaleV1,
+             "WaylandFractionalScaleV1",
+#if BUILDFLAG(IS_LINUX)
+             base::FEATURE_ENABLED_BY_DEFAULT
+#else
+             base::FEATURE_DISABLED_BY_DEFAULT
+#endif
+);
+
 // This debug/dev flag pretty-prints DRM modeset configuration logs for ease
 // of reading. For more information, see: http://b/233006802
 BASE_FEATURE(kPrettyPrintDrmModesetConfigLogs,
@@ -41,6 +52,10 @@
   return base::FeatureList::IsEnabled(kWaylandOverlayDelegation);
 }
 
+bool IsWaylandFractionalScaleV1Enabled() {
+  return base::FeatureList::IsEnabled(kWaylandFractionalScaleV1);
+}
+
 bool IsPrettyPrintDrmModesetConfigLogsEnabled() {
   return base::FeatureList::IsEnabled(kPrettyPrintDrmModesetConfigLogs);
 }

ui/ozone/common/features.h

diff --git a/ui/ozone/common/features.h b/ui/ozone/common/features.h
index e4ba5cf..76fade990 100644
--- a/ui/ozone/common/features.h
+++ b/ui/ozone/common/features.h
@@ -11,10 +11,12 @@
 
 BASE_DECLARE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinates);
 BASE_DECLARE_FEATURE(kWaylandOverlayDelegation);
+BASE_DECLARE_FEATURE(kWaylandFractionalScaleV1);
 BASE_DECLARE_FEATURE(kPrettyPrintDrmModesetConfigLogs);
 
 bool IsWaylandSurfaceSubmissionInPixelCoordinatesEnabled();
 bool IsWaylandOverlayDelegationEnabled();
+bool IsWaylandFractionalScaleV1Enabled();
 bool IsPrettyPrintDrmModesetConfigLogsEnabled();
 
 }  // namespace ui

ui/ozone/platform/wayland/BUILD.gn

diff --git a/ui/ozone/platform/wayland/BUILD.gn b/ui/ozone/platform/wayland/BUILD.gn
index fc68bb7..ebe4a33 100644
--- a/ui/ozone/platform/wayland/BUILD.gn
+++ b/ui/ozone/platform/wayland/BUILD.gn
@@ -48,6 +48,8 @@
     "gpu/wayland_surface_factory.cc",
     "gpu/wayland_surface_factory.h",
     "gpu/wayland_surface_gpu.h",
+    "host/fractional_scale_manager.cc",
+    "host/fractional_scale_manager.h",
     "host/gtk_primary_selection_device.cc",
     "host/gtk_primary_selection_device.h",
     "host/gtk_primary_selection_device_manager.cc",
@@ -248,6 +250,7 @@
     "//third_party/wayland-protocols:content_type_protocol",
     "//third_party/wayland-protocols:cursor_shapes_protocol",
     "//third_party/wayland-protocols:extended_drag",
+    "//third_party/wayland-protocols:fractional_scale_protocol",
     "//third_party/wayland-protocols:gtk_primary_selection_protocol",
     "//third_party/wayland-protocols:gtk_shell_protocol",
     "//third_party/wayland-protocols:idle_inhibit_protocol",

ui/ozone/platform/wayland/common/wayland_object.cc

diff --git a/ui/ozone/platform/wayland/common/wayland_object.cc b/ui/ozone/platform/wayland/common/wayland_object.cc
index 9a790e18..a1089b0 100644
--- a/ui/ozone/platform/wayland/common/wayland_object.cc
+++ b/ui/ozone/platform/wayland/common/wayland_object.cc
@@ -10,6 +10,7 @@
 #include <content-type-v1-client-protocol.h>
 #include <cursor-shapes-unstable-v1-client-protocol.h>
 #include <extended-drag-unstable-v1-client-protocol.h>
+#include <fractional-scale-v1-client-protocol.h>
 #include <gtk-primary-selection-client-protocol.h>
 #include <gtk-shell-client-protocol.h>
 #include <idle-client-protocol.h>
@@ -225,6 +226,8 @@
 IMPLEMENT_WAYLAND_OBJECT_TRAITS(wp_viewporter)
 IMPLEMENT_WAYLAND_OBJECT_TRAITS(wp_content_type_v1)
 IMPLEMENT_WAYLAND_OBJECT_TRAITS(wp_content_type_manager_v1)
+IMPLEMENT_WAYLAND_OBJECT_TRAITS(wp_fractional_scale_manager_v1)
+IMPLEMENT_WAYLAND_OBJECT_TRAITS(wp_fractional_scale_v1)
 IMPLEMENT_WAYLAND_OBJECT_TRAITS(xdg_activation_v1)
 IMPLEMENT_WAYLAND_OBJECT_TRAITS(xdg_activation_token_v1)
 IMPLEMENT_WAYLAND_OBJECT_TRAITS(xdg_popup)

ui/ozone/platform/wayland/common/wayland_object.h

diff --git a/ui/ozone/platform/wayland/common/wayland_object.h b/ui/ozone/platform/wayland/common/wayland_object.h
index 6f8971c..af491c7 100644
--- a/ui/ozone/platform/wayland/common/wayland_object.h
+++ b/ui/ozone/platform/wayland/common/wayland_object.h
@@ -145,6 +145,8 @@
 DECLARE_WAYLAND_OBJECT_TRAITS(wp_viewporter)
 DECLARE_WAYLAND_OBJECT_TRAITS(wp_content_type_manager_v1)
 DECLARE_WAYLAND_OBJECT_TRAITS(wp_content_type_v1)
+DECLARE_WAYLAND_OBJECT_TRAITS(wp_fractional_scale_manager_v1)
+DECLARE_WAYLAND_OBJECT_TRAITS(wp_fractional_scale_v1)
 DECLARE_WAYLAND_OBJECT_TRAITS(xdg_activation_v1)
 DECLARE_WAYLAND_OBJECT_TRAITS(xdg_activation_token_v1)
 DECLARE_WAYLAND_OBJECT_TRAITS(xdg_popup)

ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.cc

diff --git a/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.cc b/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.cc
index bd3b407..49c9f1c 100644
--- a/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.cc
+++ b/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.cc
@@ -76,6 +76,7 @@
     bool supports_dma_buf,
     bool supports_viewporter,
     bool supports_acquire_fence,
+    bool supports_overlays,
     uint32_t supported_surface_augmentor_version) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(gpu_sequence_checker_);
 
@@ -87,6 +88,7 @@
   supports_viewporter_ = supports_viewporter;
   supports_acquire_fence_ = supports_acquire_fence;
   supports_dmabuf_ = supports_dma_buf;
+  supports_overlays_ = supports_overlays;
 
   supports_non_backed_solid_color_buffers_ =
       supported_surface_augmentor_version >=

ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h

diff --git a/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h b/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h
index 4e6dbda..4ea6211 100644
--- a/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h
+++ b/ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.h
@@ -60,6 +60,7 @@
       bool supports_dma_buf,
       bool supports_viewporter,
       bool supports_acquire_fence,
+      bool supports_overlays,
       uint32_t supported_surface_augmentor_version) override;
 
   // These two calls get the surface, which backs the |widget| and notifies it
@@ -150,6 +151,7 @@
 
   bool supports_acquire_fence() const { return supports_acquire_fence_; }
   bool supports_viewporter() const { return supports_viewporter_; }
+  bool supports_overlays() const { return supports_overlays_; }
   bool supports_non_backed_solid_color_buffers() const {
     return supports_non_backed_solid_color_buffers_;
   }
@@ -259,6 +261,9 @@
   // cropping and scaling buffers.
   bool supports_viewporter_ = false;
 
+  // Whether delegated overlays should be used for this Wayland server.
+  bool supports_overlays_ = false;
+
   // Determines whether solid color overlays can be delegated without a backing
   // image via a wayland protocol.
   bool supports_non_backed_solid_color_buffers_ = false;

ui/ozone/platform/wayland/gpu/wayland_overlay_manager_unittest.cc

diff --git a/ui/ozone/platform/wayland/gpu/wayland_overlay_manager_unittest.cc b/ui/ozone/platform/wayland/gpu/wayland_overlay_manager_unittest.cc
index 12c4b13..23f2768 100644
--- a/ui/ozone/platform/wayland/gpu/wayland_overlay_manager_unittest.cc
+++ b/ui/ozone/platform/wayland/gpu/wayland_overlay_manager_unittest.cc
@@ -58,7 +58,8 @@
         std::move(manager_ptr), kSupportedFormatsWithModifiers,
         /*supports_dma_buf=*/false,
         /*supports_viewporter=*/true,
-        /*supports_acquire_fence=*/false, kAugmentedSurfaceNotSupportedVersion);
+        /*supports_acquire_fence=*/false,
+        /*supports_overlays=*/true, kAugmentedSurfaceNotSupportedVersion);
 
     // Wait until initialization and mojo calls go through.
     base::RunLoop().RunUntilIdle();

ui/ozone/platform/wayland/gpu/wayland_surface_factory_unittest.cc

diff --git a/ui/ozone/platform/wayland/gpu/wayland_surface_factory_unittest.cc b/ui/ozone/platform/wayland/gpu/wayland_surface_factory_unittest.cc
index b357a0b..a529cab 100644
--- a/ui/ozone/platform/wayland/gpu/wayland_surface_factory_unittest.cc
+++ b/ui/ozone/platform/wayland/gpu/wayland_surface_factory_unittest.cc
@@ -207,7 +207,8 @@
         std::move(manager_ptr), kSupportedFormatsWithModifiers,
         /*supports_dma_buf=*/false,
         /*supports_viewporter=*/true,
-        /*supports_acquire_fence=*/false, kAugmentedSurfaceNotSupportedVersion);
+        /*supports_acquire_fence=*/false,
+        /*supports_overlays=*/true, kAugmentedSurfaceNotSupportedVersion);
 
     // Wait until initialization and mojo calls go through.
     base::RunLoop().RunUntilIdle();

ui/ozone/platform/wayland/host/fractional_scale_manager.cc

diff --git a/ui/ozone/platform/wayland/host/fractional_scale_manager.cc b/ui/ozone/platform/wayland/host/fractional_scale_manager.cc
new file mode 100644
index 0000000..fc2b8c3
--- /dev/null
+++ b/ui/ozone/platform/wayland/host/fractional_scale_manager.cc
@@ -0,0 +1,58 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/ozone/platform/wayland/host/fractional_scale_manager.h"
+
+#include <fractional-scale-v1-client-protocol.h>
+
+#include "base/check_op.h"
+#include "base/logging.h"
+#include "ui/ozone/common/features.h"
+#include "ui/ozone/platform/wayland/common/wayland_object.h"
+#include "ui/ozone/platform/wayland/host/wayland_connection.h"
+
+namespace ui {
+
+namespace {
+
+constexpr uint32_t kMaxVersion = 1;
+
+}  // namespace
+
+// static
+void FractionalScaleManager::Instantiate(WaylandConnection* connection,
+                                         wl_registry* registry,
+                                         uint32_t name,
+                                         const std::string& interface,
+                                         uint32_t version) {
+  if (!IsWaylandFractionalScaleV1Enabled()) {
+    return;
+  }
+
+  CHECK_EQ(interface, kInterfaceName) << "Expected \"" << kInterfaceName
+                                      << "\" but got \"" << interface << "\"";
+
+  if (connection->fractional_scale_manager_v1_) {
+    return;
+  }
+
+  auto instance = wl::Bind<::wp_fractional_scale_manager_v1>(
+      registry, name, std::min(version, kMaxVersion));
+  if (!instance) {
+    LOG(ERROR) << "Failed to bind " << kInterfaceName;
+    return;
+  }
+  connection->fractional_scale_manager_v1_ = std::move(instance);
+
+  connection->set_supports_viewporter_surface_scaling(true);
+
+  // Since using fractional_scale_v1 requires using viewport to rescale the
+  // window to Wayland logical coordinates, using overlays in conjunction with
+  // fractional_scale_v1 would require support for subpixel viewport
+  // destination sizes and subpixel subsurface positions, which currently
+  // isn't present on any non-exo Wayland compositors.
+  connection->set_overlay_delegation_disabled(true);
+}
+
+}  // namespace ui

ui/ozone/platform/wayland/host/fractional_scale_manager.h

diff --git a/ui/ozone/platform/wayland/host/fractional_scale_manager.h b/ui/ozone/platform/wayland/host/fractional_scale_manager.h
new file mode 100644
index 0000000..eae1968
--- /dev/null
+++ b/ui/ozone/platform/wayland/host/fractional_scale_manager.h
@@ -0,0 +1,29 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_OZONE_PLATFORM_WAYLAND_HOST_FRACTIONAL_SCALE_MANAGER_H_
+#define UI_OZONE_PLATFORM_WAYLAND_HOST_FRACTIONAL_SCALE_MANAGER_H_
+
+#include "ui/ozone/platform/wayland/common/wayland_object.h"
+
+namespace ui {
+
+// Sets up the global wp_fractional_scale_manager_v1 instance.
+class FractionalScaleManager
+    : public wl::GlobalObjectRegistrar<FractionalScaleManager> {
+ public:
+  static constexpr char kInterfaceName[] = "wp_fractional_scale_manager_v1";
+
+  static void Instantiate(WaylandConnection* connection,
+                          wl_registry* registry,
+                          uint32_t name,
+                          const std::string& interface,
+                          uint32_t version);
+
+  FractionalScaleManager() = delete;
+};
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_WAYLAND_HOST_FRACTIONAL_SCALE_MANAGER_H_

ui/ozone/platform/wayland/host/wayland_buffer_manager_connector.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_manager_connector.cc b/ui/ozone/platform/wayland/host/wayland_buffer_manager_connector.cc
index 4207d87e..09600c0 100644
--- a/ui/ozone/platform/wayland/host/wayland_buffer_manager_connector.cc
+++ b/ui/ozone/platform/wayland/host/wayland_buffer_manager_connector.cc
@@ -57,6 +57,7 @@
       std::move(pending_remote), buffer_formats_with_modifiers,
       supports_dma_buf, buffer_manager_host_->SupportsViewporter(),
       buffer_manager_host_->SupportsAcquireFence(),
+      buffer_manager_host_->SupportsOverlays(),
       buffer_manager_host_->GetSurfaceAugmentorVersion());
 }
 

ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
index 4d12410..f7e2230 100644
--- a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
+++ b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.cc
@@ -98,6 +98,10 @@
   return !!connection_->surface_augmenter();
 }
 
+bool WaylandBufferManagerHost::SupportsOverlays() const {
+  return connection_->ShouldUseOverlayDelegation();
+}
+
 uint32_t WaylandBufferManagerHost::GetSurfaceAugmentorVersion() const {
   auto* augmenter = connection_->surface_augmenter();
   return augmenter ? augmenter->GetSurfaceAugmentorVersion() : 0u;

ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h

diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h
index 4143140..ced92039 100644
--- a/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h
+++ b/ui/ozone/platform/wayland/host/wayland_buffer_manager_host.h
@@ -70,6 +70,7 @@
   bool SupportsDmabuf() const;
   bool SupportsAcquireFence() const;
   bool SupportsViewporter() const;
+  bool SupportsOverlays() const;
   bool SupportsNonBackedSolidColorBuffers() const;
   uint32_t GetSurfaceAugmentorVersion() const;
 

ui/ozone/platform/wayland/host/wayland_connection.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_connection.cc b/ui/ozone/platform/wayland/host/wayland_connection.cc
index 951b943..ebc6697 100644
--- a/ui/ozone/platform/wayland/host/wayland_connection.cc
+++ b/ui/ozone/platform/wayland/host/wayland_connection.cc
@@ -27,6 +27,8 @@
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/ozone/common/features.h"
+#include "ui/ozone/platform/wayland/common/wayland_object.h"
+#include "ui/ozone/platform/wayland/host/fractional_scale_manager.h"
 #include "ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.h"
 #include "ui/ozone/platform/wayland/host/gtk_shell1.h"
 #include "ui/ozone/platform/wayland/host/org_kde_kwin_idle.h"
@@ -129,6 +131,8 @@
 bool WaylandConnection::Initialize() {
   // Register factories for classes that implement wl::GlobalObjectRegistrar<T>.
   // Keep alphabetical order for convenience.
+  RegisterGlobalObjectFactory(FractionalScaleManager::kInterfaceName,
+                              &FractionalScaleManager::Instantiate);
   RegisterGlobalObjectFactory(GtkPrimarySelectionDeviceManager::kInterfaceName,
                               &GtkPrimarySelectionDeviceManager::Instantiate);
   RegisterGlobalObjectFactory(GtkShell1::kInterfaceName,
@@ -611,6 +615,10 @@
   return converted;
 }
 
+bool WaylandConnection::ShouldUseOverlayDelegation() const {
+  return IsWaylandOverlayDelegationEnabled() && !overlay_delegation_disabled_;
+}
+
 // static
 void WaylandConnection::GlobalRemove(void* data,
                                      wl_registry* registry,

ui/ozone/platform/wayland/host/wayland_connection.h

diff --git a/ui/ozone/platform/wayland/host/wayland_connection.h b/ui/ozone/platform/wayland/host/wayland_connection.h
index c0197481..4462b62a 100644
--- a/ui/ozone/platform/wayland/host/wayland_connection.h
+++ b/ui/ozone/platform/wayland/host/wayland_connection.h
@@ -160,6 +160,10 @@
     return xdg_output_manager_.get();
   }
 
+  wp_fractional_scale_manager_v1* fractional_scale_manager_v1() const {
+    return fractional_scale_manager_v1_.get();
+  }
+
   void SetPlatformCursor(wl_cursor* cursor_data, int buffer_scale);
 
   void SetCursorBufferListener(WaylandCursorBufferListener* listener);
@@ -297,6 +301,29 @@
     surface_submission_in_pixel_coordinates_ = enabled;
   }
 
+  bool supports_viewporter_surface_scaling() const {
+    return supports_viewporter_surface_scaling_;
+  }
+
+  void set_supports_viewporter_surface_scaling(bool enabled) {
+    supports_viewporter_surface_scaling_ = enabled;
+  }
+
+  bool UseViewporterSurfaceScaling() {
+    return supports_viewporter_surface_scaling_ &&
+           !surface_submission_in_pixel_coordinates_;
+  }
+
+  bool overlay_delegation_disabled() const {
+    return overlay_delegation_disabled_;
+  }
+
+  void set_overlay_delegation_disabled(bool disabled) {
+    overlay_delegation_disabled_ = disabled;
+  }
+
+  bool ShouldUseOverlayDelegation() const;
+
   wl::SerialTracker& serial_tracker() { return serial_tracker_; }
 
   void set_tablet_layout_state(display::TabletState tablet_layout_state) {
@@ -320,6 +347,7 @@
   // makes it possible to avoid exposing setters for all those global objects:
   // these setters would only be needed by the globals but would be visible to
   // everyone.
+  friend class FractionalScaleManager;
   friend class GtkPrimarySelectionDeviceManager;
   friend class GtkShell1;
   friend class OrgKdeKwinIdle;
@@ -403,6 +431,7 @@
   wl::Object<zxdg_decoration_manager_v1> xdg_decoration_manager_;
   wl::Object<zcr_extended_drag_v1> extended_drag_v1_;
   wl::Object<zxdg_output_manager_v1> xdg_output_manager_;
+  wl::Object<wp_fractional_scale_manager_v1> fractional_scale_manager_v1_;
 
   // Manages Wayland windows.
   WaylandWindowManager window_manager_{this};
@@ -473,6 +502,13 @@
   // sizes.
   bool surface_submission_in_pixel_coordinates_ = false;
 
+  // This is set if wp_viewporter may be used to instruct the compositor to
+  // properly scale fractional scaled surfaces.
+  bool supports_viewporter_surface_scaling_ = false;
+
+  // This is set if delegated composition should not be used.
+  bool overlay_delegation_disabled_ = false;
+
   wl::SerialTracker serial_tracker_;
 
   // Global Wayland interfaces available in the current session, with their

ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
index 2b3a4ff..6494e0a 100644
--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc
@@ -4,6 +4,8 @@
 
 #include "ui/ozone/platform/wayland/host/wayland_data_drag_controller.h"
 
+#include <viewporter-client-protocol.h>
+
 #include <bitset>
 #include <cstdint>
 #include <memory>
@@ -292,6 +294,10 @@
                       pending_icon_offset_.x() - current_icon_offset_.x(),
                       pending_icon_offset_.y() - current_icon_offset_.y());
   }
+  if (connection_->UseViewporterSurfaceScaling() && icon_surface_->viewport()) {
+    wp_viewport_set_destination(icon_surface_->viewport(), size_dip.width(),
+                                size_dip.height());
+  }
   wl_surface_damage(surface, 0, 0, size_px.width(), size_px.height());
   wl_surface_commit(surface);
 

ui/ozone/platform/wayland/host/wayland_output.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_output.cc b/ui/ozone/platform/wayland/host/wayland_output.cc
index 3723e4c..1a7be4d1 100644
--- a/ui/ozone/platform/wayland/host/wayland_output.cc
+++ b/ui/ozone/platform/wayland/host/wayland_output.cc
@@ -191,7 +191,9 @@
 
   if (xdg_output_) {
     xdg_output_->UpdateMetrics(
-        connection_->surface_submission_in_pixel_coordinates(), metrics_);
+        connection_->surface_submission_in_pixel_coordinates() ||
+            connection_->supports_viewporter_surface_scaling(),
+        metrics_);
   }
   if (aura_output_) {
     aura_output_->UpdateMetrics(metrics_);

ui/ozone/platform/wayland/host/wayland_surface.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_surface.cc b/ui/ozone/platform/wayland/host/wayland_surface.cc
index 00770de..87f1752 100644
--- a/ui/ozone/platform/wayland/host/wayland_surface.cc
+++ b/ui/ozone/platform/wayland/host/wayland_surface.cc
@@ -7,6 +7,7 @@
 #include <alpha-compositing-unstable-v1-client-protocol.h>
 #include <chrome-color-management-client-protocol.h>
 #include <content-type-v1-client-protocol.h>
+#include <fractional-scale-v1-client-protocol.h>
 #include <linux-explicit-synchronization-unstable-v1-client-protocol.h>
 #include <overlay-prioritizer-client-protocol.h>
 #include <surface-augmenter-client-protocol.h>
@@ -28,6 +29,7 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_priority_hint.h"
 #include "ui/ozone/platform/wayland/common/wayland_util.h"
+#include "ui/ozone/platform/wayland/host/fractional_scale_manager.h"
 #include "ui/ozone/platform/wayland/host/overlay_prioritizer.h"
 #include "ui/ozone/platform/wayland/host/surface_augmenter.h"
 #include "ui/ozone/platform/wayland/host/wayland_buffer_handle.h"
@@ -91,7 +93,9 @@
       root_window_(root_window),
       surface_(connection->CreateSurface()),
       surface_submission_in_pixel_coordinates_(
-          connection->surface_submission_in_pixel_coordinates()) {}
+          connection->surface_submission_in_pixel_coordinates()),
+      use_viewporter_surface_scaling_(
+          connection->UseViewporterSurfaceScaling()) {}
 
 WaylandSurface::~WaylandSurface() {
   for (auto& release : linux_buffer_releases_) {
@@ -120,6 +124,18 @@
   };
   wl_surface_add_listener(surface_.get(), &surface_listener, this);
 
+  if (auto* fractional_scale_manager =
+          connection_->fractional_scale_manager_v1()) {
+    static struct wp_fractional_scale_v1_listener fractional_scale_listener {
+      &WaylandSurface::PreferredScale,
+    };
+    fractional_scale_ =
+        wl::Object(wp_fractional_scale_manager_v1_get_fractional_scale(
+            fractional_scale_manager, surface_.get()));
+    wp_fractional_scale_v1_add_listener(fractional_scale_.get(),
+                                        &fractional_scale_listener, this);
+  }
+
   if (connection_->viewporter()) {
     viewport_.reset(
         wp_viewporter_get_viewport(connection_->viewporter(), surface()));
@@ -279,8 +295,15 @@
 
   if (apply_state_immediately_) {
     state_.buffer_scale_float = pending_state_.buffer_scale_float;
-    if (!surface_submission_in_pixel_coordinates_)
-      wl_surface_set_buffer_scale(surface_.get(), GetWaylandScale(state_));
+    if (!(surface_submission_in_pixel_coordinates_ ||
+          use_viewporter_surface_scaling_)) {
+      // It's safe to cast the result of GetWaylandScale to an integer here
+      // because the buffer scale should always be integer when both surface
+      // submission in pixel coordinates and viewporter surface scaling is
+      // disabled.
+      wl_surface_set_buffer_scale(
+          surface_.get(), static_cast<int32_t>(GetWaylandScale(state_)));
+    }
     if (root_window_)
       root_window_->PropagateBufferScale(scale);
   }
@@ -330,25 +353,49 @@
   }
 }
 
-int WaylandSurface::GetWaylandScale(const State& state) {
-  if (surface_submission_in_pixel_coordinates_)
+float WaylandSurface::GetWaylandScale(const State& state) {
+  if (surface_submission_in_pixel_coordinates_) {
     return 1;
-  return (state.buffer_scale_float < 1.0f)
-             ? 1
-             : std::ceil(state.buffer_scale_float);
+  }
+  return (state.buffer_scale_float < 1.f)
+             ? 1.f
+             : (use_viewporter_surface_scaling_
+                    ? state.buffer_scale_float
+                    : std::ceil(state.buffer_scale_float));
+}
+
+bool WaylandSurface::IsViewportScaled(const State& state) {
+  if (state.viewport_px.IsEmpty()) {
+    return false;
+  }
+  gfx::SizeF src_size_px =
+      wl::ApplyWaylandTransform(gfx::SizeF(state.buffer_size_px),
+                                wl::ToWaylandTransform(state.buffer_transform));
+  if (!state.crop.IsEmpty()) {
+    const gfx::RectF crop_transformed = wl::ApplyWaylandTransform(
+        state.crop, gfx::SizeF(1, 1),
+        wl::ToWaylandTransform(state.buffer_transform));
+    src_size_px = gfx::ScaleRect(crop_transformed, src_size_px.width(),
+                                 src_size_px.height())
+                      .size();
+  }
+  if (src_size_px != state.viewport_px) {
+    return true;
+  }
+  return false;
 }
 
 wl::Object<wl_region> WaylandSurface::CreateAndAddRegion(
     const std::vector<gfx::Rect>& region_px,
-    int32_t buffer_scale) {
+    float buffer_scale) {
   DCHECK(root_window_);
-  DCHECK(!surface_submission_in_pixel_coordinates_ || buffer_scale == 1);
+  DCHECK(!surface_submission_in_pixel_coordinates_ || buffer_scale == 1.f);
 
   wl::Object<wl_region> region(
       wl_compositor_create_region(connection_->compositor()));
 
   for (const auto& rect_px : region_px) {
-    gfx::Rect rect = gfx::ScaleToEnclosingRect(rect_px, 1.f / buffer_scale);
+    gfx::Rect rect = gfx::ScaleToEnclosedRect(rect_px, 1.f / buffer_scale);
     wl_region_add(region.get(), rect.x(), rect.y(), rect.width(),
                   rect.height());
   }
@@ -562,17 +609,58 @@
       wl::ToWaylandTransform(pending_state_.buffer_transform));
   int32_t applying_surface_scale = surface_scale_set_;
 
+  gfx::RectF crop = pending_state_.crop;
+  gfx::SizeF viewport_px = pending_state_.viewport_px;
+
+  // If this is the root surface, no viewport scaling is requested, surface
+  // submission in pixel coordinates is disabled and fractional_scale_v1 is in
+  // use, then crop the buffer in accordance with the protocol specification to
+  // ensure that a pixel on the window will correspond to a pixel on the
+  // physical display.
+  if (!surface_submission_in_pixel_coordinates_ &&
+      connection_->fractional_scale_manager_v1() && root_window_ &&
+      root_window_->root_surface() == this &&
+      !IsViewportScaled(pending_state_)) {
+    gfx::Size old_size_px =
+        crop.IsEmpty()
+            ? pending_state_.buffer_size_px
+            : gfx::ToFlooredSize(
+                  gfx::ScaleRect(crop, pending_state_.buffer_size_px.width(),
+                                 pending_state_.buffer_size_px.height())
+                      .size());
+    gfx::Size new_size_dip = gfx::ScaleToFlooredSize(
+        old_size_px, 1.f / pending_state_.buffer_scale_float);
+    gfx::Size new_size_px = gfx::ScaleToRoundedSize(
+        new_size_dip, pending_state_.buffer_scale_float);
+    if (new_size_px != old_size_px) {
+      crop.set_width(static_cast<float>(new_size_px.width()) /
+                     static_cast<float>(pending_state_.buffer_size_px.width()));
+      crop.set_height(
+          static_cast<float>(new_size_px.height()) /
+          static_cast<float>(pending_state_.buffer_size_px.height()));
+      viewport_px = wl::ApplyWaylandTransform(
+          gfx::SizeF(new_size_px),
+          wl::ToWaylandTransform(pending_state_.buffer_transform));
+    }
+  }
+
+  if (viewport_px.IsEmpty() && use_viewporter_surface_scaling_) {
+    // Force usage of viewporter when needed for fractional scaling.
+    viewport_px = bounds;
+  }
+
   // When viewport_px is set, wp_viewport will scale the surface accordingly.
   // Thus, there is no need to downscale bounds as Wayland compositor
   // understands that.
-  if (!pending_state_.viewport_px.IsEmpty() && viewport()) {
+  if (!viewport_px.IsEmpty() && viewport()) {
     // Unset buffer scale if wp_viewport.destination will be set.
     applying_surface_scale = 1;
   } else {
     applying_surface_scale = GetWaylandScale(pending_state_);
     bounds = gfx::ScaleSize(bounds, 1.f / GetWaylandScale(pending_state_));
   }
-  if (!surface_submission_in_pixel_coordinates_ &&
+  if (!(surface_submission_in_pixel_coordinates_ ||
+        use_viewporter_surface_scaling_) &&
       surface_scale_set_ != applying_surface_scale) {
     wl_surface_set_buffer_scale(surface_.get(), applying_surface_scale);
     surface_scale_set_ = applying_surface_scale;
@@ -586,12 +674,12 @@
   gfx::RectF viewport_src_dip;
   wl_fixed_t src_to_set[4] = {wl_fixed_from_int(-1), wl_fixed_from_int(-1),
                               wl_fixed_from_int(-1), wl_fixed_from_int(-1)};
-  if (pending_state_.crop.IsEmpty()) {
+  if (crop.IsEmpty()) {
     viewport_src_dip = gfx::RectF(bounds);
   } else {
     // viewport_src_dip needs to be in post-transform coordinates.
     gfx::RectF crop_transformed = wl::ApplyWaylandTransform(
-        pending_state_.crop, gfx::SizeF(1, 1),
+        crop, gfx::SizeF(1, 1),
         wl::ToWaylandTransform(pending_state_.buffer_transform));
     viewport_src_dip =
         gfx::ScaleRect(crop_transformed, bounds.width(), bounds.height());
@@ -605,7 +693,7 @@
       // TODO(crbug.com/1325344): Resolve why this viewport size ends up being
       // zero and remove the fix below.
       LOG(ERROR) << "viewport_src_dip=" << viewport_src_dip.ToString()
-                 << " pending_state_.crop=" << pending_state_.crop.ToString()
+                 << " crop=" << crop.ToString()
                  << " bounds=" << bounds.ToString()
                  << "  pending_state_.buffer_size_px="
                  << pending_state_.buffer_size_px.ToString();
@@ -635,10 +723,9 @@
   }
 
   gfx::SizeF viewport_dst_dip =
-      pending_state_.viewport_px.IsEmpty()
+      viewport_px.IsEmpty()
           ? viewport_src_dip.size()
-          : gfx::ScaleSize(pending_state_.viewport_px,
-                           1.f / GetWaylandScale(pending_state_));
+          : gfx::ScaleSize(viewport_px, 1.f / GetWaylandScale(pending_state_));
   float dst_to_set[2] = {-1.f, -1.f};
   if (viewport_dst_dip != viewport_src_dip.size()) {
     dst_to_set[0] = viewport_dst_dip.width();
@@ -662,9 +749,9 @@
     } else if (viewport()) {
       wp_viewport_set_destination(
           viewport(),
-          dst_to_set[0] > 0.f ? base::ClampCeil(viewport_dst_dip.width())
+          dst_to_set[0] > 0.f ? base::ClampRound(viewport_dst_dip.width())
                               : static_cast<int>(dst_to_set[0]),
-          dst_to_set[1] > 0.f ? base::ClampCeil(viewport_dst_dip.height())
+          dst_to_set[1] > 0.f ? base::ClampRound(viewport_dst_dip.height())
                               : static_cast<int>(dst_to_set[1]));
     }
     memcpy(dst_set_, dst_to_set, 2 * sizeof(*dst_to_set));
@@ -696,10 +783,9 @@
                        1.0f / pending_state_.buffer_size_px.width(),
                        1.0f / pending_state_.buffer_size_px.height());
 
-    if (!pending_state_.crop.IsEmpty()) {
-      damage_uv.Offset(-pending_state_.crop.OffsetFromOrigin());
-      damage_uv.InvScale(pending_state_.crop.width(),
-                         pending_state_.crop.height());
+    if (!crop.IsEmpty()) {
+      damage_uv.Offset(-crop.OffsetFromOrigin());
+      damage_uv.InvScale(crop.width(), crop.height());
     }
     damage_uv.Intersect(gfx::RectF(1, 1));
 
@@ -812,6 +898,12 @@
   surface->RemoveEnteredOutput(wayland_output->output_id());
 }
 
+// static
+void WaylandSurface::PreferredScale(
+    void* data,
+    struct wp_fractional_scale_v1* wp_fractional_scale_v1,
+    uint32_t scale) {}
+
 void WaylandSurface::RemoveEnteredOutput(uint32_t output_id) {
   auto it = base::ranges::find(entered_outputs_, output_id);
   if (it == entered_outputs_.end())

ui/ozone/platform/wayland/host/wayland_surface.h

diff --git a/ui/ozone/platform/wayland/host/wayland_surface.h b/ui/ozone/platform/wayland/host/wayland_surface.h
index b478f50..b5accec9 100644
--- a/ui/ozone/platform/wayland/host/wayland_surface.h
+++ b/ui/ozone/platform/wayland/host/wayland_surface.h
@@ -27,6 +27,7 @@
 #include "ui/ozone/platform/wayland/host/wayland_zcr_color_space.h"
 
 struct wp_content_type_v1;
+struct wp_fractional_scale_v1;
 struct zwp_linux_buffer_release_v1;
 struct zcr_blending_v1;
 
@@ -307,11 +308,15 @@
     bool contains_video = false;
   };
 
-  // The wayland scale refers to the scale factor used for calls to wayland
-  // apis such as wl_region_add. When SurfaceSubmissionInPixelCoordinates is
-  // true, this is always 1. Otherwise this is buffer_scale_float casted to an
-  // integer.
-  int GetWaylandScale(const State& state);
+  // The wayland scale refers to the scale factor between the buffer coordinates
+  // and Wayland surface coordinates. When SurfaceSubmissionInPixelCoordinates
+  // is true, this is always 1. Otherwise, this is buffer_scale_float unless the
+  // value is less than 1. In that case 1 is returned. Additionally, if
+  // viewporter surface scaling is disabled, the value will be rounded up to the
+  // next integer.
+  float GetWaylandScale(const State& state);
+
+  bool IsViewportScaled(const State& state);
 
   // Tracks the last sent src and dst values across wayland protocol s.t. we
   // skip resending them when possible.
@@ -325,7 +330,7 @@
 
   wl::Object<wl_region> CreateAndAddRegion(
       const std::vector<gfx::Rect>& region_px,
-      int32_t buffer_scale);
+      float buffer_scale);
 
   // wl_surface states that are stored in Wayland client. It moves to |state_|
   // on ApplyPendingState().
@@ -352,6 +357,7 @@
   wl::Object<overlay_prioritized_surface> overlay_priority_surface_;
   wl::Object<augmented_surface> augmented_surface_;
   wl::Object<wp_content_type_v1> content_type_;
+  wl::Object<wp_fractional_scale_v1> fractional_scale_;
   std::unique_ptr<WaylandZcrColorManagementSurface>
       zcr_color_management_surface_;
   base::flat_map<zwp_linux_buffer_release_v1*, ExplicitReleaseInfo>
@@ -363,6 +369,10 @@
   // it's constant.
   const bool surface_submission_in_pixel_coordinates_;
 
+  // Same as above except it caches
+  // connection->UseViewporterSurfaceScaling().
+  const bool use_viewporter_surface_scaling_;
+
   // For top level window, stores outputs that the window is currently rendered
   // at.
   //
@@ -384,6 +394,12 @@
                     struct wl_surface* wl_surface,
                     struct wl_output* output);
 
+  // wp_fractional_scale_v1_listener
+  static void PreferredScale(
+      void* data,
+      struct wp_fractional_scale_v1* wp_fractional_scale_v1,
+      uint32_t scale);
+
   // zwp_linux_buffer_release_v1_listener
   static void FencedRelease(
       void* data,

ui/ozone/platform/wayland/host/wayland_window.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_window.cc b/ui/ozone/platform/wayland/host/wayland_window.cc
index 9175f61..3456ed7 100644
--- a/ui/ozone/platform/wayland/host/wayland_window.cc
+++ b/ui/ozone/platform/wayland/host/wayland_window.cc
@@ -37,7 +37,6 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_priority_hint.h"
 #include "ui/ozone/common/bitmap_cursor.h"
-#include "ui/ozone/common/features.h"
 #include "ui/ozone/platform/wayland/common/wayland_overlay_config.h"
 #include "ui/ozone/platform/wayland/host/wayland_connection.h"
 #include "ui/ozone/platform/wayland/host/wayland_data_drag_controller.h"
@@ -74,8 +73,8 @@
     : delegate_(delegate),
       connection_(connection),
       frame_manager_(std::make_unique<WaylandFrameManager>(this, connection)),
-      wayland_overlay_delegation_enabled_(connection->viewporter() &&
-                                          IsWaylandOverlayDelegationEnabled()),
+      wayland_overlay_delegation_enabled_(
+          connection->viewporter() && connection->ShouldUseOverlayDelegation()),
       accelerated_widget_(
           connection->window_manager()->AllocateAcceleratedWidget()),
       ui_task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()) {

ui/ozone/platform/wayland/host/wayland_window_drag_controller.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_window_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_window_drag_controller.cc
index d2c7116..71123b7 100644
--- a/ui/ozone/platform/wayland/host/wayland_window_drag_controller.cc
+++ b/ui/ozone/platform/wayland/host/wayland_window_drag_controller.cc
@@ -22,6 +22,7 @@
 #include "base/run_loop.h"
 #include "base/task/current_thread.h"
 #include "ui/base/dragdrop/mojom/drag_drop_types.mojom.h"
+#include "ui/base/ui_base_features.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
@@ -146,7 +147,7 @@
   data_device_->StartDrag(*data_source_, *origin_window_, serial->value,
                           /*icon_surface=*/nullptr, this);
   pointer_grab_owner_ = origin_window_;
-  should_process_drag_event_ = false;
+  should_process_drag_motion_events_ = false;
 
   // Observe window so we can take ownership of the origin surface in case it
   // is destroyed during the DND session.
@@ -261,7 +262,11 @@
     return;
 
   // Forward cursor location update info to the input handling delegate.
-  should_process_drag_event_ = true;
+  should_process_drag_motion_events_ =
+      !(features::IsWaylandScreenCoordinatesEnabled() &&
+        static_cast<WaylandToplevelWindow*>(drag_target_window_)
+            ->IsScreenCoordinatesEnabled());
+
   pointer_location_ = location;
 
   if (*drag_source_ == DragEventSource::kMouse) {
@@ -462,8 +467,9 @@
   DCHECK_EQ(state_, State::kDetached);
   DCHECK(event);
 
-  if (!should_process_drag_event_)
+  if (!should_process_drag_motion_events_) {
     return;
+  }
 
   // Notify listeners about window bounds change (i.e: re-positioning) event.
   // To do so, set the new bounds as per the motion event location and the drag
@@ -474,7 +480,7 @@
     dragged_window_->SetOrigin(event->location() - drag_offset_);
   }
 
-  should_process_drag_event_ = false;
+  should_process_drag_motion_events_ = false;
 }
 
 // Dispatch mouse release event (to tell clients that the drop just happened)

ui/ozone/platform/wayland/host/wayland_window_drag_controller.h

diff --git a/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h
index 3520c1b..0b6e1d7d 100644
--- a/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h
+++ b/ui/ozone/platform/wayland/host/wayland_window_drag_controller.h
@@ -191,11 +191,21 @@
   std::unique_ptr<ScopedEventDispatcher> nested_dispatcher_;
   base::OnceClosure quit_loop_closure_;
 
-  // Tells if the current drag event should be processed. Buggy compositors may
-  // send wl_pointer::motion events, for example, while a DND session is still
-  // in progress, which leads to issues in window dragging sessions, this flag
-  // is used to make window drag controller resistant to such scenarios.
-  bool should_process_drag_event_ = false;
+  // Tells if the current drag motion events should be processed.
+  //
+  // The processing of drag motion events should be suspended when:
+  //
+  // 1/ Buggy compositors send wl_pointer::motion events, for example, while
+  // a DND session is still in progress, which leads to issues in window
+  // dragging sessions.
+  //
+  // 2/ `Screen coordinates` feature is enabled, given that in this mode
+  // the surface location during a window drag operation is updated
+  // via `zaura_shell::origin_change` request.
+  //
+  // This flag is used to make window drag controller resistant to such
+  // scenarios.
+  bool should_process_drag_motion_events_ = false;
 
   bool extended_drag_available_for_testing_ = false;
 

ui/ozone/platform/wayland/host/wayland_window_unittest.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_window_unittest.cc b/ui/ozone/platform/wayland/host/wayland_window_unittest.cc
index 9ed85c80..5f989c4 100644
--- a/ui/ozone/platform/wayland/host/wayland_window_unittest.cc
+++ b/ui/ozone/platform/wayland/host/wayland_window_unittest.cc
@@ -3322,8 +3322,12 @@
   EXPECT_TRUE(connection_->buffer_manager_host());
 
   auto interface_ptr = connection_->buffer_manager_host()->BindInterface();
-  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                  false, kAugmentedSurfaceNotSupportedVersion);
+  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {},
+                                  /*supports_dma_buf=*/false,
+                                  /*supports_viewporter=*/true,
+                                  /*supports_acquire_fence=*/false,
+                                  /*supports_overlays=*/true,
+                                  kAugmentedSurfaceNotSupportedVersion);
 
   // Setup wl_buffers.
   constexpr uint32_t buffer_id1 = 1;
@@ -4060,8 +4064,12 @@
   EXPECT_TRUE(connection_->buffer_manager_host());
 
   auto interface_ptr = connection_->buffer_manager_host()->BindInterface();
-  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                  false, kAugmentedSurfaceNotSupportedVersion);
+  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {},
+                                  /*supports_dma_buf=*/false,
+                                  /*supports_viewporter=*/true,
+                                  /*supports_acquire_fence=*/false,
+                                  /*supports_overlays=*/true,
+                                  kAugmentedSurfaceNotSupportedVersion);
 
   // Setup wl_buffers.
   constexpr uint32_t buffer_id = 1;

ui/ozone/platform/wayland/host/wayland_zcr_color_manager_unittest.cc

diff --git a/ui/ozone/platform/wayland/host/wayland_zcr_color_manager_unittest.cc b/ui/ozone/platform/wayland/host/wayland_zcr_color_manager_unittest.cc
index 2d22013..b5316bcd 100644
--- a/ui/ozone/platform/wayland/host/wayland_zcr_color_manager_unittest.cc
+++ b/ui/ozone/platform/wayland/host/wayland_zcr_color_manager_unittest.cc
@@ -119,7 +119,7 @@
   EXPECT_TRUE(connection_->buffer_manager_host());
   auto interface_ptr = connection_->buffer_manager_host()->BindInterface();
   buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                  false, 0);
+                                  false, true, 0);
 
   // Setup wl_buffers.
   constexpr uint32_t buffer_id = 1;
@@ -161,7 +161,7 @@
   EXPECT_TRUE(connection_->buffer_manager_host());
   auto interface_ptr = connection_->buffer_manager_host()->BindInterface();
   buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                  false, 0);
+                                  false, true, 0);
 
   // Setup wl_buffers.
   constexpr uint32_t buffer_id = 1;

ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom

diff --git a/ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom b/ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom
index 8d30edf..96f3f31 100644
--- a/ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom
+++ b/ui/ozone/platform/wayland/mojom/wayland_buffer_manager.mojom
@@ -104,6 +104,8 @@
   // |supports_acquire_fence| indicates whether acquire fences can be submitted
   // with buffers for wayland servers to wait on before accessing buffer
   // contents.
+  // |supports_overlays| indicates whether overlays should be used with this
+  // Wayland compositor.
   // |supported_surface_augmentor_version| says what version of the augment
   // surface protocol the client is using. If the version is 0, the surface
   // augmentor is not available.
@@ -113,6 +115,7 @@
              bool supports_dma_buf,
              bool supports_viewporter,
              bool supports_acquire_fence,
+             bool supports_overlays,
              uint32 supported_surface_augmentor_version);
 
   // Signals about swap completion and presentation.

ui/ozone/platform/wayland/ozone_platform_wayland.cc

diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
index 60d3bff..c2511b3e 100644
--- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc
+++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
@@ -334,9 +334,10 @@
           override_supports_ssd_for_test == SupportsSsdForTest::kNotSet) ||
           override_supports_ssd_for_test == SupportsSsdForTest::kYes;
       properties.supports_overlays =
-          ui::IsWaylandOverlayDelegationEnabled() && connection_->viewporter();
+          connection_->ShouldUseOverlayDelegation() &&
+          connection_->viewporter();
       properties.supports_non_backed_solid_color_buffers =
-          ui::IsWaylandOverlayDelegationEnabled() &&
+          connection_->ShouldUseOverlayDelegation() &&
           connection_->buffer_manager_host()
               ->SupportsNonBackedSolidColorBuffers();
       // Primary planes can be transluscent due to underlay strategy. As a
@@ -344,7 +345,8 @@
       // To prevent this, an opaque background image is stacked below the
       // accelerated widget to occlude contents below.
       properties.needs_background_image =
-          ui::IsWaylandOverlayDelegationEnabled() && connection_->viewporter();
+          connection_->ShouldUseOverlayDelegation() &&
+          connection_->viewporter();
       if (connection_->zaura_shell()) {
         properties.supports_activation =
             zaura_shell_get_version(connection_->zaura_shell()->wl_object()) >=
@@ -367,11 +369,11 @@
       // These properties are set when the GetPlatformRuntimeProperties is
       // called on the gpu process side.
       properties.supports_non_backed_solid_color_buffers =
-          ui::IsWaylandOverlayDelegationEnabled() &&
+          buffer_manager_->supports_overlays() &&
           buffer_manager_->supports_non_backed_solid_color_buffers();
       // See the comment above.
       properties.needs_background_image =
-          ui::IsWaylandOverlayDelegationEnabled() &&
+          buffer_manager_->supports_overlays() &&
           buffer_manager_->supports_viewporter();
       properties.supports_native_pixmaps =
           surface_factory_->SupportsNativePixmaps();

ui/ozone/platform/wayland/test/test_wayland_server_thread.h

diff --git a/ui/ozone/platform/wayland/test/test_wayland_server_thread.h b/ui/ozone/platform/wayland/test/test_wayland_server_thread.h
index d5e9b75c..fae719e1 100644
--- a/ui/ozone/platform/wayland/test/test_wayland_server_thread.h
+++ b/ui/ozone/platform/wayland/test/test_wayland_server_thread.h
@@ -68,6 +68,7 @@
   EnableAuraShellProtocol enable_aura_shell =
       EnableAuraShellProtocol::kDisabled;
   bool surface_submission_in_pixel_coordinates = true;
+  bool supports_viewporter_surface_scaling = false;
   bool use_aura_output_manager = false;
 };
 

ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc

diff --git a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
index cd6f718..e4d1b7a 100644
--- a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
@@ -112,6 +112,8 @@
     // before we create the surface.
     connection_->set_surface_submission_in_pixel_coordinates(
         GetParam().surface_submission_in_pixel_coordinates);
+    connection_->set_supports_viewporter_surface_scaling(
+        GetParam().supports_viewporter_surface_scaling);
 
     // Set this bug fix so that WaylandFrameManager does not use a freeze
     // counter. Otherwise, we won't be able to have a reliable test order of
@@ -128,8 +130,11 @@
     // callback and bind the interface again if the manager failed.
     manager_host_->SetTerminateGpuCallback(callback_.Get());
     auto interface_ptr = manager_host_->BindInterface();
-    buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                    false,
+    buffer_manager_gpu_->Initialize(std::move(interface_ptr), {},
+                                    /*supports_dma_buf=*/false,
+                                    /*supports_viewporter=*/true,
+                                    /*supports_acquire_fence=*/false,
+                                    /*supports_overlays=*/true,
                                     kAugmentedSurfaceNotSupportedVersion);
     surface_id_ = window_->root_surface()->get_surface_id();
   }
@@ -203,7 +208,11 @@
                 buffer_manager_gpu_ =
                     std::make_unique<WaylandBufferManagerGpu>();
                 buffer_manager_gpu_->Initialize(
-                    std::move(interface_ptr), {}, false, true, false,
+                    std::move(interface_ptr), {},
+                    /*supports_dma_buf=*/false,
+                    /*supports_viewporter=*/true,
+                    /*supports_acquire_fence=*/false,
+                    /*supports_overlays=*/true,
                     kAugmentedSurfaceNotSupportedVersion);
               }));
     }
@@ -2497,8 +2506,12 @@
   });
 
   auto interface_ptr = manager_host_->BindInterface();
-  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                  false, kAugmentedSurfaceNotSupportedVersion);
+  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {},
+                                  /*supports_dma_buf=*/false,
+                                  /*supports_viewporter=*/true,
+                                  /*supports_acquire_fence=*/false,
+                                  /*supports_overlays=*/true,
+                                  kAugmentedSurfaceNotSupportedVersion);
 
   PostToServerAndWait([](wl::TestWaylandServerThread* server) {
     EXPECT_CALL(*server->zwp_linux_dmabuf_v1(), CreateParams(_, _, _)).Times(1);
@@ -2612,8 +2625,12 @@
   });
 
   auto interface_ptr = manager_host_->BindInterface();
-  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                  false, kAugmentedSurfaceNotSupportedVersion);
+  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {},
+                                  /*supports_dma_buf=*/false,
+                                  /*supports_viewporter=*/true,
+                                  /*supports_acquire_fence=*/false,
+                                  /*supports_overlays=*/true,
+                                  kAugmentedSurfaceNotSupportedVersion);
 
   PostToServerAndWait([](wl::TestWaylandServerThread* server) {
     // Now, create only one buffer and attach that to the root surface. The
@@ -2778,6 +2795,12 @@
 
   uint32_t frame_id = 0u;
   for (auto scale_factor : scale_factors) {
+    if (scale_factor != std::ceil(scale_factor) &&
+        !GetParam().surface_submission_in_pixel_coordinates) {
+      // Fractional scales not supported when surface submission in pixel
+      // coordinates is disabled.
+      continue;
+    }
     for (const auto& rounded_corners : rounded_corners_vec) {
       std::vector<wl::WaylandOverlayConfig> overlay_configs;
       for (auto id : kBufferIds) {
@@ -2941,8 +2964,12 @@
   EXPECT_EQ(3u, buffer_manager_gpu_->pending_tasks_.size());
 
   auto interface_ptr = manager_host_->BindInterface();
-  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {}, false, true,
-                                  false, kAugmentedSurfaceNotSupportedVersion);
+  buffer_manager_gpu_->Initialize(std::move(interface_ptr), {},
+                                  /*supports_dma_buf=*/false,
+                                  /*supports_viewporter=*/true,
+                                  /*supports_acquire_fence=*/false,
+                                  /*supports_overlays=*/true,
+                                  kAugmentedSurfaceNotSupportedVersion);
 
   base::RunLoop().RunUntilIdle();
 
@@ -3100,7 +3127,7 @@
 // available (the destination is set with floating point precision).
 TEST_P(WaylandBufferManagerViewportTest, ViewportDestinationInteger) {
   constexpr gfx::RectF test_data[2][2] = {
-      {gfx::RectF({21, 18}, {7.423, 11.854}), gfx::RectF({21, 18}, {8, 12})},
+      {gfx::RectF({21, 18}, {7.423, 11.854}), gfx::RectF({21, 18}, {7, 12})},
       {gfx::RectF({7, 8}, {43.562, 63.76}),
        gfx::RectF({7, 8}, {43.562, 63.76})}};
 
@@ -3139,5 +3166,10 @@
     XdgVersionStableTestWithSurfaceSubmissionInPixelCoordinatesDisabled,
     WaylandBufferManagerTest,
     Values(wl::ServerConfig{.surface_submission_in_pixel_coordinates = false}));
+INSTANTIATE_TEST_SUITE_P(
+    XdgVersionStableTestWithViewporterSurfaceScalingEnabled,
+    WaylandBufferManagerTest,
+    Values(wl::ServerConfig{.surface_submission_in_pixel_coordinates = false,
+                            .supports_viewporter_surface_scaling = true}));
 
 }  // namespace ui

ui/shell_dialogs/select_file_dialog_linux_kde.cc

diff --git a/ui/shell_dialogs/select_file_dialog_linux_kde.cc b/ui/shell_dialogs/select_file_dialog_linux_kde.cc
index d42c855..9a5bd29e 100644
--- a/ui/shell_dialogs/select_file_dialog_linux_kde.cc
+++ b/ui/shell_dialogs/select_file_dialog_linux_kde.cc
@@ -169,7 +169,7 @@
       void* params,
       std::unique_ptr<KDialogOutputParams> results);
 
-  // Should be either DESKTOP_ENVIRONMENT_KDE3, KDE4, or KDE5.
+  // Should be either DESKTOP_ENVIRONMENT_KDE3, KDE4, KDE5, or KDE6.
   base::nix::DesktopEnvironment desktop_;
 
   // The set of all parent windows for which we are currently running
@@ -222,7 +222,8 @@
            base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})) {
   DCHECK(desktop_ == base::nix::DESKTOP_ENVIRONMENT_KDE3 ||
          desktop_ == base::nix::DESKTOP_ENVIRONMENT_KDE4 ||
-         desktop_ == base::nix::DESKTOP_ENVIRONMENT_KDE5);
+         desktop_ == base::nix::DESKTOP_ENVIRONMENT_KDE5 ||
+         desktop_ == base::nix::DESKTOP_ENVIRONMENT_KDE6);
   // |kdialog_version| should be of the form "kdialog 1.2.3", so split on
   // whitespace and then try to parse a version from the second piece. If
   // parsing fails for whatever reason, we fall back to the behavior that works

ui/shell_dialogs/select_file_dialog_win_unittest.cc

diff --git a/ui/shell_dialogs/select_file_dialog_win_unittest.cc b/ui/shell_dialogs/select_file_dialog_win_unittest.cc
index 8465e5e..466cd8a 100644
--- a/ui/shell_dialogs/select_file_dialog_win_unittest.cc
+++ b/ui/shell_dialogs/select_file_dialog_win_unittest.cc
@@ -288,7 +288,11 @@
 
   EXPECT_FALSE(was_cancelled());
   ASSERT_EQ(1u, selected_paths().size());
-  EXPECT_EQ(selected_paths()[0], default_path);
+  // On some machines GetSystemDirectory returns C:\WINDOWS which is then
+  // normalized to C:\Windows by the file dialog, leading to spurious failures
+  // if a case-sensitive comparison is used.
+  EXPECT_TRUE(base::FilePath::CompareEqualIgnoreCase(
+      selected_paths()[0].value(), default_path.value()));
 }
 
 // Specifying the title when opening a dialog to select a file, select multiple
@@ -346,7 +350,11 @@
 
   EXPECT_FALSE(was_cancelled());
   ASSERT_EQ(1u, selected_paths().size());
-  EXPECT_EQ(selected_paths()[0], default_path);
+  // On some machines GetSystemDirectory returns C:\WINDOWS which is then
+  // normalized to C:\Windows by the file dialog, leading to spurious failures
+  // if a case-sensitive comparison is used.
+  EXPECT_TRUE(base::FilePath::CompareEqualIgnoreCase(
+      selected_paths()[0].value(), default_path.value()));
 }
 
 // Tests that the file extension is automatically added.
@@ -374,7 +382,11 @@
 
   EXPECT_FALSE(was_cancelled());
   ASSERT_EQ(1u, selected_paths().size());
-  EXPECT_EQ(selected_paths()[0], default_path.AddExtension(L"html"));
+  // On some machines GetSystemDirectory returns C:\WINDOWS which is then
+  // normalized to C:\Windows by the file dialog, leading to spurious failures
+  // if a case-sensitive comparison is used.
+  EXPECT_TRUE(base::FilePath::CompareEqualIgnoreCase(
+      selected_paths()[0].value(), default_path.AddExtension(L"html").value()));
 }
 
 // Tests that only specifying a basename as the default path works.
@@ -423,7 +435,11 @@
   RunUntilIdle();
 
   EXPECT_FALSE(was_cancelled());
-  EXPECT_EQ(selected_paths()[0], default_path);
+  // On some machines GetSystemDirectory returns C:\WINDOWS which is then
+  // normalized to C:\Windows by the file dialog, leading to spurious failures
+  // if a case-sensitive comparison is used.
+  EXPECT_TRUE(base::FilePath::CompareEqualIgnoreCase(
+      selected_paths()[0].value(), default_path.value()));
 }
 
 TEST_F(SelectFileDialogWinTest, OpenFileDifferentExtension) {
@@ -450,7 +466,11 @@
   RunUntilIdle();
 
   EXPECT_FALSE(was_cancelled());
-  EXPECT_EQ(selected_paths()[0], default_path);
+  // On some machines GetSystemDirectory returns C:\WINDOWS which is then
+  // normalized to C:\Windows by the file dialog, leading to spurious failures
+  // if a case-sensitive comparison is used.
+  EXPECT_TRUE(base::FilePath::CompareEqualIgnoreCase(
+      selected_paths()[0].value(), default_path.value()));
 }
 
 TEST_F(SelectFileDialogWinTest, SelectNonExistingFile) {

ui/shell_dialogs/shell_dialog_linux.cc

diff --git a/ui/shell_dialogs/shell_dialog_linux.cc b/ui/shell_dialogs/shell_dialog_linux.cc
index 9b4f4d2..6086d6ef 100644
--- a/ui/shell_dialogs/shell_dialog_linux.cc
+++ b/ui/shell_dialogs/shell_dialog_linux.cc
@@ -68,7 +68,8 @@
       base::nix::GetDesktopEnvironment(env.get());
   if (desktop == base::nix::DESKTOP_ENVIRONMENT_KDE3 ||
       desktop == base::nix::DESKTOP_ENVIRONMENT_KDE4 ||
-      desktop == base::nix::DESKTOP_ENVIRONMENT_KDE5) {
+      desktop == base::nix::DESKTOP_ENVIRONMENT_KDE5 ||
+      desktop == base::nix::DESKTOP_ENVIRONMENT_KDE6) {
     // Check to see if the user dislikes the KDE file dialog.
     if (!env->HasVar("NO_CHROME_KDE_FILE_DIALOG")) {
       // Check to see if the KDE dialog works.

ui/views/controls/textfield/textfield.cc

diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 44308fa..cc166df8 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -2565,9 +2565,6 @@
 gfx::Rect Textfield::CalculateCursorViewBounds() const {
   gfx::Rect location(GetRenderText()->GetUpdatedCursorBounds());
   location.set_x(GetMirroredXForRect(location));
-  location.set_height(
-      std::min(location.height(),
-               GetLocalBounds().height() - location.y() - location.y()));
   return location;
 }
 

ui/webui/resources/cr_elements/cr_url_list_item/cr_url_list_item.html

diff --git a/ui/webui/resources/cr_elements/cr_url_list_item/cr_url_list_item.html b/ui/webui/resources/cr_elements/cr_url_list_item/cr_url_list_item.html
index af51eb6..c084548 100644
--- a/ui/webui/resources/cr_elements/cr_url_list_item/cr_url_list_item.html
+++ b/ui/webui/resources/cr_elements/cr_url_list_item/cr_url_list_item.html
@@ -249,7 +249,7 @@
   .metadata {
     display: flex;
     flex-direction: column;
-    gap: 3px;
+    gap: 8px;
     min-width: 0;
     width: 100%;
   }