manifest: allow the icon downloader to choose non-square icons

chrome/browser/manifest/manifest_icon_downloader_unittest.cc

 // Copyright 2015 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/manifest/manifest_icon_downloader.h"
 
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 95 matching lines @@
 
 TEST_F(ManifestIconDownloaderTest, MixedCanReturnMiddle) {
   std::vector<SkBitmap> bitmaps;
   bitmaps.push_back(CreateDummyBitmap(10, 10));
   bitmaps.push_back(CreateDummyBitmap(8, 8));
   bitmaps.push_back(CreateDummyBitmap(6, 6));
 
   ASSERT_EQ(1, FindBitmap(7, 0, bitmaps));
 }
 
-TEST_F(ManifestIconDownloaderTest, NonSquareIsIgnored) {
+TEST_F(ManifestIconDownloaderTest, SquareIsPickedOverNonSquare) {
   std::vector<SkBitmap> bitmaps;
-  bitmaps.push_back(CreateDummyBitmap(15, 10));
+  bitmaps.push_back(CreateDummyBitmap(5, 5));
   bitmaps.push_back(CreateDummyBitmap(10, 15));
 
-  ASSERT_EQ(-1, FindBitmap(15, 0, bitmaps));
-  ASSERT_EQ(-1, FindBitmap(10, 0, bitmaps));
+  ASSERT_EQ(0, FindBitmap(15, 5, bitmaps));
+  ASSERT_EQ(0, FindBitmap(10, 5, bitmaps));
 }
+
+TEST_F(ManifestIconDownloaderTest, MostSquareNonSquareIsPicked) {
+  std::vector<SkBitmap> bitmaps;
+  bitmaps.push_back(CreateDummyBitmap(25, 35));
+  bitmaps.push_back(CreateDummyBitmap(10, 15));
+
+  ASSERT_EQ(1, FindBitmap(25, 0, bitmaps));
+  ASSERT_EQ(1, FindBitmap(35, 0, bitmaps));
+}
+
+TEST_F(ManifestIconDownloaderTest, NonSquareBelowMinimumIsNotPicked) {
+  std::vector<SkBitmap> bitmaps;
+  bitmaps.push_back(CreateDummyBitmap(10, 15));
+  bitmaps.push_back(CreateDummyBitmap(15, 10));
+
+  ASSERT_EQ(-1, FindBitmap(15, 11, bitmaps));
+}