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 301 matching lines @@
   main_db_->AddVisit(&visit_row3, SOURCE_EXTENSION);
 
   VisitRow visit_row4(
       url_id, last_visit_time, 0, content::PAGE_TRANSITION_TYPED, 0);
   main_db_->AddVisit(&visit_row4, SOURCE_FIREFOX_IMPORTED);
 }
 
 bool ExpireHistoryTest::HasFavicon(FaviconID favicon_id) {
   if (!thumb_db_.get() || favicon_id == 0)
     return false;
-  GURL icon_url;
-  return thumb_db_->GetFaviconHeader(favicon_id, &icon_url, NULL, NULL);
+  return thumb_db_->GetFaviconHeader(favicon_id, NULL, 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;
+  if (thumb_db_->GetIconMappingsForPageURL(page_url, icon_type,
+                                           &icon_mappings)) {
+    return icon_mappings[0].icon_id;
+  }
+  return 0;
 }
 
 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 612 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