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

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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 27 matching lines @@
 // 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 {
 
 // data we'll put into the thumbnail database
 static const unsigned char blob1[] =
     "12346102356120394751634516591348710478123649165419234519234512349134";
 
+static const gfx::Size kSmallSize = gfx::Size(16, 16);
+static const gfx::Size kLargeSize = gfx::Size(48, 48);
+
 }  // namepace
 
 namespace history {
 
 class HistoryBackendTest;
 
 // This must be a separate object since HistoryBackend manages its lifetime.
 // This just forwards the messages we're interested in to the test object.
 class HistoryBackendTestDelegate : public HistoryBackend::Delegate {
  public:
@@ skipping 222 matching lines @@
 #define MAYBE_Loaded Loaded
 #endif // defined(OS_WIN)
 TEST_F(HistoryBackendTest, MAYBE_Loaded) {
   ASSERT_TRUE(backend_.get());
   ASSERT_TRUE(loaded_);
 }
 
 TEST_F(HistoryBackendTest, DeleteAll) {
   ASSERT_TRUE(backend_.get());
 
-  // Add two favicons, use the characters '1' and '2' for the image data. Note
-  // that we do these in the opposite order. This is so the first one gets ID
-  // 2 autoassigned to the database, which will change when the other one is
-  // deleted. This way we can test that updating works properly.
+  // Add two favicons, each with two bitmaps. Note that we add favicon2 before
+  // adding favicon1. This is so that favicon1 one gets ID 2 autoassigned to
+  // the database, which will change when the other one is deleted. This way
+  // we can test that updating works properly.
   GURL favicon_url1("http://www.google.com/favicon.ico");
   GURL favicon_url2("http://news.google.com/favicon.ico");
   FaviconID favicon2 = backend_->thumbnail_db_->AddFavicon(favicon_url2,
                                                            FAVICON);
   FaviconID favicon1 = backend_->thumbnail_db_->AddFavicon(favicon_url1,
                                                            FAVICON);
 
   std::vector<unsigned char> data;
-  data.push_back('1');
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(favicon1,
-      new base::RefCountedBytes(data), Time::Now()));
+  data.push_back('a');
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon1,
+      new base::RefCountedBytes(data), Time::Now(), kSmallSize));
+  data[0] = 'b';
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon1,
+     new base::RefCountedBytes(data), Time::Now(), kLargeSize));
 
-  data[0] = '2';
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
-                  favicon2, new base::RefCountedBytes(data), Time::Now()));
+  data[0] = 'c';
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon2,
+      new base::RefCountedBytes(data), Time::Now(), kSmallSize));
+  data[0] = 'd';
+  EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon2,
+     new base::RefCountedBytes(data), Time::Now(), kLargeSize));
 
   // First visit two URLs.
   URLRow row1(GURL("http://www.google.com/"));
   row1.set_visit_count(2);
   row1.set_typed_count(1);
   row1.set_last_visit(Time::Now());
   backend_->thumbnail_db_->AddIconMapping(row1.url(), favicon1);
 
   URLRow row2(GURL("http://news.google.com/"));
   row2.set_visit_count(1);
@@ skipping 75 matching lines @@
   VisitVector all_visits;
   backend_->db_->GetAllVisitsInRange(Time(), Time(), 0, &all_visits);
   ASSERT_EQ(0U, all_visits.size());
 
   // All thumbnails should be deleted.
   std::vector<unsigned char> out_data;
   EXPECT_FALSE(backend_->thumbnail_db_->GetPageThumbnail(outrow1.id(),
                                                          &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 bitmaps for the first URL only. We
+  // look them up by favicon URL since the IDs may have changed.
   FaviconID out_favicon1 = backend_->thumbnail_db_->
       GetFaviconIDForFaviconURL(favicon_url1, FAVICON, NULL);
   EXPECT_TRUE(out_favicon1);
+
+  std::vector<FaviconBitmap> favicon_bitmaps;
+  EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(
+      out_favicon1, &favicon_bitmaps));
+  ASSERT_EQ(2u, favicon_bitmaps.size());
+
+  FaviconBitmap favicon_bitmap1 = favicon_bitmaps[0];
+  FaviconBitmap favicon_bitmap2 = favicon_bitmaps[1];
+
+  // Bitmaps do not need to be in particular order.
+  if (favicon_bitmap1.pixel_size == kLargeSize) {
+    FaviconBitmap tmp_favicon_bitmap = favicon_bitmap1;
+    favicon_bitmap1 = favicon_bitmap2;
+    favicon_bitmap2 = tmp_favicon_bitmap;
+  }
+
+  EXPECT_EQ('a', *favicon_bitmap1.bitmap_data->front());
+  EXPECT_EQ(kSmallSize, favicon_bitmap1.pixel_size);
+
+  EXPECT_EQ('b', *favicon_bitmap2.bitmap_data->front());
+  EXPECT_EQ(kLargeSize, favicon_bitmap2.pixel_size);
+
   FaviconID out_favicon2 = backend_->thumbnail_db_->
       GetFaviconIDForFaviconURL(favicon_url2, FAVICON, NULL);
   EXPECT_FALSE(out_favicon2) << "Favicon not deleted";
 
   // The remaining URL should still reference the same favicon, even if its
   // ID has changed.
   EXPECT_EQ(out_favicon1, GetFavicon(outrow1.url(), FAVICON));
 
   // The first URL should still be bookmarked.
   EXPECT_TRUE(bookmark_model_.IsBookmarked(row1.url()));
@@ skipping 59 matching lines @@
   backend_->text_database_->GetTextMatches(UTF8ToUTF16("Body"),
                                            QueryOptions(),
                                            &text_matches,
                                            &first_time_searched);
   EXPECT_EQ(0U, text_matches.size());
 }
 
 TEST_F(HistoryBackendTest, URLsNoLongerBookmarked) {
   GURL favicon_url1("http://www.google.com/favicon.ico");
   GURL favicon_url2("http://news.google.com/favicon.ico");
-  FaviconID favicon2 = backend_->thumbnail_db_->AddFavicon(favicon_url2,
-                                                           FAVICON);
-  FaviconID favicon1 = backend_->thumbnail_db_->AddFavicon(favicon_url1,
-                                                           FAVICON);
 
   std::vector<unsigned char> data;
   data.push_back('1');
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
-                  favicon1, new base::RefCountedBytes(data), Time::Now()));
+  FaviconID favicon1 = backend_->thumbnail_db_->AddFavicon(
+      favicon_url1,
+      FAVICON,
+      "0 0",
+      new base::RefCountedBytes(data),
+      Time::Now(),
+      gfx::Size());
 
   data[0] = '2';
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(
-                  favicon2, new base::RefCountedBytes(data), Time::Now()));
+  FaviconID favicon2 = backend_->thumbnail_db_->AddFavicon(
+      favicon_url2,
+      FAVICON,
+      "0 0",
+      new base::RefCountedBytes(data),
+      Time::Now(),
+      gfx::Size());
 
   // First visit two URLs.
   URLRow row1(GURL("http://www.google.com/"));
   row1.set_visit_count(2);
   row1.set_typed_count(1);
   row1.set_last_visit(Time::Now());
   EXPECT_TRUE(backend_->thumbnail_db_->AddIconMapping(row1.url(), favicon1));
 
   URLRow row2(GURL("http://news.google.com/"));
   row2.set_visit_count(1);
@@ skipping 144 matching lines @@
   AddClientRedirect(url_b, url_c, true, base::Time(),
                     &transition1, &transition2);
   EXPECT_FALSE(transition1 & content::PAGE_TRANSITION_CHAIN_END);
   EXPECT_TRUE(transition2 & content::PAGE_TRANSITION_CHAIN_END);
 }
 
 TEST_F(HistoryBackendTest, ImportedFaviconsTest) {
   // Setup test data - two Urls in the history, one with favicon assigned and
   // one without.
   GURL favicon_url1("http://www.google.com/favicon.ico");
-  FaviconID favicon1 = backend_->thumbnail_db_->AddFavicon(favicon_url1,
-                                                           FAVICON);
   std::vector<unsigned char> data;
   data.push_back('1');
-  EXPECT_TRUE(backend_->thumbnail_db_->SetFavicon(favicon1,
-      base::RefCountedBytes::TakeVector(&data), Time::Now()));
+  FaviconID favicon1 = backend_->thumbnail_db_->AddFavicon(
+      favicon_url1,
+      FAVICON,
+      "0 0",
+      base::RefCountedBytes::TakeVector(&data),
+      Time::Now(),
+      gfx::Size());
   URLRow row1(GURL("http://www.google.com/"));
   row1.set_visit_count(1);
   row1.set_last_visit(Time::Now());
   EXPECT_TRUE(backend_->thumbnail_db_->AddIconMapping(row1.url(), favicon1));
 
   URLRow row2(GURL("http://news.google.com/"));
   row2.set_visit_count(1);
   row2.set_last_visit(Time::Now());
   URLRows rows;
   rows.push_back(row1);
@@ skipping 886 matching lines @@
 
     backend_->DeleteURL(url);
     backend_->AddPageNoVisitForBookmark(url, string16());
     backend_->GetURL(url, &row);
     EXPECT_EQ(url, row.url());
     EXPECT_EQ(UTF8ToUTF16(url.spec()), row.title());
     EXPECT_EQ(0, row.visit_count());
 }
 
 }  // namespace history