chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc - Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

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/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc

Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 7 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/manifest_tests/extension_manifests_homepage_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 aac886009b81587ceca585033a3b8c758fc71365..d014a851f890cfa27cf49ec8d6e6225ce8df3786 100644

--- a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc

+++ b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc

@@ -18,7 +18,7 @@ class IconsManifestTest : public ExtensionManifestTest {

TEST_F(IconsManifestTest, NormalizeIconPaths) {

scoped_refptr<extensions::Extension> extension(

LoadAndExpectSuccess("normalize_icon_paths.json"));

- const ExtensionIconSet& icons = IconsInfo::GetIcons(extension);

+ const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());

EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,

ExtensionIconSet::MATCH_EXACTLY));

@@ -29,14 +29,15 @@ TEST_F(IconsManifestTest, NormalizeIconPaths) {

TEST_F(IconsManifestTest, InvalidIconSizes) {

scoped_refptr<extensions::Extension> extension(

LoadAndExpectSuccess("init_ignored_icon_size.json"));

- EXPECT_EQ("", IconsInfo::GetIcons(extension).Get(

- 300, ExtensionIconSet::MATCH_EXACTLY));

+ EXPECT_EQ("",

+ IconsInfo::GetIcons(extension.get())

+ .Get(300, ExtensionIconSet::MATCH_EXACTLY));

}

TEST_F(IconsManifestTest, ValidIconSizes) {

scoped_refptr<extensions::Extension> extension(

LoadAndExpectSuccess("init_valid_icon_size.json"));

- const ExtensionIconSet& icons = IconsInfo::GetIcons(extension);

+ const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());

EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,

ExtensionIconSet::MATCH_EXACTLY));