diff options
Diffstat (limited to 'chrome/browser/history/history_backend_unittest.cc')
| -rw-r--r-- | chrome/browser/history/history_backend_unittest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index 42d5e87..e59215e 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -1708,8 +1708,7 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) { bitmap_data = new base::RefCountedBytes(data); backend_->MergeFavicon(page_url, icon_url1, FAVICON, bitmap_data, kSmallSize); - // The small favicon bitmap at |icon_url1| should be overwritten and favicon - // sizes should remain unchanged. No notification should be sent. + // The small favicon bitmap at |icon_url1| should be overwritten. icon_mappings.clear(); EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url, &icon_mappings)); @@ -1721,8 +1720,6 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) { EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmap.bitmap_data)); EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size); - EXPECT_EQ(1, num_broadcasted_notifications()); - // 3) Merge favicon for the same icon URL, but a pixel size for which there is // no favicon bitmap. data[0] = 'c'; @@ -1775,7 +1772,7 @@ TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) { // A notification should have been broadcast for each call to SetFavicons() // and MergeFavicon(). - EXPECT_EQ(3, num_broadcasted_notifications()); + EXPECT_EQ(4, num_broadcasted_notifications()); } // Test calling MergeFavicon() when |icon_url| is known to the database but not |