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

Unified Diff: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

Issue 1537473003: Change extension icon load errors to warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: conciser 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/browser/extensions/api/extension_action/browser_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 5a174cefa470c36c6310476a5ac1d5f5ccdafe29..48c1d4f72358c33218969f64144b764fdfcf4931 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -331,6 +331,28 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
EXPECT_EQ(kEmptyPathError, catcher.message());
}
+IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MultiIcons) {
Devlin 2015/12/17 17:23:08 Can this be a unittest?
Evan Stade 2015/12/17 20:15:58 There already is a unit test that does almost exac
Devlin 2015/12/17 22:05:58 This should be doable with a "unittest" (here basi
Evan Stade 2015/12/17 22:56:06 thanks for the pointer. Done.
+ ASSERT_TRUE(
+ RunExtensionTestIgnoreManifestWarnings("browser_action/multi_icons"))
+ << message_;
+ const Extension* extension = GetSingleLoadedExtension();
+ ASSERT_TRUE(extension) << message_;
+
+ EXPECT_EQ(0U, extension->install_warnings().size());
+ const ActionInfo* browser_action_info =
+ ActionInfo::GetBrowserActionInfo(extension);
+ ASSERT_TRUE(browser_action_info);
+ ASSERT_FALSE(browser_action_info->default_icon.empty());
+
+ const ExtensionIconSet& icons = browser_action_info->default_icon;
+
+ // 24px icon should be included.
+ EXPECT_EQ(3u, icons.map().size());
+ EXPECT_EQ("icon19.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY));
+ EXPECT_EQ("icon24.png", icons.Get(24, ExtensionIconSet::MATCH_EXACTLY));
+ EXPECT_EQ("icon38.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY));
+}
+
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
message_;

Powered by Google App Engine
This is Rietveld 408576698