chrome/browser/extensions/extension_action_icon_factory_unittest.cc - Issue 882243002: [Extensions] Make extension actions use gfx::Image over gfx::ImageSkia.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_action_icon_factory_unittest.cc

Issue 882243002: [Extensions] Make extension actions use gfx::Image over gfx::ImageSkia. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 5 years, 11 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/browser/extensions/extension_action_icon_factory.cc ('k') | chrome/browser/extensions/extension_action_storage_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action_icon_factory_unittest.cc

diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc

index eb7d338575ed2b02cf20c8bd761b7509f1b4b914..4292ed419a0fef4ce8a034ea07710e606ab251b2 100644

--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc

+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc

@@ -190,7 +190,7 @@ TEST_F(ExtensionActionIconFactoryTest, NoIcons) {

ExtensionAction* browser_action = GetBrowserAction(*extension.get());

ASSERT_TRUE(browser_action);

ASSERT_FALSE(browser_action->default_icon());

- ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());

+ ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).IsEmpty());

gfx::ImageSkia favicon = GetFavicon();

@@ -216,14 +216,14 @@ TEST_F(ExtensionActionIconFactoryTest, AfterSetIcon) {

ExtensionAction* browser_action = GetBrowserAction(*extension.get());

ASSERT_TRUE(browser_action);

ASSERT_FALSE(browser_action->default_icon());

- ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());

+ ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).IsEmpty());

gfx::Image set_icon = LoadIcon("browser_action/no_icon/icon.png");

ASSERT_FALSE(set_icon.IsEmpty());

browser_action->SetIcon(0, set_icon);

- ASSERT_FALSE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());

+ ASSERT_FALSE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).IsEmpty());

ExtensionActionIconFactory icon_factory(

profile(), extension.get(), browser_action, this);

@@ -254,7 +254,7 @@ TEST_F(ExtensionActionIconFactoryTest, DefaultIcon) {

ExtensionAction* browser_action = GetBrowserAction(*extension.get());

ASSERT_TRUE(browser_action);

ASSERT_FALSE(browser_action->default_icon());

- ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());

+ ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).IsEmpty());

gfx::Image default_icon =

EnsureImageSize(LoadIcon("browser_action/no_icon/icon.png"), 19);