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

Unified Diff: chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

Issue 10910212: Enable hidpi favicons for favicons history does not know about (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/favicon/favicon_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index b9e81813dee455a5f451932932e52ff339e12810..008304a15d1eca7942206d10b3d60577bb426552 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -197,8 +197,8 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
HistoryServiceFactory::GetForProfile(&profile, Profile::EXPLICIT_ACCESS)->
AddPage(url1, history::SOURCE_BROWSED);
FaviconServiceFactory::GetForProfile(
- &profile, Profile::EXPLICIT_ACCESS)->SetFavicon(
- url1, url1_favicon, icon_data, history::FAVICON);
+ &profile, Profile::EXPLICIT_ACCESS)->SetFavicons(
+ url1, url1_favicon, history::FAVICON, gfx::Image(bitmap));
message_loop.RunAllPending();
const BookmarkNode* f2 = model->AddFolder(f1, 1, f2_title);
model->AddURLWithCreationTime(f2, 0, url2_title, url2, t2);
@@ -220,10 +220,9 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
message_loop.Run();
// Clear favicon so that it would be read from file.
- std::vector<unsigned char> empty_data;
FaviconServiceFactory::GetForProfile(
- &profile, Profile::EXPLICIT_ACCESS)->SetFavicon(
- url1, url1_favicon, empty_data, history::FAVICON);
+ &profile, Profile::EXPLICIT_ACCESS)->SetFavicons(
+ url1, url1_favicon, history::FAVICON, gfx::Image());
message_loop.RunAllPending();
// Read the bookmarks back in.
« no previous file with comments | « no previous file | chrome/browser/favicon/favicon_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698