Commit 39452545 authored by Ian Clelland's avatar Ian Clelland Committed by Commit Bot

Revert "Add ArcAppModelBuilderTest.IconLoaderCompressed"

This reverts commit 31276982.

Reason for revert: The test is crashing periodically on ChromeOS builders -- see failures at
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/28853
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/28862
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/28864
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/28873

Original change's description:
> Add ArcAppModelBuilderTest.IconLoaderCompressed
> 
> BUG=826982
> 
> Change-Id: I29f5c1ea49d6c47dd324760b440daa5637fbcb53
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1772851
> Commit-Queue: Nigel Tao <nigeltao@chromium.org>
> Reviewed-by: Yury Khmel <khmel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#693015}

TBR=khmel@chromium.org,nigeltao@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 826982
Change-Id: Ifd2652eef6ba9b97a08abc8094fa78fe40d0bab9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786929Reviewed-by: default avatarIan Clelland <iclelland@chromium.org>
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693717}
parent 08baa875
......@@ -20,11 +20,9 @@
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/task_runner_util.h"
#include "base/test/bind_test_util.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_command_line.h"
#include "base/values.h"
#include "chrome/browser/apps/app_service/arc_icon_once_loader.h"
#include "chrome/browser/chromeos/arc/arc_optin_uma.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/arc/arc_support_host.h"
......@@ -2058,40 +2056,6 @@ TEST_P(ArcAppModelBuilderTest, IconLoader) {
EXPECT_EQ(1 + scale_factors.size(), delegate.update_image_count());
}
TEST_P(ArcAppModelBuilderTest, IconLoaderCompressed) {
const arc::mojom::AppInfo& app = fake_apps()[0];
const std::string app_id = ArcAppTest::GetAppId(app);
const int icon_size =
app_list::AppListConfig::instance().grid_icon_dimension();
const std::vector<ui::ScaleFactor>& scale_factors =
ui::GetSupportedScaleFactors();
size_t num_compressed_images_seen = 0;
app_instance()->SendRefreshAppList(std::vector<arc::mojom::AppInfo>(
fake_apps().begin(), fake_apps().begin() + 1));
apps::ArcIconOnceLoader once_loader(profile());
once_loader.LoadIcon(
app_id, icon_size, apps::mojom::IconCompression::kCompressed,
base::BindLambdaForTesting([&](ArcAppIcon* icon) {
const std::map<ui::ScaleFactor, std::string>& compressed_images =
icon->compressed_images();
for (auto& scale_factor : scale_factors) {
auto iter = compressed_images.find(scale_factor);
if (iter != compressed_images.end()) {
num_compressed_images_seen++;
const std::string& compressed = iter->second;
// Check that |compressed| starts with the 8-byte PNG magic string.
EXPECT_EQ(compressed.substr(0, 8),
"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a");
}
}
}));
base::RunLoop().RunUntilIdle();
EXPECT_EQ(num_compressed_images_seen, scale_factors.size());
}
TEST_P(ArcAppModelIconTest, IconInvalidation) {
ArcAppListPrefs* const prefs = ArcAppListPrefs::Get(profile_.get());
ASSERT_TRUE(prefs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment