Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6208)

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc

Issue 1554583002: Revert of Change extension icon load errors to warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge issues Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc
index 0a7a41fea557ae8485bd778a64551b6e1ecc35c7..e73ba823478fb0c6401177737b569f1e4a470696 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc
@@ -15,22 +15,9 @@ namespace extensions {
class IconsManifestTest : public ChromeManifestTest {
};
-// Icons that don't exist on disk should be ignored (for most manifest
-// locations).
-TEST_F(IconsManifestTest, IgnoreNonExistentIcons) {
- scoped_refptr<extensions::Extension> extension(
- LoadAndExpectSuccess("normalize_icon_paths.json", Manifest::INTERNAL));
- const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
-
- EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
- ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
- ExtensionIconSet::MATCH_EXACTLY));
-}
-
TEST_F(IconsManifestTest, NormalizeIconPaths) {
scoped_refptr<extensions::Extension> extension(
- LoadAndExpectSuccess("normalize_icon_paths.json", Manifest::UNPACKED));
+ LoadAndExpectSuccess("normalize_icon_paths.json"));
const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
@@ -41,7 +28,7 @@ TEST_F(IconsManifestTest, NormalizeIconPaths) {
TEST_F(IconsManifestTest, IconSizes) {
scoped_refptr<extensions::Extension> extension(
- LoadAndExpectSuccess("init_icon_size.json", Manifest::UNPACKED));
+ LoadAndExpectSuccess("init_icon_size.json"));
const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,

Powered by Google App Engine
This is Rietveld 408576698