Changes favicon database to support storing bitmaps of different sizes for the same icon_url

chrome/browser/history/history_backend_unittest.cc

Index: chrome/browser/history/history_backend_unittest.cc
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index 20a59d262495a7d58c705fdd8b7d5e78ae58c299..e6dcd1fbd79138b94fb22dc4f438fb8932a458a1 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -300,11 +300,11 @@ TEST_F(HistoryBackendTest, DeleteAll) {
 
   std::vector<unsigned char> data;
   data.push_back('1');
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(favicon1,
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconFrame(favicon1,
       new base::RefCountedBytes(data), Time::Now()));
 
   data[0] = '2';
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconFrame(
                   favicon2, new base::RefCountedBytes(data), Time::Now()));
 
   // First visit two URLs.
@@ -401,11 +401,15 @@ TEST_F(HistoryBackendTest, DeleteAll) {
                                                          &out_data));
   EXPECT_FALSE(backend_->thumbnail_db_->GetPageThumbnail(row2_id, &out_data));
 
-  // We should have a favicon for the first URL only. We look them up by favicon
-  // URL since the IDs may hav changed.
+  // We should have a favicon and favicon frame for the first URL only. We
+  // look them up by favicon URL since the IDs may hav changed.
   FaviconID out_favicon1 = backend_->thumbnail_db_->
       GetFaviconIDForFaviconURL(favicon_url1, FAVICON, NULL);
   EXPECT_TRUE(out_favicon1);
+  std::vector<unsigned char> result_data;
+  EXPECT_TRUE(backend_->thumbnail_db_->
+              GetFaviconFrame(out_favicon1, NULL, &result_data));
+  EXPECT_EQ(data, result_data);
   FaviconID out_favicon2 = backend_->thumbnail_db_->
       GetFaviconIDForFaviconURL(favicon_url2, FAVICON, NULL);
   EXPECT_FALSE(out_favicon2) << "Favicon not deleted";
@@ -492,11 +496,11 @@ TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
 
   std::vector<unsigned char> data;
   data.push_back('1');
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconFrame(
                   favicon1, new base::RefCountedBytes(data), Time::Now()));
 
   data[0] = '2';
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconFrame(
                   favicon2, new base::RefCountedBytes(data), Time::Now()));
 
   // First visit two URLs.
@@ -666,7 +670,7 @@ TEST_F(HistoryBackendTest, ImportedFaviconsTest) {
                                                            FAVICON);
   std::vector<unsigned char> data;
   data.push_back('1');
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(favicon1,
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconFrame(favicon1,
       base::RefCountedBytes::TakeVector(&data), Time::Now()));
   URLRow row1(GURL("http://www.google.com/"));
   row1.set_visit_count(1);