| Index: chrome/browser/favicon/favicon_handler_unittest.cc
|
| diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc
|
| index 5671b73109e6b6bf26348c5cf490e5cf480adb78..40d025515a81e25bf61fc515e200b36332065938 100644
|
| --- a/chrome/browser/favicon/favicon_handler_unittest.cc
|
| +++ b/chrome/browser/favicon/favicon_handler_unittest.cc
|
| @@ -974,6 +974,8 @@ TEST_F(FaviconHandlerTest, UpdateDuringDownloading) {
|
| EXPECT_FALSE(download_handler->HasDownload());
|
| }
|
|
|
| +#if !defined(OS_ANDROID)
|
| +
|
| // Test the favicon which is selected when the web page provides several
|
| // favicons and none of the favicons are cached in history.
|
| // The goal of this test is to be more of an integration test than
|
| @@ -1063,6 +1065,8 @@ TEST_F(FaviconHandlerTest, MultipleFavicons) {
|
| handler4.GetEntry()->GetFavicon().url);
|
| }
|
|
|
| +#endif
|
| +
|
| static BrowserContextKeyedService* BuildFaviconService(
|
| content::BrowserContext* profile) {
|
| return new FaviconService(NULL);
|
|
|