Pass in a set of requested favicon pixel sizes to the HistoryService

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 30 matching lines @@
 
 using base::Time;
 
 // This file only tests functionality where it is most convenient to call the
 // backend directly. Most of the history backend functions are tested by the
 // history unit test. Because of the elaborate callbacks involved, this is no
 // harder than calling it directly for many things.
 
 namespace {
 
-static const gfx::Size kTinySize = gfx::Size(10, 10);
-static const gfx::Size kSmallSize = gfx::Size(16, 16);
-static const gfx::Size kLargeSize = gfx::Size(32, 32);
+const int kTinyEdgeSize = 10;
+const int kSmallEdgeSize = 16;
+const int kLargeEdgeSize = 32;
+
+const gfx::Size kTinySize = gfx::Size(kTinyEdgeSize, kTinyEdgeSize);
+const gfx::Size kSmallSize = gfx::Size(kSmallEdgeSize, kSmallEdgeSize);
+const gfx::Size kLargeSize = gfx::Size(kLargeEdgeSize, kLargeEdgeSize);
 
 // Comparison functions as to make it easier to check results of
 // GetFaviconBitmaps() and GetIconMappingsForPageURL().
 bool IconMappingLessThan(const history::IconMapping& a,
                          const history::IconMapping& b) {
   return a.icon_url < b.icon_url;
 }
 
 bool FaviconBitmapLessThan(const history::FaviconBitmap& a,
                            const history::FaviconBitmap& b) {
@@ skipping 224 matching lines @@
   int GetTransition(const GURL& url) {
     if (!url.is_valid())
       return 0;
     URLRow row;
     URLID id = backend_->db()->GetRowForURL(url, &row);
     VisitVector visits;
     EXPECT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
     return visits[0].transition;
   }
 
-  // Returns a gfx::Size vector with small size.
-  const std::vector<gfx::Size> GetSizesSmall() {
-    std::vector<gfx::Size> sizes_small;
-    sizes_small.push_back(kSmallSize);
+  // Returns a vector with the small edge size.
+  const std::vector<int> GetEdgeSizesSmall() {
+    std::vector<int> sizes_small;
+    sizes_small.push_back(kSmallEdgeSize);
     return sizes_small;
   }
 
-  // Returns a gfx::Size vector with large size.
-  const std::vector<gfx::Size> GetSizesLarge() {
-    std::vector<gfx::Size> sizes_large;
-    sizes_large.push_back(kLargeSize);
+  // Returns a vector with the large edge size.
+  const std::vector<int> GetEdgeSizesLarge() {
+    std::vector<int> sizes_large;
+    sizes_large.push_back(kLargeEdgeSize);
     return sizes_large;
   }
 
-  // Returns a gfx::Size vector with small and large sizes.
-  const std::vector<gfx::Size> GetSizesSmallAndLarge() {
-    std::vector<gfx::Size> sizes_small_and_large;
-    sizes_small_and_large.push_back(kSmallSize);
-    sizes_small_and_large.push_back(kLargeSize);
+  // Returns a vector with the small and large edge sizes.
+  const std::vector<int> GetEdgeSizesSmallAndLarge() {
+    std::vector<int> sizes_small_and_large;
+    sizes_small_and_large.push_back(kSmallEdgeSize);
+    sizes_small_and_large.push_back(kLargeEdgeSize);
     return sizes_small_and_large;
   }
 
-  // Returns a gfx::Size vector with tiny, small and large sizes.
-  const std::vector<gfx::Size> GetSizesTinySmallAndLarge() {
-    std::vector<gfx::Size> sizes_tiny_small_and_large;
-    sizes_tiny_small_and_large.push_back(kTinySize);
-    sizes_tiny_small_and_large.push_back(kSmallSize);
-    sizes_tiny_small_and_large.push_back(kLargeSize);
+  // Returns a vector with the tiny, small, and large edge sizes.
+  const std::vector<int> GetEdgeSizesTinySmallAndLarge() {
+    std::vector<int> sizes_tiny_small_and_large;
+    sizes_tiny_small_and_large.push_back(kTinyEdgeSize);
+    sizes_tiny_small_and_large.push_back(kSmallEdgeSize);
+    sizes_tiny_small_and_large.push_back(kLargeEdgeSize);
     return sizes_tiny_small_and_large;
   }
 
-  // Returns 1x and 2x scale factors.
-  const std::vector<ui::ScaleFactor> GetScaleFactors1x2x() {
-    std::vector<ui::ScaleFactor> scale_factors_1x_2x;
-    scale_factors_1x_2x.push_back(ui::SCALE_FACTOR_100P);
-    scale_factors_1x_2x.push_back(ui::SCALE_FACTOR_200P);
-    return scale_factors_1x_2x;
-  }
-
   // Returns the number of icon mappings of |icon_type| to |page_url|.
   size_t NumIconMappingsForPageURL(const GURL& page_url,
                                    favicon_base::IconType icon_type) {
     std::vector<IconMapping> icon_mappings;
     backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url, icon_type,
                                                        &icon_mappings);
     return icon_mappings.size();
   }
 
   // Returns the icon mappings for |page_url| sorted alphabetically by icon
@@ skipping 33 matching lines @@
       return false;
     *favicon_bitmap = favicon_bitmaps[0];
     return true;
   }
 
   // Generates |favicon_bitmap_data| with entries for the icon_urls and sizes
   // specified. The bitmap_data for entries are lowercase letters of the
   // alphabet starting at 'a' for the entry at index 0.
   void GenerateFaviconBitmapData(
       const GURL& icon_url1,
-      const std::vector<gfx::Size>& icon_url1_sizes,
+      const std::vector<int>& icon_url1_sizes,
       std::vector<favicon_base::FaviconRawBitmapData>* favicon_bitmap_data) {
     GenerateFaviconBitmapData(icon_url1, icon_url1_sizes, GURL(),
-                              std::vector<gfx::Size>(), favicon_bitmap_data);
+                              std::vector<int>(), favicon_bitmap_data);
   }
 
   void GenerateFaviconBitmapData(
       const GURL& icon_url1,
-      const std::vector<gfx::Size>& icon_url1_sizes,
+      const std::vector<int>& icon_url1_sizes,
       const GURL& icon_url2,
-      const std::vector<gfx::Size>& icon_url2_sizes,
+      const std::vector<int>& icon_url2_sizes,
       std::vector<favicon_base::FaviconRawBitmapData>* favicon_bitmap_data) {
     favicon_bitmap_data->clear();
 
     char bitmap_char = 'a';
     for (size_t i = 0; i < icon_url1_sizes.size(); ++i) {
       std::vector<unsigned char> data;
       data.push_back(bitmap_char);
       favicon_base::FaviconRawBitmapData bitmap_data_element;
       bitmap_data_element.bitmap_data =
           base::RefCountedBytes::TakeVector(&data);
-      bitmap_data_element.pixel_size = icon_url1_sizes[i];
+      bitmap_data_element.pixel_size =
+          gfx::Size(icon_url1_sizes[i], icon_url1_sizes[i]);
       bitmap_data_element.icon_url = icon_url1;
       favicon_bitmap_data->push_back(bitmap_data_element);
 
       ++bitmap_char;
     }
 
     for (size_t i = 0; i < icon_url2_sizes.size(); ++i) {
       std::vector<unsigned char> data;
       data.push_back(bitmap_char);
       favicon_base::FaviconRawBitmapData bitmap_data_element;
       bitmap_data_element.bitmap_data =
           base::RefCountedBytes::TakeVector(&data);
-      bitmap_data_element.pixel_size = icon_url2_sizes[i];
+      bitmap_data_element.pixel_size =
+          gfx::Size(icon_url2_sizes[i], icon_url2_sizes[i]);
       bitmap_data_element.icon_url = icon_url2;
       favicon_bitmap_data->push_back(bitmap_data_element);
 
       ++bitmap_char;
     }
   }
 
   // Returns true if |bitmap_data| is equal to |expected_data|.
   bool BitmapDataEqual(char expected_data,
                        scoped_refptr<base::RefCountedMemory> bitmap_data) {
@@ skipping 1096 matching lines @@
   history::RedirectList redirects;
   redirects.push_back(url2);
   redirects.push_back(url1);
   backend_->recent_redirects_.Put(url1, redirects);
 
   const GURL icon_url1("http://www.google.com/icon");
   const GURL icon_url2("http://www.google.com/icon2");
 
   // Generate bitmap data for a page with two favicons.
   std::vector<favicon_base::FaviconRawBitmapData> two_favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url1, GetSizesSmallAndLarge(),
-      icon_url2, GetSizesSmallAndLarge(), &two_favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_url1, GetEdgeSizesSmallAndLarge(),
+      icon_url2, GetEdgeSizesSmallAndLarge(), &two_favicon_bitmap_data);
 
   // Generate bitmap data for a page with a single favicon.
   std::vector<favicon_base::FaviconRawBitmapData> one_favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url1, GetSizesSmallAndLarge(),
+  GenerateFaviconBitmapData(icon_url1, GetEdgeSizesSmallAndLarge(),
                             &one_favicon_bitmap_data);
 
   // Add two favicons
   backend_->SetFavicons(url1, favicon_base::FAVICON, two_favicon_bitmap_data);
   EXPECT_EQ(2u, NumIconMappingsForPageURL(url1, favicon_base::FAVICON));
   EXPECT_EQ(2u, NumIconMappingsForPageURL(url2, favicon_base::FAVICON));
 
   // Add one touch_icon
   backend_->SetFavicons(
       url1, favicon_base::TOUCH_ICON, one_favicon_bitmap_data);
@@ skipping 36 matching lines @@
   EXPECT_EQ(2u, NumIconMappingsForPageURL(url1, favicon_base::FAVICON));
 }
 
 // Test that there is no churn in icon mappings from calling
 // SetFavicons() twice with the same |favicon_bitmap_data| parameter.
 TEST_F(HistoryBackendTest, SetFaviconMappingsForPageDuplicates) {
   const GURL url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesSmallAndLarge(),
                             &favicon_bitmap_data);
 
   backend_->SetFavicons(url, favicon_base::FAVICON, favicon_bitmap_data);
 
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       url, favicon_base::FAVICON, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   IconMappingID mapping_id = icon_mappings[0].mapping_id;
 
@@ skipping 10 matching lines @@
 }
 
 // Test that calling SetFavicons() with FaviconBitmapData of different pixel
 // sizes than the initially passed in FaviconBitmapData deletes the no longer
 // used favicon bitmaps.
 TEST_F(HistoryBackendTest, SetFaviconsDeleteBitmaps) {
   const GURL page_url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesSmallAndLarge(),
                             &favicon_bitmap_data);
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
   // Test initial state.
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(GetSortedIconMappingsForPageURL(page_url, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(icon_url, icon_mappings[0].icon_url);
   EXPECT_EQ(favicon_base::FAVICON, icon_mappings[0].icon_type);
   favicon_base::FaviconID favicon_id = icon_mappings[0].icon_id;
 
   std::vector<FaviconBitmap> favicon_bitmaps;
   EXPECT_TRUE(GetSortedFaviconBitmaps(favicon_id, &favicon_bitmaps));
   EXPECT_EQ(2u, favicon_bitmaps.size());
   FaviconBitmapID small_bitmap_id = favicon_bitmaps[0].bitmap_id;
   EXPECT_NE(0, small_bitmap_id);
   EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmaps[0].bitmap_data));
   EXPECT_EQ(kSmallSize, favicon_bitmaps[0].pixel_size);
   FaviconBitmapID large_bitmap_id = favicon_bitmaps[1].bitmap_id;
   EXPECT_NE(0, large_bitmap_id);
   EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmaps[1].bitmap_data));
   EXPECT_EQ(kLargeSize, favicon_bitmaps[1].pixel_size);
 
   // Call SetFavicons() with bitmap data for only the large bitmap. Check that
   // the small bitmap is in fact deleted.
-  GenerateFaviconBitmapData(icon_url, GetSizesLarge(), &favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesLarge(),
+      &favicon_bitmap_data);
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
   scoped_refptr<base::RefCountedMemory> bitmap_data_out;
   gfx::Size pixel_size_out;
   EXPECT_FALSE(backend_->thumbnail_db_->GetFaviconBitmap(small_bitmap_id,
       NULL, &bitmap_data_out, &pixel_size_out));
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmap(large_bitmap_id,
       NULL, &bitmap_data_out, &pixel_size_out));
   EXPECT_TRUE(BitmapDataEqual('a', bitmap_data_out));
   EXPECT_EQ(kLargeSize, pixel_size_out);
@@ skipping 93 matching lines @@
 
 // Test that if two pages share the same FaviconID, changing the favicon for
 // one page does not affect the other.
 TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {
   GURL icon_url("http://www.google.com/favicon.ico");
   GURL icon_url_new("http://www.google.com/favicon2.ico");
   GURL page_url1("http://www.google.com");
   GURL page_url2("http://www.google.ca");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesSmallAndLarge(),
                             &favicon_bitmap_data);
 
   backend_->SetFavicons(page_url1, favicon_base::FAVICON, favicon_bitmap_data);
 
   std::vector<GURL> icon_urls;
   icon_urls.push_back(icon_url);
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
   backend_->UpdateFaviconMappingsAndFetch(page_url2,
                                           icon_urls,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results);
 
   // Check that the same FaviconID is mapped to both page URLs.
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       page_url1, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   favicon_base::FaviconID favicon_id = icon_mappings[0].icon_id;
   EXPECT_NE(0, favicon_id);
 
   icon_mappings.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       page_url2, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(favicon_id, icon_mappings[0].icon_id);
 
   // Change the icon URL that |page_url1| is mapped to.
-  GenerateFaviconBitmapData(icon_url_new, GetSizesSmall(),
+  GenerateFaviconBitmapData(icon_url_new, GetEdgeSizesSmall(),
                             &favicon_bitmap_data);
   backend_->SetFavicons(page_url1, favicon_base::FAVICON, favicon_bitmap_data);
 
   // |page_url1| should map to a new FaviconID and have valid bitmap data.
   icon_mappings.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       page_url1, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(icon_url_new, icon_mappings[0].icon_url);
   EXPECT_NE(favicon_id, icon_mappings[0].icon_id);
@@ skipping 21 matching lines @@
   EXPECT_EQ(3, num_broadcasted_notifications());
 }
 
 // Test that no notifications are broadcast as a result of calling
 // UpdateFaviconMappingsAndFetch() for an icon URL which is already
 // mapped to the passed in page URL.
 TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoChange) {
   GURL page_url("http://www.google.com");
   GURL icon_url("http://www.google.com/favicon.ico");
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesSmall(), &favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesSmall(),
+      &favicon_bitmap_data);
 
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
   favicon_base::FaviconID icon_id =
       backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
           icon_url, favicon_base::FAVICON, NULL);
   EXPECT_NE(0, icon_id);
   EXPECT_EQ(1, num_broadcasted_notifications());
 
   std::vector<GURL> icon_urls;
   icon_urls.push_back(icon_url);
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
   backend_->UpdateFaviconMappingsAndFetch(page_url,
                                           icon_urls,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results);
 
   EXPECT_EQ(icon_id,
             backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
                 icon_url, favicon_base::FAVICON, NULL));
 
   // No notification should have been broadcast as no icon mapping, favicon,
   // or favicon bitmap was updated, added or removed.
   EXPECT_EQ(1, num_broadcasted_notifications());
 }
@@ skipping 45 matching lines @@
   EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);
 }
 
 // Test calling MergeFavicon() when |page_url| is known to the database.
 TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {
   GURL page_url("http://www.google.com");
   GURL icon_url1("http:/www.google.com/favicon.ico");
   GURL icon_url2("http://www.google.com/favicon2.ico");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url1, GetSizesSmall(),
+  GenerateFaviconBitmapData(icon_url1, GetEdgeSizesSmall(),
                             &favicon_bitmap_data);
 
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
   // Test initial state.
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url,
       &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(icon_url1, icon_mappings[0].icon_url);
@@ skipping 106 matching lines @@
 
 // Test calling MergeFavicon() when |icon_url| is known to the database but not
 // mapped to |page_url|.
 TEST_F(HistoryBackendTest, MergeFaviconIconURLMappedToDifferentPageURL) {
   GURL page_url1("http://www.google.com");
   GURL page_url2("http://news.google.com");
   GURL page_url3("http://maps.google.com");
   GURL icon_url("http:/www.google.com/favicon.ico");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesSmall(),
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesSmall(),
                             &favicon_bitmap_data);
 
   backend_->SetFavicons(page_url1, favicon_base::FAVICON, favicon_bitmap_data);
 
   // Test initial state.
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url1,
       &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(icon_url, icon_mappings[0].icon_url);
@@ skipping 100 matching lines @@
 }
 
 // Tests that the favicon set by MergeFavicon() shows up in the result of
 // GetFaviconsForURL().
 TEST_F(HistoryBackendTest, MergeFaviconShowsUpInGetFaviconsForURLResult) {
   GURL page_url("http://www.google.com");
   GURL icon_url("http://www.google.com/favicon.ico");
   GURL merged_icon_url("http://wwww.google.com/favicon2.ico");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesSmallAndLarge(),
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesSmallAndLarge(),
                             &favicon_bitmap_data);
 
   // Set some preexisting favicons for |page_url|.
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
   // Merge small favicon.
   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,
                          favicon_base::FAVICON,
                          bitmap_data,
                          kSmallSize);
 
   // Request favicon bitmaps for both 1x and 2x to simulate request done by
   // BookmarkModel::GetFavicon().
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
   backend_->GetFaviconsForURL(page_url,
                               favicon_base::FAVICON,
-                              kSmallSize.width(),
-                              GetScaleFactors1x2x(),
+                              GetEdgeSizesSmallAndLarge(),
                               &bitmap_results);
 
   EXPECT_EQ(2u, bitmap_results.size());
   const favicon_base::FaviconRawBitmapResult& first_result = bitmap_results[0];
   const favicon_base::FaviconRawBitmapResult& 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<favicon_base::FaviconRawBitmapData> 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));
+  std::vector<int> favicon_size;
+  favicon_size.push_back(16);
+  favicon_size.push_back(32);
   GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);
   ASSERT_EQ(2u, favicon_bitmap_data.size());
 
   std::vector<favicon_base::FaviconRawBitmapData> touch_icon_bitmap_data;
-  std::vector<gfx::Size> touch_icon_size;
-  touch_icon_size.push_back(gfx::Size(64, 64));
+  std::vector<int> touch_icon_size;
+  touch_icon_size.push_back(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, favicon_base::FAVICON, favicon_bitmap_data);
   backend_->SetFavicons(
       page_url, favicon_base::TOUCH_ICON, touch_icon_bitmap_data);
 
   favicon_base::FaviconRawBitmapResult result;
   std::vector<int> icon_types;
@@ skipping 13 matching lines @@
 }
 
 // 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<favicon_base::FaviconRawBitmapData> 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));
+  std::vector<int> favicon_size;
+  favicon_size.push_back(16);
+  favicon_size.push_back(32);
   GenerateFaviconBitmapData(icon_url, favicon_size, &favicon_bitmap_data);
   ASSERT_EQ(2u, favicon_bitmap_data.size());
 
   std::vector<favicon_base::FaviconRawBitmapData> touch_icon_bitmap_data;
-  std::vector<gfx::Size> touch_icon_size;
-  touch_icon_size.push_back(gfx::Size(32, 32));
+  std::vector<int> touch_icon_size;
+  touch_icon_size.push_back(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, favicon_base::FAVICON, favicon_bitmap_data);
   backend_->SetFavicons(
       page_url, favicon_base::TOUCH_ICON, touch_icon_bitmap_data);
 
   favicon_base::FaviconRawBitmapResult result;
   std::vector<int> icon_types;
@@ skipping 13 matching lines @@
   EXPECT_EQ(favicon_base::FAVICON, result1.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<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  std::vector<gfx::Size> favicon_size;
-  favicon_size.push_back(gfx::Size(16, 16));
+  std::vector<int> favicon_size;
+  favicon_size.push_back(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, favicon_base::FAVICON, favicon_bitmap_data);
 
   favicon_base::FaviconRawBitmapResult result;
   std::vector<int> icon_types;
   icon_types.push_back(favicon_base::FAVICON);
   icon_types.push_back(favicon_base::TOUCH_ICON);
 
   backend_->GetLargestFaviconForURL(page_url, icon_types, 32, &result);
 
   // Verify 16x16 icon is returned, even it small than minimal_size.
   EXPECT_EQ(gfx::Size(16, 16), result.pixel_size);
   EXPECT_EQ(favicon_base::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.
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_urla, GetSizesSmall(), &favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_urla, GetEdgeSizesSmall(),
+      &favicon_bitmap_data);
   backend_->SetFavicons(
       page_url1, favicon_base::TOUCH_ICON, favicon_bitmap_data);
 
   // |page_url2| is mapped to |icon_urlb| and |icon_urlc| which are of type
   // TOUCH_PRECOMPOSED_ICON.
-  GenerateFaviconBitmapData(icon_urlb, GetSizesSmall(), icon_urlc,
-                            GetSizesSmall(), &favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_urlb, GetEdgeSizesSmall(), icon_urlc,
+                            GetEdgeSizesSmall(), &favicon_bitmap_data);
   backend_->SetFavicons(
       page_url2, favicon_base::TOUCH_PRECOMPOSED_ICON, favicon_bitmap_data);
 
   std::vector<GURL> icon_urls;
   icon_urls.push_back(icon_urla);
   icon_urls.push_back(icon_urlb);
   icon_urls.push_back(icon_urlc);
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
   backend_->UpdateFaviconMappingsAndFetch(
       page_url3,
       icon_urls,
       (favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON),
-      kSmallSize.width(),
-      GetScaleFactors1x2x(),
+      GetEdgeSizesSmallAndLarge(),
       &bitmap_results);
 
   // |page_url1| and |page_url2| should still be mapped to the same icon URLs.
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url1,
       &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(icon_urla, icon_mappings[0].icon_url);
   EXPECT_EQ(favicon_base::TOUCH_ICON, icon_mappings[0].icon_type);
 
@@ skipping 17 matching lines @@
 }
 
 // Test the results of GetFaviconsFromDB() when there are no found
 // favicons.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBEmpty) {
   const GURL page_url("http://www.google.com/");
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
   EXPECT_FALSE(backend_->GetFaviconsFromDB(page_url,
                                            favicon_base::FAVICON,
-                                           kSmallSize.width(),
-                                           GetScaleFactors1x2x(),
+                                           GetEdgeSizesSmallAndLarge(),
                                            &bitmap_results));
   EXPECT_TRUE(bitmap_results.empty());
 }
 
 // Test the results of GetFaviconsFromDB() when there are matching favicons
 // but there are no associated favicon bitmaps.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBNoFaviconBitmaps) {
   const GURL page_url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon1");
 
   favicon_base::FaviconID icon_id =
       backend_->thumbnail_db_->AddFavicon(icon_url, favicon_base::FAVICON);
   EXPECT_NE(0, icon_id);
   EXPECT_NE(0, backend_->thumbnail_db_->AddIconMapping(page_url, icon_id));
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;
   EXPECT_FALSE(backend_->GetFaviconsFromDB(page_url,
                                            favicon_base::FAVICON,
-                                           kSmallSize.width(),
-                                           GetScaleFactors1x2x(),
+                                           GetEdgeSizesSmallAndLarge(),
                                            &bitmap_results_out));
   EXPECT_TRUE(bitmap_results_out.empty());
 }
 
 // Test that GetFaviconsFromDB() returns results for the bitmaps which most
-// closely match the passed in desired size and scale factors.
+// closely match the passed in the desired pixel sizes.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBSelectClosestMatch) {
   const GURL page_url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon1");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesTinySmallAndLarge(),
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesTinySmallAndLarge(),
                             &favicon_bitmap_data);
 
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;
   EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
 
   // The bitmap data for the small and large bitmaps should be returned as their
   // sizes match exactly.
   EXPECT_EQ(2u, bitmap_results_out.size());
   // No required order for results.
   if (bitmap_results_out[0].pixel_size == kLargeSize) {
     favicon_base::FaviconRawBitmapResult tmp_result = bitmap_results_out[0];
     bitmap_results_out[0] = bitmap_results_out[1];
     bitmap_results_out[1] = tmp_result;
   }
 
   EXPECT_FALSE(bitmap_results_out[0].expired);
   EXPECT_TRUE(BitmapDataEqual('b', bitmap_results_out[0].bitmap_data));
   EXPECT_EQ(kSmallSize, bitmap_results_out[0].pixel_size);
   EXPECT_EQ(icon_url, bitmap_results_out[0].icon_url);
   EXPECT_EQ(favicon_base::FAVICON, bitmap_results_out[0].icon_type);
 
   EXPECT_FALSE(bitmap_results_out[1].expired);
   EXPECT_TRUE(BitmapDataEqual('c', bitmap_results_out[1].bitmap_data));
   EXPECT_EQ(kLargeSize, bitmap_results_out[1].pixel_size);
   EXPECT_EQ(icon_url, bitmap_results_out[1].icon_url);
   EXPECT_EQ(favicon_base::FAVICON, bitmap_results_out[1].icon_type);
 }
 
 // Test that GetFaviconsFromDB() returns results from the icon URL whose
-// bitmaps most closely match the passed in desired size and scale factors.
+// bitmaps most closely match the passed in desired sizes.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBSingleIconURL) {
   const GURL page_url("http://www.google.com/");
 
   const GURL icon_url1("http://www.google.com/icon1");
   const GURL icon_url2("http://www.google.com/icon2");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url1, GetSizesSmall(), icon_url2,
-                            GetSizesLarge(), &favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_url1, GetEdgeSizesSmall(), icon_url2,
+                            GetEdgeSizesLarge(), &favicon_bitmap_data);
 
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;
   EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
 
   // The results should have results for the icon URL with the large bitmap as
   // downscaling is preferred to upscaling.
   EXPECT_EQ(1u, bitmap_results_out.size());
   EXPECT_EQ(kLargeSize, bitmap_results_out[0].pixel_size);
   EXPECT_EQ(icon_url2, bitmap_results_out[0].icon_url);
 }
 
 // Test the results of GetFaviconsFromDB() when called with different
 // |icon_types|.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBIconType) {
   const GURL page_url("http://www.google.com/");
   const GURL icon_url1("http://www.google.com/icon1.png");
   const GURL icon_url2("http://www.google.com/icon2.png");
 
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url1, GetSizesSmall(),  &favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_url1, GetEdgeSizesSmall(),
+      &favicon_bitmap_data);
   backend_->SetFavicons(page_url, favicon_base::FAVICON, favicon_bitmap_data);
 
-  GenerateFaviconBitmapData(icon_url2, GetSizesSmall(), &favicon_bitmap_data);
+  GenerateFaviconBitmapData(
+      icon_url2, GetEdgeSizesSmall(), &favicon_bitmap_data);
   backend_->SetFavicons(
       page_url, favicon_base::TOUCH_ICON, favicon_bitmap_data);
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;
   EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
 
   EXPECT_EQ(1u, bitmap_results_out.size());
   EXPECT_EQ(favicon_base::FAVICON, bitmap_results_out[0].icon_type);
   EXPECT_EQ(icon_url1, bitmap_results_out[0].icon_url);
 
   bitmap_results_out.clear();
   EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
                                           favicon_base::TOUCH_ICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
 
   EXPECT_EQ(1u, bitmap_results_out.size());
   EXPECT_EQ(favicon_base::TOUCH_ICON, bitmap_results_out[0].icon_type);
   EXPECT_EQ(icon_url2, bitmap_results_out[0].icon_url);
 }
 
 // Test that GetFaviconsFromDB() correctly sets the expired flag for bitmap
 // reults.
 TEST_F(HistoryBackendTest, GetFaviconsFromDBExpired) {
   const GURL page_url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon.png");
 
   std::vector<unsigned char> data;
   data.push_back('a');
   scoped_refptr<base::RefCountedBytes> bitmap_data(
       base::RefCountedBytes::TakeVector(&data));
   base::Time last_updated = base::Time::FromTimeT(0);
   favicon_base::FaviconID icon_id = backend_->thumbnail_db_->AddFavicon(
       icon_url, favicon_base::FAVICON, bitmap_data, last_updated, kSmallSize);
   EXPECT_NE(0, icon_id);
   EXPECT_NE(0, backend_->thumbnail_db_->AddIconMapping(page_url, icon_id));
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;
   EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
 
   EXPECT_EQ(1u, bitmap_results_out.size());
   EXPECT_TRUE(bitmap_results_out[0].expired);
 }
 
 // Check that UpdateFaviconMappingsAndFetch() call back to the UI when there is
 // no valid thumbnail database.
 TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoDB) {
   // Make the thumbnail database invalid.
   backend_->thumbnail_db_.reset();
 
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results;
 
   backend_->UpdateFaviconMappingsAndFetch(GURL(),
                                           std::vector<GURL>(),
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results);
 
   EXPECT_TRUE(bitmap_results.empty());
 }
 
 TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) {
   const GURL url("http://www.google.com/");
   const GURL same_domain_url("http://www.google.com/subdir/index.html");
   const GURL foreign_domain_url("http://www.not-google.com/");
   const GURL icon_url("http://www.google.com/icon.png");
 
   // Add a favicon
   std::vector<favicon_base::FaviconRawBitmapData> favicon_bitmap_data;
-  GenerateFaviconBitmapData(icon_url, GetSizesSmall(),  &favicon_bitmap_data);
+  GenerateFaviconBitmapData(icon_url, GetEdgeSizesSmall(),
+      &favicon_bitmap_data);
   backend_->SetFavicons(url, favicon_base::FAVICON, favicon_bitmap_data);
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       url, favicon_base::FAVICON, NULL));
 
   // Validate starting state.
   std::vector<favicon_base::FaviconRawBitmapResult> bitmap_results_out;
   EXPECT_TRUE(backend_->GetFaviconsFromDB(url,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
   EXPECT_FALSE(backend_->GetFaviconsFromDB(same_domain_url,
                                            favicon_base::FAVICON,
-                                           kSmallSize.width(),
-                                           GetScaleFactors1x2x(),
+                                           GetEdgeSizesSmallAndLarge(),
                                            &bitmap_results_out));
   EXPECT_FALSE(backend_->GetFaviconsFromDB(foreign_domain_url,
                                            favicon_base::FAVICON,
-                                           kSmallSize.width(),
-                                           GetScaleFactors1x2x(),
+                                           GetEdgeSizesSmallAndLarge(),
                                            &bitmap_results_out));
 
   // Same-domain cloning should work.
   backend_->CloneFavicons(url, same_domain_url);
   EXPECT_TRUE(backend_->GetFaviconsFromDB(same_domain_url,
                                           favicon_base::FAVICON,
-                                          kSmallSize.width(),
-                                          GetScaleFactors1x2x(),
+                                          GetEdgeSizesSmallAndLarge(),
                                           &bitmap_results_out));
 
   // Foreign-domain cloning is forbidden.
   backend_->CloneFavicons(url, foreign_domain_url);
   EXPECT_FALSE(backend_->GetFaviconsFromDB(foreign_domain_url,
                                            favicon_base::FAVICON,
-                                           kSmallSize.width(),
-                                           GetScaleFactors1x2x(),
+                                           GetEdgeSizesSmallAndLarge(),
                                            &bitmap_results_out));
 }
 
 TEST_F(HistoryBackendTest, QueryFilteredURLs) {
   const char* google = "http://www.google.com/";
   const char* yahoo = "http://www.yahoo.com/";
   const char* yahoo_sports = "http://sports.yahoo.com/";
   const char* yahoo_sports_with_article1 =
       "http://sports.yahoo.com/article1.htm";
   const char* yahoo_sports_with_article2 =
@@ skipping 728 matching lines @@
   // Verify that the second term is no longer returned as result, and also check
   // at the low level that it is gone for good. The term corresponding to the
   // first URLRow should not be affected.
   EXPECT_EQ(1u, GetNumberOfMatchingSearchTerms(kTestKeywordId, term1));
   EXPECT_EQ(0u, GetNumberOfMatchingSearchTerms(kTestKeywordId, term2));
   EXPECT_TRUE(mem_backend_->db()->GetKeywordSearchTermRow(row1.id(), NULL));
   EXPECT_FALSE(mem_backend_->db()->GetKeywordSearchTermRow(row2.id(), NULL));
 }
 
 }  // namespace history