Adds support for saving favicon size into history database.

chrome/browser/history/android/android_provider_backend_unittest.cc

Index: chrome/browser/history/android/android_provider_backend_unittest.cc
diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index 45ce3e94f5c7c5b4e901807bdbe54ab14c4b302a..5096568e01071a9222a3f551d6b9afb9911a3185 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -251,10 +251,20 @@ TEST_F(AndroidProviderBackendTest, UpdateTables) {
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  history_backend->SetFavicon(url2,
-                              GURL(),
-                              new base::RefCountedBytes(data),
-                              FAVICON);
+  FaviconDataElement element;
+  element.bitmap_data = new base::RefCountedBytes(data);
+  element.pixel_size = gfx::Size();
+  element.icon_url = GURL();
+  std::vector<FaviconDataElement> elements;
+  elements.push_back(element);
+
+  IconURLFaviconIDMap icon_url_favicon_ids;
+  icon_url_favicon_ids[GURL()] = FaviconSizes("0 0");
+
+  history_backend->SetFavicons(url2,
+                               FAVICON,
+                               elements,
+                               icon_url_favicon_ids);
   history_backend->Closing();
   }
 
@@ -397,10 +407,20 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) {
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  history_backend->SetFavicon(url2,
-                              GURL(),
-                              new base::RefCountedBytes(data),
-                              FAVICON);
+  FaviconDataElement element;
+  element.bitmap_data = new base::RefCountedBytes(data);
+  element.pixel_size = gfx::Size();
+  element.icon_url = GURL();
+  std::vector<FaviconDataElement> elements;
+  elements.push_back(element);
+
+  IconURLFaviconIDMap icon_url_favicon_ids;
+  icon_url_favicon_ids[GURL()] = FaviconSizes("0 0");
+
+  history_backend->SetFavicons(url2,
+                               FAVICON,
+                               elements,
+                               icon_url_favicon_ids);
   history_backend->Closing();
   }
 
@@ -1151,17 +1171,17 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row1.url()));
 
-  IconMapping icon_mapping;
-  EXPECT_TRUE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,
-                                                     &icon_mapping));
-  Time last_updated;
-  scoped_refptr<base::RefCountedMemory> png_icon_data;
-  EXPECT_TRUE(thumbnail_db_.GetFavicon(icon_mapping.icon_id, &last_updated,
-                                       &png_icon_data, NULL, NULL));
-  std::string png_icon_data_as_string(png_icon_data->front(),
-      png_icon_data->front() + png_icon_data->size());
-  EXPECT_EQ(1u, png_icon_data_as_string.size());
-  EXPECT_EQ('1', png_icon_data_as_string[0]);
+  std::vector<IconMapping> icon_mappings;
+  EXPECT_TRUE(thumbnail_db_.GetIconMappingsForPageURL(row1.url(), FAVICON,
+                                                      &icon_mappings));
+  EXPECT_EQ(1u, icon_mappings.size());
+  std::vector<FaviconBitmap> favicon_bitmaps;
+  EXPECT_TRUE(thumbnail_db_.GetFaviconBitmaps(icon_mappings[0].icon_id,
+                                              &favicon_bitmaps));
+  EXPECT_EQ(1u, favicon_bitmaps.size());
+  EXPECT_TRUE(favicon_bitmaps[0].bitmap_data.get());
+  EXPECT_EQ(1u, favicon_bitmaps[0].bitmap_data->size());
+  EXPECT_EQ('1', *favicon_bitmaps[0]->front());
 
   // Remove favicon.
   HistoryAndBookmarkRow update_row2;
@@ -1181,8 +1201,8 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row1.url()));
 
-  EXPECT_FALSE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,
-                                                      NULL));
+  EXPECT_FALSE(thumbnail_db_.GetIconMappingsForPageURL(row1.url(), FAVICON,
+                                                       NULL));
 }
 
 TEST_F(AndroidProviderBackendTest, UpdateSearchTermTable) {