chrome/browser/extensions/extension_icon_image_unittest.cc - Issue 11786003: Move Icons out of Extension class

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_icon_image_unittest.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action

Patch Set: Created 7 years, 10 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_browsertest.cc ('k') | chrome/browser/extensions/extension_icon_manager.cc » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_icon_image_unittest.cc

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

index 112a7bc8c507c09141428d95c05ed020bf03243e..f5cc1e6f36df0a8789d358db0ab201f064c03f72 100644

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

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

@@ -9,6 +9,7 @@

#include "base/path_service.h"

#include "chrome/browser/extensions/image_loader.h"

#include "chrome/common/chrome_paths.h"

+#include "chrome/common/extensions/api/icons/icons_handler.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/manifest.h"

@@ -228,7 +229,10 @@ TEST_F(ExtensionIconImageTest, Basic) {

GetTestBitmap(extension, "48.png", 32);

ASSERT_FALSE(bitmap_48_resized_to_32.empty());

- IconImage image(profile.get(), extension, extension->icons(), 16,

+ IconImage image(profile.get(),

+ extension,

+ extensions::IconsInfo::GetIcons(extension),

+ 16,

default_icon, this);

// No representations in |image_| yet.

@@ -290,7 +294,10 @@ TEST_F(ExtensionIconImageTest, FallbackToSmallerWhenNoBigger) {

GetTestBitmap(extension, "48.png", 48);

ASSERT_FALSE(bitmap_48.empty());

- IconImage image(profile.get(), extension, extension->icons(), 32,

+ IconImage image(profile.get(),

+ extension,

+ extensions::IconsInfo::GetIcons(extension),

+ 32,

default_icon, this);

gfx::ImageSkiaRep representation =

@@ -327,7 +334,10 @@ TEST_F(ExtensionIconImageTest, FallbackToSmaller) {

GetTestBitmap(extension, "16.png", 16);

ASSERT_FALSE(bitmap_16.empty());

- IconImage image(profile.get(), extension, extension->icons(), 17,

+ IconImage image(profile.get(),

+ extension,

+ extensions::IconsInfo::GetIcons(extension),

+ 17,

default_icon, this);

gfx::ImageSkiaRep representation =

@@ -511,7 +521,10 @@ TEST_F(ExtensionIconImageTest, IconImageDestruction) {

ASSERT_FALSE(bitmap_16.empty());

scoped_ptr<IconImage> image(

- new IconImage(profile.get(), extension, extension->icons(), 16,

+ new IconImage(profile.get(),

+ extension,

+ extensions::IconsInfo::GetIcons(extension),

+ 16,

default_icon, this));

// Load an image representation.