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

Unified Diff: chrome/common/extensions/extension_action_unittest.cc

Issue 10855090: extensions: Fix crash on empty extension action icons (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase more Created 8 years, 4 months 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
« no previous file with comments | « chrome/common/extensions/extension_action.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_action_unittest.cc
diff --git a/chrome/common/extensions/extension_action_unittest.cc b/chrome/common/extensions/extension_action_unittest.cc
index 9cf8ed86ca31ca426e7f507b504d62df7dc91fc7..8b8054817115b06f32f339cbd5d0a2b34713cce6 100644
--- a/chrome/common/extensions/extension_action_unittest.cc
+++ b/chrome/common/extensions/extension_action_unittest.cc
@@ -77,11 +77,11 @@ TEST_F(ExtensionActionTest, Icon) {
action.CacheIcon("the_default.png", icon2);
ASSERT_TRUE(ImagesAreEqual(icon2, action.GetIcon(1)));
- action.SetIcon(ExtensionAction::kDefaultTabId, *icon1.ToSkBitmap());
+ action.SetIcon(ExtensionAction::kDefaultTabId, icon1);
ASSERT_TRUE(ImagesAreEqual(icon1, action.GetIcon(100)))
<< "SetIcon(kDefaultTabId) overrides the default_icon_path.";
- action.SetIcon(100, *icon2.ToSkBitmap());
+ action.SetIcon(100, icon2);
ASSERT_TRUE(ImagesAreEqual(icon1, action.GetIcon(1)));
ASSERT_TRUE(ImagesAreEqual(icon2, action.GetIcon(100)));
}
« no previous file with comments | « chrome/common/extensions/extension_action.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698