Revert "Remove SK_USE_LEGACY_BLUR_IMAGEFILTER staging flag"

This reverts commit 069d3d9.

Reason for revert: Linux MSan failures; see https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20MSan%20Tests/42742/overview.

Original change's description:
> Remove SK_USE_LEGACY_BLUR_IMAGEFILTER staging flag
>
> With the removal of this flag, CPU-based blurs will now respect the
> SkTileMode passed to the blur image filter. Both GPU and CPU blurs
> will tend to have more optimal image sizes (smaller) when using
> kDecal. kDecal should also use fewer renderpasses. There is a
> temporary regression in image size and renderpasses for other tile
> modes but this is a required step in the overall blur refactoring.
>
> It also fixes a bug where decal would be applied to the intersection
> of both the filter region and primitive subregion when performing
> blurs in SVGs. This is why there are larger changes to the
> `effect-reference-subregion`: the blur is able to read the hidden color cells of the input image, some of which are red so the overall blur color shifts from green to brownish.
>
> Most viz pixel tests have benign updates. However, the blur_filter_with_clip test is meant to have clamped content. The SW
> expected image had baked in the previous limitation of decal-only
> blurs which is no longer the case. However, the software_renderer
> compositor seems to be sizing images a little off so the clamp is only
> applying to the top and left edges. Now the new expected image is
> just half wrong :)
>
> Chromium is still relying on deprecated behavior for clamped blurs
> where it doesn't specify the clamping geometry with the image filter.
> This will require more changes but would likely get around the issue
> with how the software_renderer prepares the images to be blurred.
>
> Numerous ash pixel tests had to be updated, but I couldn't spot any
> meaningful differences in their content. My guess is that the widgets
> and windows all had some amount of blur use, so this change touched
> everywhere.
>
> Bug: b/294100597
> Bug: b/40040586
> Change-Id: I67d5840113e87cfbed1d3a2c4d624c8216991775
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4818347
> Reviewed-by: Scott Violet <[email protected]>
> Commit-Queue: Michael Ludwig <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1191026}

Bug: b/294100597
Bug: b/40040586
Change-Id: I9e8a7b8d6d046e68de3324a4a9f1a11c82897baa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4835971
Commit-Queue: Greg Thompson <[email protected]>
Auto-Submit: Greg Thompson <[email protected]>
Owners-Override: Greg Thompson <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1191235}

ash/app_list/views/app_list_item_view_pixeltest.cc

@@ -150,10 +150,10 @@ class AppListItemViewPixelTest
   size_t GetRevisionNumber() {
     if (jelly_enabled()) {
       // Revision numbers reset with Jelly.
-      return 5;
+      return 4;
     }
 
-    size_t base_revision_number = 7;
+    size_t base_revision_number = 6;
     if (use_folder_icon_refresh()) {
       ++base_revision_number;
     }
@@ -200,8 +200,8 @@ TEST_P(AppListItemViewPixelTest, AppListItemView) {
 
   ShowAppList();
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-      GenerateScreenshotName(), /*revision_number=*/3, GetItemViewAt(0),
-      GetItemViewAt(1)));
+      GenerateScreenshotName(), /*revision_number=*/jelly_enabled() ? 2 : 2,
+      GetItemViewAt(0), GetItemViewAt(1)));
 }
 
 // Verifies the layout of the item icons inside a folder.
@@ -229,19 +229,19 @@ TEST_P(AppListItemViewPixelTest, AppListFolderItemsLayoutInIcon) {
       // In production, use_folder_icon_refresh() is always enabled when jelly
       // is enabled.
       EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-          GenerateScreenshotName(), /*revision_number=*/4, GetItemViewAt(0),
+          GenerateScreenshotName(), /*revision_number=*/3, GetItemViewAt(0),
           GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3),
           GetItemViewAt(4)));
     }
     // jelly_enabled && !use_folder_icon_refresh is deliberately skipped.
   } else if (use_folder_icon_refresh()) {
     EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-        GenerateScreenshotName(), /*revision_number=*/5, GetItemViewAt(0),
+        GenerateScreenshotName(), /*revision_number=*/4, GetItemViewAt(0),
         GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3),
         GetItemViewAt(4)));
   } else {
     EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-        GenerateScreenshotName(), /*revision_number=*/4, GetItemViewAt(0),
+        GenerateScreenshotName(), /*revision_number=*/3, GetItemViewAt(0),
         GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3)));
   }
 }
@@ -282,20 +282,20 @@ TEST_P(AppListItemViewPixelTest, AppListFolderIconExtendedState) {
   if (jelly_enabled()) {
     if (use_folder_icon_refresh()) {
       EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-          GenerateScreenshotName(), /*revision_number=*/4, GetItemViewAt(0),
+          GenerateScreenshotName(), /*revision_number=*/3, GetItemViewAt(0),
           GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3),
           GetItemViewAt(4)));
     }
     // Skip the !use_folder_icon_refresh && jelly_enabled state as it doesn't
     // occur in production.
   } else if (use_folder_icon_refresh()) {
     EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-        GenerateScreenshotName(), /*revision_number=*/5, GetItemViewAt(0),
+        GenerateScreenshotName(), /*revision_number=*/4, GetItemViewAt(0),
         GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3),
         GetItemViewAt(4)));
   } else {
     EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-        GenerateScreenshotName(), /*revision_number=*/4, GetItemViewAt(0),
+        GenerateScreenshotName(), /*revision_number=*/3, GetItemViewAt(0),
         GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3)));
   }
 

ash/app_list/views/app_list_view_pixeltest.cc

@@ -188,7 +188,7 @@ TEST_P(AppListViewPixelRTLTest, AnswerCardSearchResult) {
   UseFixedPlaceholderTextAndHideCursor(test_helper->GetSearchBoxView());
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "bubble_launcher_answer_card_search_results",
-      /*revision_number=*/JellyEnabled() ? 8 : 6,
+      /*revision_number=*/JellyEnabled() ? 7 : 5,
       GetAppListTestHelper()->GetBubbleView(),
       GetPrimaryShelf()->navigation_widget()));
 }
@@ -211,7 +211,7 @@ TEST_P(AppListViewPixelRTLTest, URLSearchResult) {
   UseFixedPlaceholderTextAndHideCursor(test_helper->GetSearchBoxView());
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "bubble_launcher_url_search_results",
-      /*revision_number=*/JellyEnabled() ? 8 : 6,
+      /*revision_number=*/JellyEnabled() ? 7 : 5,
       GetAppListTestHelper()->GetBubbleView(),
       GetPrimaryShelf()->navigation_widget()));
 }
@@ -226,7 +226,7 @@ TEST_P(AppListViewPixelRTLTest, Basics) {
       GetAppListTestHelper()->GetSearchBoxView());
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "bubble_launcher_basics",
-      /*revision_number=*/JellyEnabled() ? 8 : 6,
+      /*revision_number=*/JellyEnabled() ? 7 : 5,
       GetAppListTestHelper()->GetBubbleView(),
       GetPrimaryShelf()->navigation_widget()));
 }
@@ -249,7 +249,7 @@ TEST_P(AppListViewPixelRTLTest, GradientZone) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "bubble_launcher_gradient_zone",
-      /*revision_number=*/JellyEnabled() ? 8 : 6,
+      /*revision_number=*/JellyEnabled() ? 7 : 5,
       GetAppListTestHelper()->GetBubbleView(),
       GetPrimaryShelf()->navigation_widget()));
 }
@@ -362,7 +362,7 @@ INSTANTIATE_TEST_SUITE_P(RTL,
 TEST_P(AppListViewTabletPixelTest, Basic) {
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "tablet_launcher_basics",
-      /*revision_number=*/IsJellyEnabled() ? 7 : 6,
+      /*revision_number=*/IsJellyEnabled() ? 6 : 5,
       GetAppListTestHelper()->GetAppsContainerView()));
 }
 
@@ -384,7 +384,7 @@ TEST_P(AppListViewTabletPixelTest, TopGradientZone) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "tablet_launcher_top_gradient_zone",
-      /*revision_number=*/IsJellyEnabled() ? 6 : 5,
+      /*revision_number=*/IsJellyEnabled() ? 5 : 4,
       GetAppListTestHelper()->GetAppsContainerView()));
 }
 
@@ -406,7 +406,7 @@ TEST_P(AppListViewTabletPixelTest, BottomGradientZone) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "tablet_launcher_bottom_gradient_zone",
-      /*revision_number=*/IsJellyEnabled() ? 7 : 6,
+      /*revision_number=*/IsJellyEnabled() ? 6 : 5,
       GetAppListTestHelper()->GetAppsContainerView()));
 }
 
@@ -417,7 +417,7 @@ TEST_P(AppListViewTabletPixelTest, SearchBoxViewActive) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "search_box_view_active",
-      /*revision_number=*/IsJellyEnabled() ? 4 : 3, search_box_view));
+      /*revision_number=*/IsJellyEnabled() ? 3 : 2, search_box_view));
 }
 
 class AppListViewAssistantZeroStateTest
@@ -464,7 +464,7 @@ TEST_P(AppListViewAssistantZeroStateTest, Basic) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "app_list_view_assistant_zero_state",
-      /*revision_number=*/JellyEnabled(GetParam()) ? 5 : 4,
+      /*revision_number=*/JellyEnabled(GetParam()) ? 4 : 3,
       page_view()->GetViewByID(AssistantViewID::kZeroStateView)));
 }
 

ash/fullscreen_pixeltest.cc

@@ -28,7 +28,7 @@ class FullscreenPixelTest : public AshTestBase {
 // Verifies the primary fullscreen of an active user session.
 TEST_F(FullscreenPixelTest, VerifyDefaultPrimaryDisplay) {
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-      "primary_display", /*revision_number=*/5, Shell::GetPrimaryRootWindow()));
+      "primary_display", /*revision_number=*/4, Shell::GetPrimaryRootWindow()));
 }
 
 }  // namespace ash

ash/shelf/scrollable_shelf_view_pixeltest.cc

@@ -47,7 +47,7 @@ INSTANTIATE_TEST_SUITE_P(RTL, ScrollableShelfViewPixelRTLTest, testing::Bool());
 TEST_P(ScrollableShelfViewPixelRTLTest, Basics) {
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "overflow",
-      /*revision_number=*/5, GetPrimaryShelf()->GetWindow()));
+      /*revision_number=*/4, GetPrimaryShelf()->GetWindow()));
 
   ASSERT_TRUE(scrollable_shelf_view_->right_arrow());
   const gfx::Point right_arrow_center =
@@ -58,7 +58,7 @@ TEST_P(ScrollableShelfViewPixelRTLTest, Basics) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "overflow_end",
-      /*revision_number=*/5, GetPrimaryShelf()->GetWindow()));
+      /*revision_number=*/4, GetPrimaryShelf()->GetWindow()));
 }
 
 TEST_P(ScrollableShelfViewPixelRTLTest, LeftRightShelfAlignment) {
@@ -113,7 +113,7 @@ TEST_P(ScrollableShelfViewWithGuestModePixelTest, VerifyShelfContextMenu) {
   // Verify the shelf context menu and the shelf.
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "shelf_context_menu",
-      /*revision_number=*/10,
+      /*revision_number=*/9,
       GetPrimaryShelf()
           ->shelf_widget()
           ->shelf_view_for_testing()

ash/system/accessibility/accessibility_detailed_view_pixeltest.cc

@@ -61,7 +61,7 @@ TEST_P(AccessibilityDetailedViewPixelTest, Basics) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/5, detailed_view_container));
+      /*revision_number=*/4, detailed_view_container));
 }
 
 }  // namespace ash

ash/system/audio/audio_detailed_view_pixeltest.cc

@@ -56,7 +56,7 @@ TEST_F(AudioDetailedViewPixelTest, Basics) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "qs_audio_detailed_view",
-      /*revision_number=*/7, detailed_view));
+      /*revision_number=*/6, detailed_view));
 }
 
 TEST_F(AudioDetailedViewPixelTest, ShowNoiseCancellationButton) {
@@ -89,7 +89,7 @@ TEST_F(AudioDetailedViewPixelTest, ShowNoiseCancellationButton) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "qs_audio_detailed_view",
-      /*revision_number=*/1, detailed_view));
+      /*revision_number=*/0, detailed_view));
 }
 
 }  // namespace ash

ash/system/bluetooth/bluetooth_detailed_view_impl_pixeltest.cc

@@ -93,7 +93,7 @@ TEST_F(BluetoothDetailedViewImplPixelTest, Basics) {
   // Compare pixels.
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/5, detailed_view));
+      /*revision_number=*/4, detailed_view));
 }
 
 }  // namespace

ash/system/bluetooth/bluetooth_detailed_view_legacy_pixeltest.cc

@@ -95,7 +95,7 @@ TEST_F(BluetoothDetailedViewLegacyPixelTest, Basics) {
   // Compare pixels.
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "bluetooth_detailed_view_legacy",
-      /*revision_number=*/4, detailed_view_container));
+      /*revision_number=*/3, detailed_view_container));
 }
 
 }  // namespace ash

ash/system/brightness/display_detailed_view_pixeltest.cc

@@ -49,7 +49,7 @@ TEST_F(DisplayDetailedViewPixelTest, Basics) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "qs_display_detailed_view",
-      /*revision_number=*/7, detailed_view));
+      /*revision_number=*/6, detailed_view));
 }
 
 }  // namespace ash

ash/system/cast/cast_detailed_view_pixeltest.cc

@@ -66,7 +66,7 @@ TEST_F(CastDetailedViewPixelTest, Basics) {
   ASSERT_TRUE(detailed_view);
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/6, detailed_view));
+      /*revision_number=*/5, detailed_view));
 }
 
 }  // namespace

ash/system/cast/cast_zero_state_view_pixeltest.cc

@@ -51,7 +51,7 @@ TEST_F(CastZeroStateViewPixelTest, Basics) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "cast_zero_state_view",
-      /*revision_number=*/8, detailed_view));
+      /*revision_number=*/7, detailed_view));
 }
 
 }  // namespace ash

ash/system/ime/ime_detailed_view_pixeltest.cc

@@ -69,7 +69,7 @@ TEST_F(IMEDetailedViewPixelTest, Basics) {
   ASSERT_TRUE(detailed_view);
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/6, detailed_view));
+      /*revision_number=*/5, detailed_view));
 }
 
 }  // namespace

ash/system/locale/locale_detailed_view_pixeltest.cc

@@ -60,7 +60,7 @@ TEST_F(LocaleDetailedViewPixelTest, Basics) {
   ASSERT_TRUE(detailed_view);
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/6, detailed_view));
+      /*revision_number=*/5, detailed_view));
 }
 
 }  // namespace

ash/system/message_center/ash_notification_view_pixeltest.cc

@@ -150,7 +150,7 @@ TEST_P(AshNotificationViewPixelTest, CloseButtonFocused) {
   EXPECT_TRUE(close_button->HasFocus());
   EXPECT_EQ(control_buttons_layer->opacity(), 1);
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-      "close_button_focused", /*revision_number=*/4, notification_view));
+      "close_button_focused", /*revision_number=*/3, notification_view));
 }
 
 class AshNotificationViewTitlePixelTest
@@ -219,7 +219,7 @@ TEST_P(AshNotificationViewTitlePixelTest, NotificationTitleTest) {
   // Compare pixels.
   const std::string screenshot_name = GetScreenshotName();
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-      screenshot_name, /*revision_number=*/4, notification_view));
+      screenshot_name, /*revision_number=*/3, notification_view));
 }
 
 class ScreenCaptureNotificationPixelTest
@@ -296,7 +296,7 @@ TEST_P(ScreenCaptureNotificationPixelTest, VerifyPopup) {
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       base::StrCat({"screen_capture_popup_notification_",
                     GetDisplayTypeName(GetDisplayType())}),
-      /*revision_number=*/8,
+      /*revision_number=*/7,
       test_api()->GetPopupViewForId(kScreenCaptureNotificationId)));
 }
 

ash/system/network/network_detailed_network_view_pixeltest.cc

@@ -134,7 +134,7 @@ TEST_F(NetworkDetailedNetworkViewPixelTest, Basics) {
   // Compare pixels.
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/6, detailed_view));
+      /*revision_number=*/5, detailed_view));
 }
 
 }  // namespace

ash/system/network/vpn_detailed_view_pixeltest.cc

@@ -127,7 +127,7 @@ TEST_F(VpnDetailedViewPixelTest, OnlyBuiltInVpn) {
   // Compare pixels.
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/6, vpn_detailed_view_));
+      /*revision_number=*/5, vpn_detailed_view_));
 }
 
 TEST_F(VpnDetailedViewPixelTest, MultipleVpns) {
@@ -136,7 +136,7 @@ TEST_F(VpnDetailedViewPixelTest, MultipleVpns) {
   // Compare pixels.
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "check_view",
-      /*revision_number=*/6, vpn_detailed_view_));
+      /*revision_number=*/5, vpn_detailed_view_));
 }
 
 }  // namespace ash

ash/system/status_area_pixeltest.cc

@@ -136,7 +136,7 @@ TEST_P(StatusAreaParameterizedPixelTest, SystemTrayTest) {
   system_tray->SetIsActive(IsActive());
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-      "system_tray" + GetScreenshotNameSuffix(), /*revision_number=*/1,
+      "system_tray" + GetScreenshotNameSuffix(), /*revision_number=*/0,
       system_tray));
 }
 
@@ -149,7 +149,7 @@ TEST_P(StatusAreaParameterizedPixelTest, DateTrayTest) {
   date_tray->SetIsActive(IsActive());
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-      "date_tray" + GetScreenshotNameSuffix(), /*revision_number=*/1,
+      "date_tray" + GetScreenshotNameSuffix(), /*revision_number=*/0,
       date_tray));
 }
 
@@ -164,7 +164,7 @@ TEST_P(StatusAreaParameterizedPixelTest,
   notification_tray->SetIsActive(IsActive());
   EXPECT_TRUE(notification_tray->GetVisible());
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
-      "notification_tray" + GetScreenshotNameSuffix(), /*revision_number=*/1,
+      "notification_tray" + GetScreenshotNameSuffix(), /*revision_number=*/0,
       notification_tray));
 }
 

ash/system/time/calendar_view_pixeltest.cc

@@ -111,7 +111,7 @@ TEST_F(CalendarViewPixelTest, Basics) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "calendar_view",
-      /*revision_number=*/3, GetCalendarView()));
+      /*revision_number=*/2, GetCalendarView()));
 }
 
 TEST_F(CalendarViewPixelTest, EventList) {
@@ -141,7 +141,7 @@ TEST_F(CalendarViewPixelTest, EventList) {
 
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "event_list_view",
-      /*revision_number=*/5, GetEventListView()));
+      /*revision_number=*/4, GetEventListView()));
 }
 
 }  // namespace ash

ash/system/unified/quick_settings_footer_pixeltest.cc

@@ -71,7 +71,7 @@ TEST_F(QuickSettingsFooterPixelTest, FooterShouldBeRenderedCorrectly) {
   InitPowerStatusAndOpenBubble();
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "with_no_extra_button",
-      /*revision_number=*/3, GetFooter()));
+      /*revision_number=*/2, GetFooter()));
   CloseBubble();
 
   // Regression test for b/293484037: The settings button is missing when
@@ -80,7 +80,7 @@ TEST_F(QuickSettingsFooterPixelTest, FooterShouldBeRenderedCorrectly) {
   InitPowerStatusAndOpenBubble();
   EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
       "with_exit_button",
-      /*revision_number=*/3, GetFooter()));
+      /*revision_number=*/2, GetFooter()));
   CloseBubble();
 }