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 7907ee04a7f6ff64f803e64b5601c4356b032577..eda2967d914ba9637bb80621f88cfa1d404c02ad 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 = base::RefCountedBytes::TakeVector(&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 = base::RefCountedBytes::TakeVector(&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();
   }
 
@@ -497,7 +517,7 @@ TEST_F(AndroidProviderBackendTest, InsertHistoryAndBookmark) {
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ -606,7 +626,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) {
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ -795,7 +815,7 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) {
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ -975,7 +995,7 @@ TEST_F(AndroidProviderBackendTest, UpdateVisitCount) {
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ -1056,7 +1076,7 @@ TEST_F(AndroidProviderBackendTest, UpdateLastVisitTime) {
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ -1138,7 +1158,7 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) {
   // Set favicon.
   std::vector<unsigned char> data;
   data.push_back('1');
-  update_row1.set_favicon(data);
+  update_row1.set_favicon(base::RefCountedBytes::TakeVector(&data));
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
@@ -1151,13 +1171,18 @@ 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;
-  std::vector<unsigned char> png_icon_data;
-  EXPECT_TRUE(thumbnail_db_.GetFavicon(icon_mapping.icon_id, &last_updated,
-                                       &png_icon_data, NULL, NULL));
+  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());
+  std::vector<unsigned char> png_icon_data(
+      favicon_bitmaps[0].bitmap_data->front(),
+      favicon_bitmaps[0].bitmap_data->front() +
+          favicon_bitmaps[0].bitmap_data->size());
   EXPECT_EQ(data, png_icon_data);
 
   // Remove favicon.
@@ -1178,8 +1203,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) {