Adds support for saving favicon size into history database.

chrome/browser/history/expire_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 <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
+#include "ui/gfx/favicon_size.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 using content::BrowserThread;
 
 // Filename constants.
 static const FilePath::CharType kHistoryFile[] = FILE_PATH_LITERAL("History");
 static const FilePath::CharType kArchivedHistoryFile[] =
     FILE_PATH_LITERAL("Archived History");
 static const FilePath::CharType kThumbnailFile[] =
     FILE_PATH_LITERAL("Thumbnails");
 
+static const gfx::Size kFaviconRegularSize =
+    gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
+
 // The test must be in the history namespace for the gtest forward declarations
 // to work. It also eliminates a bunch of ugly "history::".
 namespace history {
 
 // ExpireHistoryTest -----------------------------------------------------------
 
 class ExpireHistoryTest : public testing::Test,
                           public BroadcastNotificationDelegate {
  public:
   ExpireHistoryTest()
@@ skipping 140 matching lines @@
 
   // Four times for each visit.
   visit_times[3] = Time::Now();
   visit_times[2] = visit_times[3] - TimeDelta::FromDays(1);
   visit_times[1] = visit_times[3] - TimeDelta::FromDays(2);
   visit_times[0] = visit_times[3] - TimeDelta::FromDays(3);
 
   // Two favicons. The first two URLs will share the same one, while the last
   // one will have a unique favicon.
   FaviconID favicon1 = thumb_db_->AddFavicon(GURL("http://favicon/url1"),
-                                             FAVICON);
+                                             kFaviconRegularSize, FAVICON);
   FaviconID favicon2 = thumb_db_->AddFavicon(GURL("http://favicon/url2"),
-                                             FAVICON);
+                                             kFaviconRegularSize, FAVICON);
 
   // Three URLs.
   URLRow url_row1(GURL("http://www.google.com/1"));
   url_row1.set_last_visit(visit_times[0]);
   url_row1.set_visit_count(1);
   url_ids[0] = main_db_->AddURL(url_row1);
   thumb_db_->AddIconMapping(url_row1.url(), favicon1);
 
   URLRow url_row2(GURL("http://www.google.com/2"));
   url_row2.set_last_visit(visit_times[2]);
@@ skipping 95 matching lines @@
   main_db_->AddVisit(&visit_row4, SOURCE_FIREFOX_IMPORTED);
 }
 
 bool ExpireHistoryTest::HasFavicon(FaviconID favicon_id) {
   if (!thumb_db_.get() || favicon_id == 0)
     return false;
   Time last_updated;
   std::vector<unsigned char> icon_data_unused;
   GURL icon_url;
   return thumb_db_->GetFavicon(favicon_id, &last_updated, &icon_data_unused,
-                               &icon_url, NULL);
+                               &icon_url, NULL, NULL);
 }
 
 FaviconID ExpireHistoryTest::GetFavicon(const GURL& page_url,
                                         IconType icon_type) {
-  IconMapping icon_mapping;
-  thumb_db_->GetIconMappingForPageURL(page_url, icon_type, &icon_mapping);
-  return icon_mapping.icon_id;
+  std::vector<IconMapping> icon_mappings;
+  thumb_db_->GetIconMappingsForPageURL(page_url, icon_type, &icon_mappings);
+
+  if (icon_mappings.empty())
+    return 0;
+
+  return icon_mappings[0].icon_id;
 }
 
 bool ExpireHistoryTest::HasThumbnail(URLID url_id) {
   // TODO(sky): fix this. This test isn't really valid for TopSites. For
   // TopSites we should be checking URL always, not the id.
   URLRow info;
   if (!main_db_->GetURLRow(url_id, &info))
     return false;
   GURL url = info.url();
   scoped_refptr<base::RefCountedMemory> data;
@@ skipping 53 matching lines @@
       EXPECT_NE(notifications_[i].first,
                 chrome::NOTIFICATION_HISTORY_URLS_MODIFIED);
     }
   }
   EXPECT_TRUE(found_delete_notification);
 }
 
 TEST_F(ExpireHistoryTest, DeleteFaviconsIfPossible) {
   // Add a favicon record.
   const GURL favicon_url("http://www.google.com/favicon.ico");
-  FaviconID icon_id = thumb_db_->AddFavicon(favicon_url, FAVICON);
+  FaviconID icon_id = thumb_db_->AddFavicon(favicon_url, kFaviconRegularSize,
+                                            FAVICON);
   EXPECT_TRUE(icon_id);
   EXPECT_TRUE(HasFavicon(icon_id));
 
   // The favicon should be deletable with no users.
   std::set<FaviconID> favicon_set;
   favicon_set.insert(icon_id);
   expirer_.DeleteFaviconsIfPossible(favicon_set);
   EXPECT_FALSE(HasFavicon(icon_id));
 
   // Add back the favicon.
-  icon_id = thumb_db_->AddFavicon(favicon_url, TOUCH_ICON);
+  icon_id = thumb_db_->AddFavicon(favicon_url, kFaviconRegularSize,
+                                  TOUCH_ICON);
   EXPECT_TRUE(icon_id);
   EXPECT_TRUE(HasFavicon(icon_id));
 
   // Add a page that references the favicon.
   URLRow row(GURL("http://www.google.com/2"));
   row.set_visit_count(1);
   EXPECT_TRUE(main_db_->AddURL(row));
   thumb_db_->AddIconMapping(row.url(), icon_id);
 
   // Favicon should not be deletable.
@@ skipping 527 matching lines @@
   main_db_->GetVisitsForURL(url_id, &archived_visits);
   EXPECT_EQ(0U, archived_visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistent FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history