Skip to content

Commit

Permalink
CodeHealth: Use return values not "out params" in web_app_icon_unittest
Browse files Browse the repository at this point in the history 
No functional changes.

Change-Id: Ieb3c8d79d6739b3fa91b1013aac976063a0d78a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4568250
Commit-Queue: Glen Robertson <glenrob@chromium.org>
Auto-Submit: Glen Robertson <glenrob@chromium.org>
Reviewed-by: Maggie Cai <mxcai@chromium.org>
Quick-Run: Glen Robertson <glenrob@chromium.org>
Commit-Queue: Maggie Cai <mxcai@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1150410}
  • Loading branch information
Glen Robertson authored and Chromium LUCI CQ committed May 30, 2023
1 parent 2aed0b6 commit c992706
Showing 1 changed file with 80 additions and 99 deletions.
179 changes: 80 additions & 99 deletions chrome/browser/apps/app_service/app_icon/web_app_icon_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,17 @@ class WebAppIconFactoryTest : public testing::Test {
EXPECT_TRUE(success);
}

void GenerateWebAppIcon(const std::string& app_id,
IconPurpose purpose,
const std::vector<int>& sizes_px,
apps::ScaleToSize scale_to_size_in_px,
gfx::ImageSkia& output_image_skia,
bool skip_icon_effects = false) {
gfx::ImageSkia GenerateWebAppIcon(const std::string& app_id,
IconPurpose purpose,
const std::vector<int>& sizes_px,
apps::ScaleToSize scale_to_size_in_px,
bool skip_icon_effects = false) {
base::test::TestFuture<std::map<SquareSizePx, SkBitmap>> future;
icon_manager().ReadIcons(app_id, purpose, sizes_px, future.GetCallback());
auto icon_bitmaps = future.Take();

gfx::ImageSkia output_image_skia;

for (auto [scale, size_in_px] : scale_to_size_in_px) {
int icon_size_in_px =
gfx::ScaleToFlooredSize(gfx::Size(kSizeInDip, kSizeInDip), scale)
Expand Down Expand Up @@ -178,16 +179,17 @@ class WebAppIconFactoryTest : public testing::Test {
}

EnsureRepresentationsLoaded(output_image_skia);

return output_image_skia;
}

void GenerateWebAppCompressedIcon(const std::string& app_id,
IconPurpose purpose,
const std::vector<int>& sizes_px,
apps::ScaleToSize scale_to_size_in_px,
std::vector<uint8_t>& result) {
gfx::ImageSkia image_skia;
GenerateWebAppIcon(app_id, purpose, sizes_px, scale_to_size_in_px,
image_skia);
gfx::ImageSkia image_skia =
GenerateWebAppIcon(app_id, purpose, sizes_px, scale_to_size_in_px);

const float scale = 1.0;
const gfx::ImageSkiaRep& image_skia_rep =
Expand All @@ -207,9 +209,9 @@ class WebAppIconFactoryTest : public testing::Test {
apps::ScaleToSize scale_to_size_in_px,
float scale,
std::vector<uint8_t>& result) {
gfx::ImageSkia image_skia;
GenerateWebAppIcon(app_id, purpose, sizes_px, scale_to_size_in_px,
image_skia, /*skip_icon_effects=*/true);
gfx::ImageSkia image_skia =
GenerateWebAppIcon(app_id, purpose, sizes_px, scale_to_size_in_px,
/*skip_icon_effects=*/true);

if (icon_effects != apps::IconEffects::kNone) {
base::test::TestFuture<apps::IconValuePtr> iv_with_icon_effects;
Expand All @@ -231,15 +233,14 @@ class WebAppIconFactoryTest : public testing::Test {
&result));
}

void LoadIconFromWebApp(const std::string& app_id,
apps::IconEffects icon_effects,
gfx::ImageSkia& output_image_skia) {
gfx::ImageSkia LoadIconFromWebApp(const std::string& app_id,
apps::IconEffects icon_effects) {
base::test::TestFuture<apps::IconValuePtr> future;
apps::LoadIconFromWebApp(profile(), apps::IconType::kStandard, kSizeInDip,
app_id, icon_effects, future.GetCallback());
auto icon = future.Take();
output_image_skia = icon->uncompressed;
EnsureRepresentationsLoaded(output_image_skia);
EnsureRepresentationsLoaded(icon->uncompressed);
return icon->uncompressed;
}

apps::IconValuePtr LoadCompressedIconBlockingFromWebApp(
Expand Down Expand Up @@ -295,18 +296,17 @@ TEST_F(WebAppIconFactoryTest, LoadNonMaskableIcon) {

ASSERT_TRUE(icon_manager().HasIcons(app_id, IconPurpose::ANY, sizes_px));

gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px,
{{1.0, kIconSize1}, {2.0, kIconSize2}}, src_image_skia);
gfx::ImageSkia src_image_skia =
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px,
{{1.0, kIconSize1}, {2.0, kIconSize2}});

gfx::ImageSkia dst_image_skia;
apps::IconEffects icon_effect = apps::IconEffects::kRoundCorners;

icon_effect |= apps::IconEffects::kCrOsStandardIcon;

LoadIconFromWebApp(app_id, icon_effect, dst_image_skia);
gfx::ImageSkia dst = LoadIconFromWebApp(app_id, icon_effect);

VerifyIcon(src_image_skia, dst_image_skia);
VerifyIcon(src_image_skia, dst);
}

TEST_F(WebAppIconFactoryTest, LoadNonMaskableNonEffectCompressedIcon) {
Expand Down Expand Up @@ -406,21 +406,18 @@ TEST_F(WebAppIconFactoryTest, LoadMaskableIcon) {

RegisterApp(std::move(web_app));

gfx::ImageSkia src_image_skia;
gfx::ImageSkia dst_image_skia;

ASSERT_TRUE(
icon_manager().HasIcons(app_id, IconPurpose::MASKABLE, {kIconSize2}));

GenerateWebAppIcon(app_id, IconPurpose::MASKABLE, {kIconSize2},
{{1.0, kIconSize2}, {2.0, kIconSize2}}, src_image_skia);
gfx::ImageSkia src_image_skia =
GenerateWebAppIcon(app_id, IconPurpose::MASKABLE, {kIconSize2},
{{1.0, kIconSize2}, {2.0, kIconSize2}});

LoadIconFromWebApp(app_id,
apps::IconEffects::kRoundCorners |
apps::IconEffects::kCrOsStandardBackground |
apps::IconEffects::kCrOsStandardMask,
dst_image_skia);
VerifyIcon(src_image_skia, dst_image_skia);
gfx::ImageSkia dst = LoadIconFromWebApp(
app_id, apps::IconEffects::kRoundCorners |
apps::IconEffects::kCrOsStandardBackground |
apps::IconEffects::kCrOsStandardMask);
VerifyIcon(src_image_skia, dst);
}

TEST_F(WebAppIconFactoryTest, LoadMaskableCompressedIcon) {
Expand Down Expand Up @@ -475,18 +472,17 @@ TEST_F(WebAppIconFactoryTest, LoadNonMaskableIconWithMaskableIcon) {

ASSERT_TRUE(icon_manager().HasIcons(app_id, IconPurpose::ANY, {kIconSize2}));

gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::ANY, {kIconSize2},
{{1.0, kIconSize2}, {2.0, kIconSize2}}, src_image_skia);
gfx::ImageSkia src_image_skia =
GenerateWebAppIcon(app_id, IconPurpose::ANY, {kIconSize2},
{{1.0, kIconSize2}, {2.0, kIconSize2}});

gfx::ImageSkia dst_image_skia;
apps::IconEffects icon_effect = apps::IconEffects::kRoundCorners;

icon_effect |= apps::IconEffects::kCrOsStandardIcon;

LoadIconFromWebApp(app_id, icon_effect, dst_image_skia);
gfx::ImageSkia dst = LoadIconFromWebApp(app_id, icon_effect);

VerifyIcon(src_image_skia, dst_image_skia);
VerifyIcon(src_image_skia, dst);
}

TEST_F(WebAppIconFactoryTest, LoadSmallMaskableIcon) {
Expand All @@ -507,18 +503,16 @@ TEST_F(WebAppIconFactoryTest, LoadSmallMaskableIcon) {

ASSERT_TRUE(icon_manager().HasIcons(app_id, IconPurpose::MASKABLE, sizes_px));

gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::MASKABLE, sizes_px,
{{1.0, kIconSize1}, {2.0, kIconSize1}}, src_image_skia);
gfx::ImageSkia src_image_skia =
GenerateWebAppIcon(app_id, IconPurpose::MASKABLE, sizes_px,
{{1.0, kIconSize1}, {2.0, kIconSize1}});

gfx::ImageSkia dst_image_skia;
LoadIconFromWebApp(app_id,
apps::IconEffects::kRoundCorners |
apps::IconEffects::kCrOsStandardBackground |
apps::IconEffects::kCrOsStandardMask,
dst_image_skia);
gfx::ImageSkia dst = LoadIconFromWebApp(
app_id, apps::IconEffects::kRoundCorners |
apps::IconEffects::kCrOsStandardBackground |
apps::IconEffects::kCrOsStandardMask);

VerifyIcon(src_image_skia, dst_image_skia);
VerifyIcon(src_image_skia, dst);
}

TEST_F(WebAppIconFactoryTest, LoadExactSizeIcon) {
Expand All @@ -541,18 +535,17 @@ TEST_F(WebAppIconFactoryTest, LoadExactSizeIcon) {

ASSERT_TRUE(icon_manager().HasIcons(app_id, IconPurpose::ANY, sizes_px));

gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px,
{{1.0, kIconSize2}, {2.0, kIconSize4}}, src_image_skia);
gfx::ImageSkia src_image_skia =
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px,
{{1.0, kIconSize2}, {2.0, kIconSize4}});

gfx::ImageSkia dst_image_skia;
apps::IconEffects icon_effect = apps::IconEffects::kRoundCorners;

icon_effect |= apps::IconEffects::kCrOsStandardIcon;

LoadIconFromWebApp(app_id, icon_effect, dst_image_skia);
gfx::ImageSkia dst = LoadIconFromWebApp(app_id, icon_effect);

VerifyIcon(src_image_skia, dst_image_skia);
VerifyIcon(src_image_skia, dst);
}

TEST_F(WebAppIconFactoryTest, LoadIconFailed) {
Expand All @@ -575,13 +568,11 @@ TEST_F(WebAppIconFactoryTest, LoadIconFailed) {
gfx::ImageSkia src_image_skia;
LoadDefaultIcon(src_image_skia);

gfx::ImageSkia dst_image_skia;
LoadIconFromWebApp(
app_id,
apps::IconEffects::kRoundCorners | apps::IconEffects::kCrOsStandardIcon,
dst_image_skia);
gfx::ImageSkia dst =
LoadIconFromWebApp(app_id, apps::IconEffects::kRoundCorners |
apps::IconEffects::kCrOsStandardIcon);

VerifyIcon(src_image_skia, dst_image_skia);
VerifyIcon(src_image_skia, dst);
}

#if BUILDFLAG(IS_CHROMEOS_ASH)
Expand Down Expand Up @@ -1172,9 +1163,8 @@ TEST_F(AppServiceWebAppIconTest, GetNonMaskableStandardIconData) {

apps::ScaleToSize scale_to_size_in_px = {{1.0, kIconSize1},
{2.0, kIconSize2}};
gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia);
gfx::ImageSkia src_image_skia = GenerateWebAppIcon(
app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px);

// Verify the icon reading and writing function in AppService for the
// kStandard icon.
Expand Down Expand Up @@ -1231,9 +1221,9 @@ TEST_F(AppServiceWebAppIconTest,
VerifyCompressedIcon(
src_data, *LoadIconFromIconKey(app_id, icon_key, IconType::kCompressed));

gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia, /*skip_icon_effects=*/true);
gfx::ImageSkia src_image_skia = GenerateWebAppIcon(
app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
/*skip_icon_effects=*/true);

// Verify the icon reading and writing function in AppService for the
// kUncompressed icon.
Expand Down Expand Up @@ -1266,9 +1256,8 @@ TEST_F(AppServiceWebAppIconTest,

apps::ScaleToSize scale_to_size_in_px = {{1.0, kIconSize1},
{2.0, kIconSize2}};
gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia);
gfx::ImageSkia src_image_skia = GenerateWebAppIcon(
app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px);

// Verify the icon reading and writing function in AppService for the
// kStandard icon.
Expand Down Expand Up @@ -1337,9 +1326,9 @@ TEST_F(AppServiceWebAppIconTest,

VerifyCompressedIcon(src_data, *LoadIcon(app_id, IconType::kCompressed));

gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia, /*skip_icon_effects=*/true);
gfx::ImageSkia src_image_skia = GenerateWebAppIcon(
app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
/*skip_icon_effects=*/true);

// Verify the icon reading and writing function in AppService for the
// kUncompressed icon.
Expand Down Expand Up @@ -1379,10 +1368,9 @@ TEST_F(AppServiceWebAppIconTest, GetMaskableCompressedIcon) {

VerifyCompressedIcon(src_data, *LoadIcon(app_id, IconType::kCompressed));

gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::MASKABLE, {kIconSize2},
scale_to_size_in_px, src_image_skia,
/*skip_icon_effects=*/true);
gfx::ImageSkia src_image_skia = GenerateWebAppIcon(
app_id, IconPurpose::MASKABLE, {kIconSize2}, scale_to_size_in_px,
/*skip_icon_effects=*/true);

// Verify the icon reading and writing function in AppService for the
// kUncompressed icon.
Expand Down Expand Up @@ -1415,9 +1403,8 @@ TEST_F(AppServiceWebAppIconTest, GetMaskableStandardIcon) {

apps::ScaleToSize scale_to_size_in_px = {{1.0, kIconSize2},
{2.0, kIconSize2}};
gfx::ImageSkia src_image_skia;
GenerateWebAppIcon(app_id, IconPurpose::MASKABLE, {kIconSize2},
scale_to_size_in_px, src_image_skia);
gfx::ImageSkia src_image_skia = GenerateWebAppIcon(
app_id, IconPurpose::MASKABLE, {kIconSize2}, scale_to_size_in_px);

// Verify the icon reading and writing function in AppService for the
// kStandard icon.
Expand Down Expand Up @@ -1456,9 +1443,8 @@ TEST_F(AppServiceWebAppIconTest, IconUpdate) {

apps::ScaleToSize scale_to_size_in_px = {{1.0, kIconSize1},
{2.0, kIconSize2}};
gfx::ImageSkia src_image_skia1;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia1);
gfx::ImageSkia src_image_skia1 = GenerateWebAppIcon(
app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px);

// Load the kStandard icon to generate the icon file in the AppService
// directory.
Expand All @@ -1474,9 +1460,8 @@ TEST_F(AppServiceWebAppIconTest, IconUpdate) {
// Update the icon
const std::vector<SkColor> colors2{SK_ColorRED, SK_ColorBLUE};
WriteIcons(app_id, {IconPurpose::ANY}, sizes_px, colors2);
gfx::ImageSkia src_image_skia2;
GenerateWebAppIcon(app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia2);
gfx::ImageSkia src_image_skia2 = GenerateWebAppIcon(
app_id, IconPurpose::ANY, sizes_px, scale_to_size_in_px);

UpdateIcon(app_id, icon_key);

Expand Down Expand Up @@ -1519,12 +1504,10 @@ TEST_F(AppServiceWebAppIconTest, IconLoadingForReinstallApps) {

apps::ScaleToSize scale_to_size_in_px = {{1.0, kIconSize1},
{2.0, kIconSize2}};
gfx::ImageSkia src_image_skia1;
GenerateWebAppIcon(app_id1, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia1);
gfx::ImageSkia src_image_skia2;
GenerateWebAppIcon(app_id2, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia2);
gfx::ImageSkia src_image_skia1 = GenerateWebAppIcon(
app_id1, IconPurpose::ANY, sizes_px, scale_to_size_in_px);
gfx::ImageSkia src_image_skia2 = GenerateWebAppIcon(
app_id2, IconPurpose::ANY, sizes_px, scale_to_size_in_px);

// Load the kStandard icon to generate the icon files in the AppService
// directory.
Expand All @@ -1546,12 +1529,10 @@ TEST_F(AppServiceWebAppIconTest, IconLoadingForReinstallApps) {
WriteIcons(app_id1, {IconPurpose::ANY}, sizes_px, colors3);
WriteIcons(app_id2, {IconPurpose::ANY}, sizes_px, colors4);

gfx::ImageSkia src_image_skia3;
GenerateWebAppIcon(app_id1, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia3);
gfx::ImageSkia src_image_skia4;
GenerateWebAppIcon(app_id2, IconPurpose::ANY, sizes_px, scale_to_size_in_px,
src_image_skia4);
gfx::ImageSkia src_image_skia3 = GenerateWebAppIcon(
app_id1, IconPurpose::ANY, sizes_px, scale_to_size_in_px);
gfx::ImageSkia src_image_skia4 = GenerateWebAppIcon(
app_id2, IconPurpose::ANY, sizes_px, scale_to_size_in_px);

// Uninstall and reinstall apps
ReinstallApps({app_id1, app_id2});
Expand Down

0 comments on commit c992706

Please sign in to comment.