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

Unified Diff: chrome/browser/ui/toolbar/back_forward_menu_model_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 | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
index d50dcff888adec00b2da58639277f30973194e2d..bfb000d44a1640dfa0b4ed125c888da6b1edea6a 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
@@ -515,8 +515,6 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
back_model.SetMenuModelDelegate(&favicon_delegate);
SkBitmap new_icon_bitmap(CreateBitmap(SK_ColorRED));
- std::vector<unsigned char> icon_data;
- gfx::PNGCodec::EncodeBGRASkBitmap(new_icon_bitmap, false, &icon_data);
GURL url1 = GURL("http://www.a.com/1");
GURL url2 = GURL("http://www.a.com/2");
@@ -531,8 +529,8 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) {
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(new_icon_bitmap));
// Will return the current icon (default) but start an anync call
// to retrieve the favicon from the favicon service.
« no previous file with comments | « chrome/browser/sync/glue/bookmark_change_processor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698