Find Favicon in priority of icon_type.

chrome/browser/history/history_backend_unittest.cc

 // Copyright (c) 2012 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/history/history_backend.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 1893 matching lines @@
   std::vector<unsigned char> data;
   data.push_back('c');
   scoped_refptr<base::RefCountedBytes> bitmap_data(
       new base::RefCountedBytes(data));
   backend_->MergeFavicon(
       page_url, merged_icon_url, chrome::FAVICON, bitmap_data, kSmallSize);
 
   // Request favicon bitmaps for both 1x and 2x to simulate request done by
   // BookmarkModel::GetFavicon().
   std::vector<chrome::FaviconBitmapResult> bitmap_results;
-  backend_->GetFaviconsForURL(page_url, chrome::FAVICON, kSmallSize.width(),
-                              GetScaleFactors1x2x(), &bitmap_results);
+  std::vector<int> icon_types_priority;
+  icon_types_priority.push_back(chrome::FAVICON);
+  backend_->GetFaviconsForURL(page_url, icon_types_priority, kSmallSize.width(),
+                              GetScaleFactors1x2x(), 0, &bitmap_results);
 
   EXPECT_EQ(2u, bitmap_results.size());
   const chrome::FaviconBitmapResult& first_result = bitmap_results[0];
   const chrome::FaviconBitmapResult& result =
       (first_result.pixel_size == kSmallSize) ? first_result
                                               : bitmap_results[1];
   EXPECT_TRUE(BitmapDataEqual('c', result.bitmap_data));
 }
 
+// Tests GetFaviconsForURL with icon_types priority,
+TEST_F(HistoryBackendTest, TestGetFaviconsForURLWithIconTypesPriority) {
+  GURL page_url("http://www.google.com");
+  GURL icon_url("http://www.google.com/favicon.ico");
+  GURL touch_icon_url("http://wwww.google.com/touch_icon.ico");
+
+  std::vector<chrome::FaviconBitmapData> favicon_bitmap_data;
+  std::vector<gfx::Size> favicon_size;
+  favicon_size.push_back(gfx::Size(16, 16));
+  favicon_size.push_back(gfx::Size(32, 32));
+  GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);
+  ASSERT_EQ(2u, favicon_bitmap_data.size());
+
+  std::vector<chrome::FaviconBitmapData> touch_icon_bitmap_data;
+  std::vector<gfx::Size> touch_icon_size;
+  touch_icon_size.push_back(gfx::Size(64, 64));
+  GenerateFaviconBitmapData(icon_url, touch_icon_size, &touch_icon_bitmap_data);
+  ASSERT_EQ(1u, touch_icon_bitmap_data.size());
+
+  // Set some preexisting favicons for |page_url|.
+  backend_->SetFavicons(page_url, chrome::FAVICON, favicon_bitmap_data);
+  backend_->SetFavicons(page_url, chrome::TOUCH_ICON, touch_icon_bitmap_data);
+
+  std::vector<chrome::FaviconBitmapResult> bitmap_results;
+  std::vector<int> icon_types_priority;
+  icon_types_priority.push_back(chrome::FAVICON);
+  icon_types_priority.push_back(chrome::TOUCH_ICON);
+
+  backend_->GetFaviconsForURL(page_url, icon_types_priority, kSmallSize.width(),
+                              GetScaleFactors1x2x(), 16, &bitmap_results);
+
+  // Verify the result icon is 32x32 favicon.
+  EXPECT_EQ(1u, bitmap_results.size());
+  chrome::FaviconBitmapResult& result = bitmap_results[0];
+  EXPECT_EQ(gfx::Size(32, 32), result.pixel_size);
+  EXPECT_EQ(chrome::FAVICON, result.icon_type);
+
+  // Change Minimal size to 32x32 and verify the 64x64 touch icon returned.
+  bitmap_results.clear();
+  backend_->GetFaviconsForURL(page_url, icon_types_priority, kSmallSize.width(),
+                              GetScaleFactors1x2x(), 32, &bitmap_results);
+  EXPECT_EQ(1u, bitmap_results.size());
+  result = bitmap_results[0];
+  EXPECT_EQ(gfx::Size(64, 64), result.pixel_size);
+  EXPECT_EQ(chrome::TOUCH_ICON, result.icon_type);
+}
+
+// Test the the first types of icon is returned if its size equal to the
+// second types icon.
+TEST_F(HistoryBackendTest, TestGetFaviconsForURLReturnFavicon) {
+  GURL page_url("http://www.google.com");
+  GURL icon_url("http://www.google.com/favicon.ico");
+  GURL touch_icon_url("http://wwww.google.com/touch_icon.ico");
+
+  std::vector<chrome::FaviconBitmapData> favicon_bitmap_data;
+  std::vector<gfx::Size> favicon_size;
+  favicon_size.push_back(gfx::Size(16, 16));
+  favicon_size.push_back(gfx::Size(32, 32));
+  GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);
+  ASSERT_EQ(2u, favicon_bitmap_data.size());
+
+  std::vector<chrome::FaviconBitmapData> touch_icon_bitmap_data;
+  std::vector<gfx::Size> touch_icon_size;
+  touch_icon_size.push_back(gfx::Size(32, 32));
+  GenerateFaviconBitmapData(icon_url, touch_icon_size, &touch_icon_bitmap_data);
+  ASSERT_EQ(1u, touch_icon_bitmap_data.size());
+
+  // Set some preexisting favicons for |page_url|.
+  backend_->SetFavicons(page_url, chrome::FAVICON, favicon_bitmap_data);
+  backend_->SetFavicons(page_url, chrome::TOUCH_ICON, touch_icon_bitmap_data);
+
+  std::vector<chrome::FaviconBitmapResult> bitmap_results;
+  std::vector<int> icon_types_priority;
+  icon_types_priority.push_back(chrome::FAVICON);
+  icon_types_priority.push_back(chrome::TOUCH_ICON);
+
+  backend_->GetFaviconsForURL(page_url, icon_types_priority, kSmallSize.width(),
+                              GetScaleFactors1x2x(), 16, &bitmap_results);
+
+  // Verify the result icon is 32x32 favicon.
+  EXPECT_EQ(1u, bitmap_results.size());
+  chrome::FaviconBitmapResult& result = bitmap_results[0];
+  EXPECT_EQ(gfx::Size(32, 32), result.pixel_size);
+  EXPECT_EQ(chrome::FAVICON, result.icon_type);
+
+  // Change minimal size to 32x32 and verify the 32x32 favicon returned.
+  bitmap_results.clear();
+  backend_->GetFaviconsForURL(page_url, icon_types_priority, kSmallSize.width(),
+                              GetScaleFactors1x2x(), 32, &bitmap_results);
+  EXPECT_EQ(1u, bitmap_results.size());
+  result = bitmap_results[0];
+  EXPECT_EQ(gfx::Size(32, 32), result.pixel_size);
+  EXPECT_EQ(chrome::FAVICON, result.icon_type);
+}
+
+// Test the favicon is returned if its size is smaller than minimal size,
+// because it is only one available.
+TEST_F(HistoryBackendTest, TestGetFaviconsForURLReturnFaviconEvenItSmaller) {
+  GURL page_url("http://www.google.com");
+  GURL icon_url("http://www.google.com/favicon.ico");
+
+  std::vector<chrome::FaviconBitmapData> favicon_bitmap_data;
+  std::vector<gfx::Size> favicon_size;
+  favicon_size.push_back(gfx::Size(16, 16));
+  GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);
+  ASSERT_EQ(1u, favicon_bitmap_data.size());
+
+  // Set preexisting favicons for |page_url|.
+  backend_->SetFavicons(page_url, chrome::FAVICON, favicon_bitmap_data);
+
+  std::vector<chrome::FaviconBitmapResult> bitmap_results;
+  std::vector<int> icon_types_priority;
+  icon_types_priority.push_back(chrome::FAVICON);
+  icon_types_priority.push_back(chrome::TOUCH_ICON);
+
+  backend_->GetFaviconsForURL(page_url, icon_types_priority, kSmallSize.width(),
+                              GetScaleFactors1x2x(), 32, &bitmap_results);
+
+  // Verify 16x16 icon is returned, even it small than minimal_size.
+  EXPECT_EQ(1u, bitmap_results.size());
+  chrome::FaviconBitmapResult& result = bitmap_results[0];
+  EXPECT_EQ(gfx::Size(16, 16), result.pixel_size);
+  EXPECT_EQ(chrome::FAVICON, result.icon_type);
+}
+
 // Test UpdateFaviconMapingsAndFetch() when multiple icon types are passed in.
 TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes) {
   GURL page_url1("http://www.google.com");
   GURL page_url2("http://news.google.com");
   GURL page_url3("http://mail.google.com");
   GURL icon_urla("http://www.google.com/favicon1.ico");
   GURL icon_urlb("http://www.google.com/favicon2.ico");
   GURL icon_urlc("http://www.google.com/favicon3.ico");
 
   // |page_url1| is mapped to |icon_urla| which if of type TOUCH_ICON.
@@ skipping 834 matching lines @@
   // Delete all DTS index databases.
   backend_->DeleteFTSIndexDatabases();
   EXPECT_FALSE(base::PathExists(db1));
   EXPECT_FALSE(base::PathExists(db1_wal));
   EXPECT_FALSE(base::PathExists(db1_journal));
   EXPECT_FALSE(base::PathExists(db2_symlink));
   EXPECT_TRUE(base::PathExists(db2_actual));  // Symlinks shouldn't be followed.
 }
 
 }  // namespace history