Cleanup thumbnail database part #2

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 187 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);
+      FAVICON, GetDefaultFaviconSizes());
   FaviconID favicon2 = thumb_db_->AddFavicon(GURL("http://favicon/url2"),
-                                             FAVICON);
+      FAVICON, GetDefaultFaviconSizes());
 
   // 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 175 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, FAVICON,
+      GetDefaultFaviconSizes());
   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, TOUCH_ICON,
+      GetDefaultFaviconSizes());
   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