diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 20:55:50 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 20:55:50 +0000 |
| commit | 702d8b462fceaf9613a42e66c5464abfcf3e2550 (patch) | |
| tree | f12c4f8d8eb715a80b273d252085aa93308c70e6 /chrome/browser/extensions/convert_web_app_unittest.cc | |
| parent | f19144dba4ac3b6ecf36dc1debefbcefe10ac5bb (diff) | |
| download | chromium_src-702d8b462fceaf9613a42e66c5464abfcf3e2550.zip chromium_src-702d8b462fceaf9613a42e66c5464abfcf3e2550.tar.gz chromium_src-702d8b462fceaf9613a42e66c5464abfcf3e2550.tar.bz2 | |
Move Icons out of Extension class
BUG=159265
TBR=davemoore@chromium.org, atwilson@chromium.org, dalecurtis@chromium.org
(davemoore - c/b/chromeos, atwilson - c/b/background, dalecurtis - c/b/media)
Review URL: https://chromiumcodereview.appspot.com/11786003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/convert_web_app_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/convert_web_app_unittest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 8b9e0c5..b915c25 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -16,6 +16,7 @@ #include "base/utf_string_conversions.h" #include "base/version.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_icon_set.h" #include "chrome/common/extensions/extension_resource.h" @@ -137,13 +138,13 @@ TEST(ExtensionFromWebApp, Basic) { EXPECT_EQ("http://aaronboodman.com/gearpad/*", extension->web_extent().patterns().begin()->GetAsString()); - EXPECT_EQ(web_app.icons.size(), extension->icons().map().size()); + EXPECT_EQ(web_app.icons.size(), IconsInfo::GetIcons(extension).map().size()); for (size_t i = 0; i < web_app.icons.size(); ++i) { EXPECT_EQ(StringPrintf("icons/%i.png", web_app.icons[i].width), - extension->icons().Get(web_app.icons[i].width, - ExtensionIconSet::MATCH_EXACTLY)); - ExtensionResource resource = extension->GetIconResource( - web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY); + IconsInfo::GetIcons(extension).Get( + web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY)); + ExtensionResource resource = IconsInfo::GetIconResource( + extension, web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY); ASSERT_TRUE(!resource.empty()); EXPECT_TRUE(file_util::PathExists(resource.GetFilePath())); } @@ -177,7 +178,7 @@ TEST(ExtensionFromWebApp, Minimal) { EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name()); EXPECT_EQ("", extension->description()); EXPECT_EQ(web_app.app_url, extension->GetFullLaunchURL()); - EXPECT_EQ(0u, extension->icons().map().size()); + EXPECT_EQ(0u, IconsInfo::GetIcons(extension).map().size()); EXPECT_EQ(0u, extension->GetActivePermissions()->apis().size()); ASSERT_EQ(1u, extension->web_extent().patterns().size()); EXPECT_EQ("*://aaronboodman.com/*", |