Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(893)

Unified Diff: chrome/browser/history/expire_history_backend_unittest.cc

Issue 10915146: Cleanup thumbnail database part #2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/history/history_backend_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/expire_history_backend_unittest.cc
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 1bfac22b1c31bfab8d3fb1ca24603fa1d71a5bd8..d4475e51168e4b748a9eda3ab7119adec5dc6c2c 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -205,9 +205,9 @@ void ExpireHistoryTest::AddExampleData(URLID url_ids[3], Time visit_times[4]) {
// 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"));
@@ -403,7 +403,8 @@ void ExpireHistoryTest::EnsureURLInfoGone(const URLRow& row) {
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));
@@ -414,7 +415,8 @@ TEST_F(ExpireHistoryTest, DeleteFaviconsIfPossible) {
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));
« no previous file with comments | « no previous file | chrome/browser/history/history_backend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698