Prevent bookmarks from going out of sync part 2

chrome/browser/history/history_backend_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 1333 matching lines @@
       one_icon_url_sizes);
   EXPECT_EQ(1u, NumIconMappingsForPageURL(url1, TOUCH_ICON));
   EXPECT_EQ(1u, NumIconMappingsForPageURL(url1, FAVICON));
   EXPECT_EQ(1u, NumIconMappingsForPageURL(url2, FAVICON));
 
   // Add two favicons.
   backend_->SetFavicons(url1, FAVICON, favicon_bitmap_data,
                         two_icon_url_sizes);
   EXPECT_EQ(1u, NumIconMappingsForPageURL(url1, TOUCH_ICON));
   EXPECT_EQ(2u, NumIconMappingsForPageURL(url1, FAVICON));
-
-  // A notification should have been broadcasted for each call to SetFavicons().
-  EXPECT_EQ(6, num_broadcasted_notifications());
 }
 
 // Test that there is no churn in icon mappings from calling
 // SetFavicons() twice with the same |icon_url_sizes| parameter.
 TEST_F(HistoryBackendTest, SetFaviconMappingsForPageDuplicates) {
   const GURL url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon");
   std::vector<FaviconBitmapData> favicon_bitmap_data;
 
   IconURLSizesMap icon_url_sizes;
   icon_url_sizes[icon_url] = GetSizesSmallAndLarge();
 
   backend_->SetFavicons(url, FAVICON, favicon_bitmap_data, icon_url_sizes);
 
-  EXPECT_EQ(1, num_broadcasted_notifications());
-
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       url, FAVICON, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   IconMappingID mapping_id = icon_mappings[0].mapping_id;
 
   backend_->SetFavicons(url, FAVICON, favicon_bitmap_data, icon_url_sizes);
 
   icon_mappings.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       url, FAVICON, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
 
   // The same row in the icon_mapping table should be used for the mapping as
   // before.
   EXPECT_EQ(mapping_id, icon_mappings[0].mapping_id);
-
-  // No notification should have been broadcasted as none of the icon mappings,
-  // favicons or favicon bitmaps were added or removed.
-  EXPECT_EQ(1, num_broadcasted_notifications());
 }
 
 // Test that setting favicons for a page which already has data does the
 // right thing.
 TEST_F(HistoryBackendTest, SetFavicons) {
   const GURL page_url("http://www.google.com/");
   std::vector<FaviconBitmapData> favicon_bitmap_data;
   IconURLSizesMap icon_url_sizes;
 
   // Set |page_url| as having two favicons each available from the web at two
@@ skipping 57 matching lines @@
   favicon_bitmaps.clear();
   EXPECT_TRUE(GetSortedFaviconBitmaps(icon_mappings[1].icon_id,
                                       &favicon_bitmaps));
 
   EXPECT_EQ(2u, favicon_bitmaps.size());
   EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmaps[0].bitmap_data));
   EXPECT_EQ(kSmallSize, favicon_bitmaps[0].pixel_size);
   EXPECT_TRUE(BitmapDataEqual('c', favicon_bitmaps[1].bitmap_data));
   EXPECT_EQ(kLargeSize, favicon_bitmaps[1].pixel_size);
 
-  // A notification should have been broadcasted for both calls to
-  // SetFavicons().
-  EXPECT_EQ(2, num_broadcasted_notifications());
-
   // Change the sizes for which the favicon at icon_url1 is available at from
   // the web. Verify that all the data remains valid.
   icon_url_sizes[icon_url1] = GetSizesTinySmallAndLarge();
   favicon_bitmap_data.clear();
   backend_->SetFavicons(page_url, FAVICON, favicon_bitmap_data,
                         icon_url_sizes);
 
   icon_mappings.clear();
   EXPECT_TRUE(GetSortedIconMappingsForPageURL(page_url, &icon_mappings));
   EXPECT_EQ(2u, icon_mappings.size());
@@ skipping 15 matching lines @@
       icon_mappings[1].icon_id, &icon_url, &icon_type, &favicon_sizes));
   EXPECT_EQ(icon_url2, icon_url);
   EXPECT_EQ(FAVICON, icon_type);
   EXPECT_EQ(GetSizesSmallAndLarge(), favicon_sizes);
 
   favicon_bitmaps.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(
       icon_mappings[1].icon_id, &favicon_bitmaps));
   EXPECT_EQ(2u, favicon_bitmaps.size());
 
-  // No new notification should have been broadcasted as only the favicon sizes
-  // changed as a result of the last call to SetFavicons().
-  EXPECT_EQ(2, num_broadcasted_notifications());
+  // Notifications should have been broadcast for each call to SetFavicons().
+  EXPECT_EQ(3, num_broadcasted_notifications());
 }
 
 // Test that changing the sizes that a favicon is available at from the web
 // deletes stale favicons and favicon bitmaps.
 TEST_F(HistoryBackendTest, SetFaviconsDeleteBitmaps) {
   const GURL page_url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon");
 
   // Set |page_url| as having one favicon with two different sizes.
   IconURLSizesMap icon_url_sizes;
@@ skipping 32 matching lines @@
   EXPECT_EQ(1u, favicon_bitmaps.size());
   EXPECT_EQ(kSmallSize, favicon_bitmaps[0].pixel_size);
 
   // Clear |icon_url_sizes|. SetFavicons() should delete the remaining favicon
   // and its favicon bitmap.
   icon_url_sizes.clear();
   backend_->SetFavicons(page_url, FAVICON, favicon_bitmap_data, icon_url_sizes);
   EXPECT_EQ(0, backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
       icon_url, FAVICON, NULL));
   EXPECT_FALSE(backend_->thumbnail_db_->GetFaviconBitmaps(favicon_id, NULL));
-
-  // A notification should have been broadcasted for each call to SetFavicons().
-  EXPECT_EQ(3, num_broadcasted_notifications());
 }
 
 // Test updating a single favicon bitmap's data via SetFavicons.
 TEST_F(HistoryBackendTest, SetFaviconsReplaceBitmapData) {
 
   const GURL page_url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon");
   IconURLSizesMap icon_url_sizes;
   icon_url_sizes[icon_url] = GetSizesSmall();
 
@@ skipping 14 matching lines @@
 
   FaviconID original_favicon_id =
       backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url, FAVICON,
                                                          NULL);
   EXPECT_NE(0, original_favicon_id);
   FaviconBitmap original_favicon_bitmap;
   EXPECT_TRUE(
       GetOnlyFaviconBitmap(original_favicon_id, &original_favicon_bitmap));
   EXPECT_TRUE(BitmapDataEqual('a', original_favicon_bitmap.bitmap_data));
 
-  EXPECT_EQ(1, num_broadcasted_notifications());
-
   // SetFavicons with identical data but a different bitmap.
   std::vector<unsigned char> updated_data;
   updated_data.push_back('b');
   favicon_bitmap_data[0].bitmap_data =
       base::RefCountedBytes::TakeVector(&updated_data);
   backend_->SetFavicons(page_url, FAVICON, favicon_bitmap_data,
                         icon_url_sizes);
 
   FaviconID updated_favicon_id =
       backend_->thumbnail_db_->GetFaviconIDForFaviconURL(icon_url, FAVICON,
                                                          NULL);
   EXPECT_NE(0, updated_favicon_id);
   FaviconBitmap updated_favicon_bitmap;
   EXPECT_TRUE(
       GetOnlyFaviconBitmap(updated_favicon_id, &updated_favicon_bitmap));
   EXPECT_TRUE(BitmapDataEqual('b', updated_favicon_bitmap.bitmap_data));
 
   // There should be no churn in FaviconIDs or FaviconBitmapIds.
   EXPECT_EQ(original_favicon_bitmap.icon_id, updated_favicon_bitmap.icon_id);
   EXPECT_EQ(original_favicon_bitmap.bitmap_id,
             updated_favicon_bitmap.bitmap_id);
-
-  // No new notification should have been broadcasted as only the favicon
-  // bitmap data changed. No favicon bitmap was added or removed.
-  EXPECT_EQ(1, num_broadcasted_notifications());
 }
 
 // Test that if two pages share the same FaviconID, changing the favicon for
 // one page does not affect the other.
 TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {
   GURL icon_url("http://www.google.com/favicon.ico");
   GURL icon_url_new("http://www.google.com/favicon2.ico");
   GURL page_url1("http://www.google.com");
   GURL page_url2("http://www.google.ca");
 
@@ skipping 60 matching lines @@
       page_url2, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(favicon_id, icon_mappings[0].icon_id);
 
   favicon_bitmaps.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(favicon_id,
                                                          &favicon_bitmaps));
   EXPECT_EQ(2u, favicon_bitmaps.size());
 
   // A notification should have been broadcast for each call to SetFavicons()
-  // and UpdateFaviconMappingsAndFetch().
+  // and each call to UpdateFaviconMappingsAndFetch().
   EXPECT_EQ(3, num_broadcasted_notifications());
 }
 
+// Test that there is no churn from calling UpdateFaviconMappingsAndFetch()
+// for an icon URL which is already mapped to the passed in page URL.
+TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoChange) {
+  GURL page_url("http://www.google.com");
+  GURL icon_url("http://www.google.com/favicon.ico");
+  std::vector<FaviconBitmapData> favicon_bitmap_data;
+
+  IconURLSizesMap icon_url_sizes;
+  icon_url_sizes[icon_url] = GetSizesSmall();
+
+  backend_->SetFavicons(page_url, FAVICON, favicon_bitmap_data,
+                        icon_url_sizes);
+
+  FaviconID icon_id = backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
+      icon_url, FAVICON, NULL);
+  EXPECT_NE(0, icon_id);
+  EXPECT_EQ(1, num_broadcasted_notifications());
+
+  std::vector<GURL> icon_urls;
+  icon_urls.push_back(icon_url);
+  scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest(
+      base::Bind(&HistoryBackendTest::OnFaviconResults,
+                 base::Unretained(this))));
+  HistoryBackendCancelableRequest cancellable_request;
+  cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request);
+  backend_->UpdateFaviconMappingsAndFetch(request, page_url, icon_urls,
+      FAVICON, kSmallSize.width(), GetScaleFactors1x2x());
+
+  EXPECT_EQ(icon_id, backend_->thumbnail_db_->GetFaviconIDForFaviconURL(
+      icon_url, FAVICON, NULL));
+
+  // No notification should have been broadcast as no icon mapping, favicon,
+  // or favicon bitmap was updated, added or removed.
+  EXPECT_EQ(1, num_broadcasted_notifications());
+}
+
 // Test repeatedly calling MergeFavicon(). |page_url| is initially not known
 // to the database.
 TEST_F(HistoryBackendTest, MergeFaviconPageURLNotInDB) {
   GURL page_url("http://www.google.com");
   GURL fake_icon_url = page_url;
 
   std::vector<unsigned char> data;
   data.push_back('a');
   scoped_refptr<base::RefCountedBytes> bitmap_data(
       new base::RefCountedBytes(data));
@@ skipping 11 matching lines @@
   FaviconSizes favicon_sizes;
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconHeader(
       icon_mappings[0].icon_id, NULL, NULL, &favicon_sizes));
   EXPECT_EQ(GetDefaultFaviconSizes(), favicon_sizes);
 
   FaviconBitmap favicon_bitmap;
   EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));
   EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmap.bitmap_data));
   EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);
 
-  EXPECT_EQ(1, num_broadcasted_notifications());
-
   data[0] = 'b';
   bitmap_data = new base::RefCountedBytes(data);
   backend_->MergeFavicon(page_url, FAVICON, bitmap_data, kSmallSize);
 
   // |page_url| should still have a single favicon bitmap. The bitmap data
   // should be updated.
   icon_mappings.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url,
       &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(fake_icon_url, icon_mappings[0].icon_url);
 
   favicon_sizes.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconHeader(
       icon_mappings[0].icon_id, NULL, NULL, &favicon_sizes));
   EXPECT_EQ(GetDefaultFaviconSizes(), favicon_sizes);
 
   EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));
   EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmap.bitmap_data));
   EXPECT_EQ(kSmallSize, favicon_bitmap.pixel_size);
 
-  // No new notification should have been broadcasted as only the favicon
-  // bitmap data changed. No favicon bitmap was added or removed.
-  EXPECT_EQ(1, num_broadcasted_notifications());
-
   // Merge a large favicon bitmap.
   data[0] = 'c';
   bitmap_data = new base::RefCountedBytes(data);
   backend_->MergeFavicon(page_url, FAVICON, bitmap_data, kLargeSize);
 
   // There should be a second favicon bitmap at |fake_icon_url|.
   icon_mappings.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url,
       &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(fake_icon_url, icon_mappings[0].icon_url);
 
   favicon_sizes.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconHeader(
       icon_mappings[0].icon_id, NULL, NULL, &favicon_sizes));
   EXPECT_EQ(GetDefaultFaviconSizes(), favicon_sizes);
 
   std::vector<FaviconBitmap> favicon_bitmaps;
   EXPECT_TRUE(GetSortedFaviconBitmaps(icon_mappings[0].icon_id,
                                       &favicon_bitmaps));
 
   EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmaps[0].bitmap_data));
   EXPECT_EQ(kSmallSize, favicon_bitmaps[0].pixel_size);
   EXPECT_TRUE(BitmapDataEqual('c', favicon_bitmaps[1].bitmap_data));
   EXPECT_EQ(kLargeSize, favicon_bitmaps[1].pixel_size);
 
-  EXPECT_EQ(2, num_broadcasted_notifications());
+  // A notification should have been broadcast for each call to MergeFavicon().
+  EXPECT_EQ(3, num_broadcasted_notifications());
 }
 
 // Test calling MergeFavicon() when |page_url| is known to the database.
 TEST_F(HistoryBackendTest, MergeFaviconPageURLInDB) {
   GURL page_url("http://www.google.com");
   GURL fake_icon_url = page_url;
   GURL icon_url("http://www.google.com/favicon.ico");
 
   IconURLSizesMap icon_url_sizes;
   icon_url_sizes[icon_url] = GetSizesSmallAndLarge();
@@ skipping 18 matching lines @@
   EXPECT_EQ(GetSizesSmallAndLarge(), favicon_sizes);
 
   std::vector<FaviconBitmap> favicon_bitmaps;
   EXPECT_TRUE(GetSortedFaviconBitmaps(icon_mappings[0].icon_id,
                                       &favicon_bitmaps));
   EXPECT_TRUE(BitmapDataEqual('a', favicon_bitmaps[0].bitmap_data));
   EXPECT_EQ(kSmallSize, favicon_bitmaps[0].pixel_size);
   EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmaps[1].bitmap_data));
   EXPECT_EQ(kLargeSize, favicon_bitmaps[1].pixel_size);
 
-  EXPECT_EQ(1, num_broadcasted_notifications());
-
   // Merge small favicon.
   std::vector<unsigned char> data;
   data.push_back('c');
   scoped_refptr<base::RefCountedBytes> bitmap_data(
       new base::RefCountedBytes(data));
   backend_->MergeFavicon(page_url, FAVICON, bitmap_data, kSmallSize);
 
   // The small favicon bitmap at |icon_url| should have been overwritten.
   icon_mappings.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(page_url,
       &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(icon_url, icon_mappings[0].icon_url);
 
   favicon_sizes.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconHeader(
       icon_mappings[0].icon_id, NULL, NULL, &favicon_sizes));
   EXPECT_EQ(GetSizesSmallAndLarge(), favicon_sizes);
 
   favicon_bitmaps.clear();
   EXPECT_TRUE(GetSortedFaviconBitmaps(icon_mappings[0].icon_id,
                                       &favicon_bitmaps));
   EXPECT_TRUE(BitmapDataEqual('c', favicon_bitmaps[0].bitmap_data));
   EXPECT_EQ(kSmallSize, favicon_bitmaps[0].pixel_size);
   EXPECT_TRUE(BitmapDataEqual('b', favicon_bitmaps[1].bitmap_data));
   EXPECT_EQ(kLargeSize, favicon_bitmaps[1].pixel_size);
 
-  // No new notification should have been broadcasted as only the favicon
-  // bitmap data changed. No favicon bitmap was added or removed.
-  EXPECT_EQ(1, num_broadcasted_notifications());
-
   // Merge favicon with pixel size for which there is no favicon bitmap.
   data[0] = 'd';
   bitmap_data = new base::RefCountedBytes(data);
   backend_->MergeFavicon(page_url, FAVICON, bitmap_data, kTinySize);
 
   // A favicon with |fake_icon_url| should have been created with the tiny
   // favicon bitmap.
   icon_mappings.clear();
   EXPECT_TRUE(GetSortedIconMappingsForPageURL(page_url, &icon_mappings));
   EXPECT_EQ(2u, icon_mappings.size());
@@ skipping 14 matching lines @@
   EXPECT_TRUE(GetOnlyFaviconBitmap(icon_mappings[0].icon_id, &favicon_bitmap));
   EXPECT_TRUE(BitmapDataEqual('d', favicon_bitmap.bitmap_data));
   EXPECT_EQ(kTinySize, favicon_bitmap.pixel_size);
 
   // The favicon at |icon_url| should still have two favicon bitmaps.
   favicon_bitmaps.clear();
   EXPECT_TRUE(backend_->thumbnail_db_->GetFaviconBitmaps(
       icon_mappings[1].icon_id, &favicon_bitmaps));
   EXPECT_EQ(2u, favicon_bitmaps.size());
 
-  // A favicon was added, expect a notification to have been broadcasted.
-  EXPECT_EQ(2, num_broadcasted_notifications());
+  // A notification should have been broadcast for each call to SetFavicons()
+  // and MergeFavicon().
+  EXPECT_EQ(3, num_broadcasted_notifications());
 }
 
 // Test that MergeFavicon() does not map more than |kMaxFaviconsPerPage| to a
 // page URL.
 TEST_F(HistoryBackendTest, MergeFaviconMaxFaviconsPerPage) {
   GURL page_url("http://www.google.com");
   std::string icon_url_string("http://www.google.com/favicon?");
   size_t replace_index = icon_url_string.size() - 1;
 
   std::vector<unsigned char> data;
@@ skipping 743 matching lines @@
 
     backend_->DeleteURL(url);
     backend_->AddPageNoVisitForBookmark(url, string16());
     backend_->GetURL(url, &row);
     EXPECT_EQ(url, row.url());
     EXPECT_EQ(UTF8ToUTF16(url.spec()), row.title());
     EXPECT_EQ(0, row.visit_count());
 }
 
 }  // namespace history