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

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

Issue 16295003: 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/browser/extensions/convert_web_app.cc ('k') | chrome/browser/extensions/crx_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/convert_web_app_unittest.cc
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc
index c2e56dc04a28ae39ff24e83e133def9d9870e20b..dba15f8b12ff549b0aa728d178c736b4b9571e3e 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -138,13 +138,16 @@ TEST(ExtensionFromWebApp, Basic) {
EXPECT_EQ("http://aaronboodman.com/gearpad/*",
extension->web_extent().patterns().begin()->GetAsString());
- EXPECT_EQ(web_app.icons.size(), IconsInfo::GetIcons(extension).map().size());
+ EXPECT_EQ(web_app.icons.size(),
+ IconsInfo::GetIcons(extension.get()).map().size());
for (size_t i = 0; i < web_app.icons.size(); ++i) {
EXPECT_EQ(base::StringPrintf("icons/%i.png", web_app.icons[i].width),
- IconsInfo::GetIcons(extension).Get(
+ IconsInfo::GetIcons(extension.get()).Get(
web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY));
- ExtensionResource resource = IconsInfo::GetIconResource(
- extension, web_app.icons[i].width, ExtensionIconSet::MATCH_EXACTLY);
+ ExtensionResource resource =
+ IconsInfo::GetIconResource(extension.get(),
+ web_app.icons[i].width,
+ ExtensionIconSet::MATCH_EXACTLY);
ASSERT_TRUE(!resource.empty());
EXPECT_TRUE(file_util::PathExists(resource.GetFilePath()));
}
@@ -178,7 +181,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, IconsInfo::GetIcons(extension).map().size());
+ EXPECT_EQ(0u, IconsInfo::GetIcons(extension.get()).map().size());
EXPECT_EQ(0u, extension->GetActivePermissions()->apis().size());
ASSERT_EQ(1u, extension->web_extent().patterns().size());
EXPECT_EQ("*://aaronboodman.com/*",
« no previous file with comments | « chrome/browser/extensions/convert_web_app.cc ('k') | chrome/browser/extensions/crx_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698