Sync bookmark app icon urls and sizes, and download icons for new apps.

chrome/browser/extensions/bookmark_app_helper_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
@@ skipping 79 matching lines @@
   icon_info.data = CreateSquareBitmapWithColor(size, color);
   return icon_info;
 }
 
 void ValidateWebApplicationInfo(base::Closure callback,
                                 const WebApplicationInfo& expected,
                                 const WebApplicationInfo& actual) {
   EXPECT_EQ(expected.title, actual.title);
   EXPECT_EQ(expected.description, actual.description);
   EXPECT_EQ(expected.app_url, actual.app_url);
-  EXPECT_EQ(expected.icons.size(), actual.icons.size());
-  for (size_t i = 0; i < expected.icons.size(); ++i) {
-    EXPECT_EQ(expected.icons[i].width, actual.icons[i].width);
-    EXPECT_EQ(expected.icons[i].height, actual.icons[i].height);
-    EXPECT_EQ(expected.icons[i].url, actual.icons[i].url);
-    EXPECT_TRUE(
-        gfx::BitmapsAreEqual(expected.icons[i].data, actual.icons[i].data));
-  }
+  // There should be 6 icons, as there are three sizes which need to be
+  // generated, and each will generate a 1x and 2x icon.
+  EXPECT_EQ(6u, actual.icons.size());
   callback.Run();
 }
 
 }  // namespace
 
 namespace extensions {

[calamity, 2015/04/28 06:56:35]

Where did this go?

 
 class TestBookmarkAppHelper : public BookmarkAppHelper {
  public:
   TestBookmarkAppHelper(ExtensionService* service,
                         WebApplicationInfo web_app_info,
                         content::WebContents* contents)
       : BookmarkAppHelper(service->profile(), web_app_info, contents) {}
 
   ~TestBookmarkAppHelper() override {}
 
@@ skipping 95 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(helper.extension());
   const Extension* extension =
       service_->GetInstalledExtension(helper.extension()->id());
   EXPECT_TRUE(extension);
   EXPECT_EQ(1u, registry()->enabled_extensions().size());
   EXPECT_TRUE(extension->from_bookmark());
   EXPECT_EQ(kAppTitle, extension->name());
   EXPECT_EQ(kAppDescription, extension->description());
   EXPECT_EQ(GURL(kAppUrl), AppLaunchInfo::GetLaunchWebURL(extension));
-  // The tiny icon should have been removed and only the generated ones used.
-  EXPECT_TRUE(
+  EXPECT_FALSE(
       IconsInfo::GetIconResource(extension, kIconSizeTiny,
                                  ExtensionIconSet::MATCH_EXACTLY).empty());
   EXPECT_FALSE(
       IconsInfo::GetIconResource(
           extension, kIconSizeSmall, ExtensionIconSet::MATCH_EXACTLY).empty());
   EXPECT_FALSE(
       IconsInfo::GetIconResource(extension,
                                  kIconSizeSmall * 2,
                                  ExtensionIconSet::MATCH_EXACTLY).empty());
   EXPECT_FALSE(
@@ skipping 37 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   {
     EXPECT_EQ(1u, registry()->enabled_extensions().size());
     const Extension* extension =
         registry()->enabled_extensions().begin()->get();
     EXPECT_TRUE(extension->from_bookmark());
     EXPECT_EQ(kAlternativeAppTitle, extension->name());
     EXPECT_EQ(kAppDescription, extension->description());
     EXPECT_EQ(GURL(kAppUrl), AppLaunchInfo::GetLaunchWebURL(extension));
-    EXPECT_TRUE(extensions::IconsInfo::GetIconResource(
-                    extension, kIconSizeSmall, ExtensionIconSet::MATCH_EXACTLY)
-                    .empty());
+    EXPECT_FALSE(extensions::IconsInfo::GetIconResource(
+                     extension, kIconSizeSmall, ExtensionIconSet::MATCH_EXACTLY)
+                     .empty());
     EXPECT_FALSE(extensions::IconsInfo::GetIconResource(
                      extension, kIconSizeLarge, ExtensionIconSet::MATCH_EXACTLY)
                      .empty());
   }
 }
 
 TEST_F(BookmarkAppHelperExtensionServiceTest, GetWebApplicationInfo) {
   WebApplicationInfo web_app_info;
   web_app_info.app_url = GURL(kAppUrl);
   web_app_info.title = base::UTF8ToUTF16(kAppTitle);
   web_app_info.description = base::UTF8ToUTF16(kAppDescription);
 
-  web_app_info.icons.push_back(
-      CreateIconInfoWithBitmap(kIconSizeSmall, SK_ColorRED));
-  web_app_info.icons.push_back(
-      CreateIconInfoWithBitmap(kIconSizeLarge, SK_ColorRED));
-
   extensions::CreateOrUpdateBookmarkApp(service_, &web_app_info);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(1u, registry()->enabled_extensions().size());
   base::RunLoop run_loop;
   extensions::GetWebApplicationInfoFromApp(
       profile_.get(), registry()->enabled_extensions().begin()->get(),
       base::Bind(&ValidateWebApplicationInfo, run_loop.QuitClosure(),
                  web_app_info));
   run_loop.Run();
@@ skipping 40 matching lines @@
 }
 
 TEST_F(BookmarkAppHelperTest, IsValidBookmarkAppUrl) {
   EXPECT_TRUE(IsValidBookmarkAppUrl(GURL("https://www.chromium.org")));
   EXPECT_TRUE(IsValidBookmarkAppUrl(GURL("http://www.chromium.org/path")));
   EXPECT_FALSE(IsValidBookmarkAppUrl(GURL("ftp://www.chromium.org")));
   EXPECT_FALSE(IsValidBookmarkAppUrl(GURL("chrome://flags")));
 }
 
 }  // namespace extensions