Adds support for saving favicon size into history database.

chrome/browser/history/android/android_provider_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/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 230 matching lines @@
   URLRow url_row;
 
   ASSERT_TRUE(history_backend->GetURL(url1, &url_row));
   url_id1 = url_row.id();
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
 
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  history_backend->SetFavicon(url2,
-                              GURL(),
-                              new base::RefCountedBytes(data),
-                              FAVICON);
+  history::FaviconBitmapData bitmap_data_element;
+  bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
+  bitmap_data_element.pixel_size = gfx::Size();
+  bitmap_data_element.icon_url = GURL();
+  std::vector<history::FaviconBitmapData> favicon_bitmap_data;
+  favicon_bitmap_data.push_back(bitmap_data_element);
+
+  FaviconSizes favicon_sizes;
+  favicon_sizes.push_back(gfx::Size());
+  IconURLSizesMap icon_url_sizes;
+  icon_url_sizes[GURL()] = favicon_sizes;
+
+  history_backend->SetFavicons(url2,
+                               FAVICON,
+                               favicon_bitmap_data,
+                               icon_url_sizes);
   history_backend->Closing();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(file_util::PathExists(history_db_name_));
   ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ skipping 122 matching lines @@
   ASSERT_TRUE(history_backend->UpdateURL(url_id1, url_row));
 
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
   url_row.set_title(title2);
   ASSERT_TRUE(history_backend->UpdateURL(url_id2, url_row));
 
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  history_backend->SetFavicon(url2,
-                              GURL(),
-                              new base::RefCountedBytes(data),
-                              FAVICON);
+  history::FaviconBitmapData bitmap_data_element;
+  bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
+  bitmap_data_element.pixel_size = gfx::Size();
+  bitmap_data_element.icon_url = GURL();
+  std::vector<history::FaviconBitmapData> favicon_bitmap_data;
+  favicon_bitmap_data.push_back(bitmap_data_element);
+
+  FaviconSizes favicon_sizes;
+  favicon_sizes.push_back(gfx::Size());
+  IconURLSizesMap icon_url_sizes;
+  icon_url_sizes[GURL()] = favicon_sizes;
+
+  history_backend->SetFavicons(url2,
+                               FAVICON,
+                               favicon_bitmap_data,
+                               icon_url_sizes);
   history_backend->Closing();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(file_util::PathExists(history_db_name_));
   ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ skipping 1340 matching lines @@
   // Query by folder=1, the row2 should returned.
   statement.reset(backend->QueryHistoryAndBookmarks(
       projections, std::string("folder=1"), std::vector<string16>(),
       std::string("url ASC")));
   ASSERT_TRUE(statement->statement()->Step());
   EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0)));
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 }  // namespace history