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

chrome/browser/manifest/manifest_icon_downloader_unittest.cc

Index: chrome/browser/manifest/manifest_icon_downloader_unittest.cc
diff --git a/chrome/browser/manifest/manifest_icon_downloader_unittest.cc b/chrome/browser/manifest/manifest_icon_downloader_unittest.cc
index 624223ee46f54c1b9571fcbd29f6eae72772ea56..680f093c88daf6d3e5d18114eb412e65f5dff14c 100644
--- a/chrome/browser/manifest/manifest_icon_downloader_unittest.cc
+++ b/chrome/browser/manifest/manifest_icon_downloader_unittest.cc
@@ -113,11 +113,28 @@ TEST_F(ManifestIconDownloaderTest, MixedCanReturnMiddle) {
   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(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(15, 0, bitmaps));
-  ASSERT_EQ(-1, FindBitmap(10, 0, bitmaps));
+  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));
 }