Allow arbitrary sizes for extension icons (and bookmark app icons)

chrome/browser/apps/drive/drive_app_converter_browsertest.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/apps/drive/drive_app_converter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 53 matching lines @@
     runner_->Run();
   }
 
   GURL GetTestUrl(const std::string& path) {
     return embedded_test_server()->base_url().Resolve(path);
   }
 
   drive::DriveAppInfo GetTestDriveApp() {
     // Define four icons. icon1.png is 16x16 and good to use. icon2.png is
     // 16x16 but claims to be 32x32 and should be dropped. icon3.png is 66x66
-    // and not a valid extension icon size and should be dropped too. The forth
-    // one is icon2.png with 16x16 but should be ignored because 16x16 already
-    // has icon1.png as its resource.
+    // and not a typical icon size but it should be allowed. The fourth one is
+    // icon2.png with 16x16 but should be ignored because 16x16 already has
+    // icon1.png as its resource.
     drive::DriveAppInfo::IconList app_icons;
     app_icons.push_back(std::make_pair(16, GetTestUrl("extensions/icon1.png")));
     app_icons.push_back(std::make_pair(32, GetTestUrl("extensions/icon2.png")));
     app_icons.push_back(std::make_pair(66, GetTestUrl("extensions/icon3.png")));
     app_icons.push_back(std::make_pair(16, GetTestUrl("extensions/icon2.png")));
 
     drive::DriveAppInfo::IconList document_icons;
 
     return drive::DriveAppInfo("fake_drive_app_id",
                                "fake_product_id",
@@ skipping 23 matching lines @@
 
   const Extension* app = converter()->extension();
   ASSERT_TRUE(app != NULL);
   EXPECT_EQ(kAppName, app->name());
   EXPECT_TRUE(app->is_hosted_app());
   EXPECT_TRUE(app->from_bookmark());
   EXPECT_EQ(GURL(kAppUrl), AppLaunchInfo::GetLaunchWebURL(app));
   EXPECT_EQ(extensions::LAUNCH_CONTAINER_TAB,
             AppLaunchInfo::GetLaunchContainer(app));
   EXPECT_EQ(0u, app->permissions_data()->active_permissions().apis().size());
-  EXPECT_EQ(1u, extensions::IconsInfo::GetIcons(app).map().size());
+  const ExtensionIconSet& icons = extensions::IconsInfo::GetIcons(app);
+  EXPECT_EQ(2u, icons.map().size());
+  EXPECT_FALSE(icons.Get(16, ExtensionIconSet::MATCH_EXACTLY).empty());
+  EXPECT_TRUE(icons.Get(32, ExtensionIconSet::MATCH_EXACTLY).empty());
+  EXPECT_FALSE(icons.Get(66, ExtensionIconSet::MATCH_EXACTLY).empty());
 
   const Extension* installed = extensions::ExtensionSystem::Get(profile())
                                    ->extension_service()
                                    ->GetInstalledExtension(app->id());
   EXPECT_EQ(app, installed);
   EXPECT_FALSE(extensions::util::ShouldSync(app, profile()));
 }
 
 IN_PROC_BROWSER_TEST_F(DriveAppConverterTest, BadApp) {
   drive::DriveAppInfo no_name = GetTestDriveApp();
@@ skipping 19 matching lines @@
   InstallAndWaitFinish(GetTestDriveApp());
   const Extension* second_install = converter()->extension();
   ASSERT_TRUE(second_install != NULL);
   EXPECT_FALSE(converter()->is_new_install());
 
   // Two different app instances.
   ASSERT_NE(first_install, second_install);
   EXPECT_EQ(first_install_id, second_install->id());
   EXPECT_GE(second_install->version()->CompareTo(first_install_version), 0);
 }