| 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.
|
|
|