From 59c3a104e1fa6dfec9c8fa08b6fde0a3bcfbae04 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 22 Jun 2022 15:53:17 +0100 Subject: [PATCH] Correcting comparison ordering for PermissionManager tests With the activation of features::kPermissionQuietChip, one of the vectors we were reading to validate the tests is now listing its items in the inverse order, so this change makes sure to correct how we compare the local vector in the same ordering. Chromium change: https://chromium.googlesource.com/chromium/src/+/1b2ca40c554f65c8e60d5309e1dc5939c8a67e09 commit 1b2ca40c554f65c8e60d5309e1dc5939c8a67e09 Author: Illia Klimov Date: Thu Jun 9 20:02:41 2022 +0000 Launch the quiet permission chip to 100% stable. Bug: 1334626 --- browser/permissions/permission_manager_browsertest.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/browser/permissions/permission_manager_browsertest.cc b/browser/permissions/permission_manager_browsertest.cc index 7de52a6746b..d87c0c22318 100644 --- a/browser/permissions/permission_manager_browsertest.cc +++ b/browser/permissions/permission_manager_browsertest.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/feature_list.h" #include "base/memory/raw_ptr.h" +#include "base/ranges/algorithm.h" #include "base/test/scoped_feature_list.h" #include "brave/components/brave_wallet/browser/permission_utils.h" #include "brave/components/brave_wallet/common/features.h" @@ -155,6 +156,10 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestPermissions) { &sub_request_origins[j])) << "case: " << i << ", address: " << j; } + // The activation of features::kPermissionQuietChip affects the order in + // which permission_request_manager->Requests() stores the request in to + // FILO. + base::ranges::reverse(sub_request_origins); url::Origin origin; ASSERT_TRUE(brave_wallet::GetConcatOriginFromWalletAddresses( @@ -231,6 +236,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestPermissions) { EXPECT_TRUE(!observer->IsShowingBubble()) << "case: " << i; EXPECT_TRUE(IsPendingGroupedRequestsEmpty(cases[i].type)) << "case: " << i; + // Reversing back sub_request_origins to its original ordering. + base::ranges::reverse(sub_request_origins); for (size_t j = 0; j < addresses.size(); ++j) { EXPECT_EQ(host_content_settings_map()->GetContentSetting( sub_request_origins[j].GetURL(), @@ -275,6 +282,10 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, &sub_request_origins[j])) << "case: " << i << ", address: " << j; } + // The activation of features::kPermissionQuietChip affects the order in + // which permission_request_manager->Requests() stores the request in to + // FILO. + base::ranges::reverse(sub_request_origins); url::Origin origin; ASSERT_TRUE(brave_wallet::GetConcatOriginFromWalletAddresses(