Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/sync/glue/favicon_cache_unittest.cc

 // Copyright (c) 2013 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 "chrome/browser/sync/glue/favicon_cache.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/history/history_notifications.h"
 #include "content/public/browser/notification_service.h"
 #include "sync/api/attachments/attachment_id.h"
 #include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/api/time.h"
 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test.h"
 #include "sync/protocol/favicon_image_specifics.pb.h"
 #include "sync/protocol/favicon_tracking_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 1439 matching lines @@
         tracking_specifics,
         base::Time(),
         syncer::AttachmentIdList(),
         syncer::AttachmentServiceProxyForTest::Create()));
   }
 
   SetUpInitialSync(initial_image_data, initial_tracking_data);
   syncer::SyncChangeList changes = processor()->GetAndResetChangeList();
   EXPECT_TRUE(changes.empty());
 
-  history::URLsDeletedDetails deletions;
-  deletions.all_history = true;
   EXPECT_EQ((unsigned long)kFaviconBatchSize, GetFaviconCount());
-  content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-        content::Source<Profile>(NULL),
-        content::Details<history::URLsDeletedDetails>(&deletions));
+  cache()->OnURLsDeleted(nullptr, true, false, history::URLRows(),
+                         std::set<GURL>());
   EXPECT_EQ(0U, GetFaviconCount());
   changes = processor()->GetAndResetChangeList();
   ASSERT_EQ(changes.size(), (unsigned long)kFaviconBatchSize*2);
   syncer::SyncChangeList changes_1, changes_2;
   for (int i = 0; i < kFaviconBatchSize; ++i) {
     changes_1.push_back(changes[i]);
     changes_2.push_back(changes[i + kFaviconBatchSize]);
   }
   VerifyChanges(syncer::FAVICON_IMAGES,
                 expected_deletions,
                 expected_icons,
                 changes_1);
   VerifyChanges(syncer::FAVICON_TRACKING,
                 expected_deletions,
                 expected_icons,
                 changes_2);
 }
 
 // A partial history clear notification should result in the expired favicons
 // also being deleted from sync.
 TEST_F(SyncFaviconCacheTest, HistorySubsetClear) {
   syncer::SyncDataList initial_image_data, initial_tracking_data;
   std::vector<int> expected_icons;
   std::vector<syncer::SyncChange::SyncChangeType> expected_deletions;
-  history::URLsDeletedDetails deletions;
+  std::set<GURL> favicon_urls;

[pavely, 2014/12/11 19:45:36]

Could you rename this variable to favicon_urls_to_delete.

[nshaik, 2014/12/12 05:40:56]

Done.

   for (int i = 0; i < kFaviconBatchSize; ++i) {
     TestFaviconData test_data = BuildFaviconData(i);
     if (i < kFaviconBatchSize/2) {
       expected_icons.push_back(i);
       expected_deletions.push_back(syncer::SyncChange::ACTION_DELETE);
-      deletions.favicon_urls.insert(test_data.icon_url);
+      favicon_urls.insert(test_data.icon_url);
     }
     sync_pb::EntitySpecifics image_specifics, tracking_specifics;
     FillImageSpecifics(test_data,
                        image_specifics.mutable_favicon_image());
     initial_image_data.push_back(syncer::SyncData::CreateRemoteData(
         1,
         image_specifics,
         base::Time(),
         syncer::AttachmentIdList(),
         syncer::AttachmentServiceProxyForTest::Create()));
     FillTrackingSpecifics(BuildFaviconData(i),
                           tracking_specifics.mutable_favicon_tracking());
     initial_tracking_data.push_back(syncer::SyncData::CreateRemoteData(
         1,
         tracking_specifics,
         base::Time(),
         syncer::AttachmentIdList(),
         syncer::AttachmentServiceProxyForTest::Create()));
   }
 
   SetUpInitialSync(initial_image_data, initial_tracking_data);
   syncer::SyncChangeList changes = processor()->GetAndResetChangeList();
   EXPECT_TRUE(changes.empty());
 
   EXPECT_EQ((unsigned long)kFaviconBatchSize, GetFaviconCount());
-  content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-        content::Source<Profile>(NULL),
-        content::Details<history::URLsDeletedDetails>(&deletions));
+  cache()->OnURLsDeleted(nullptr, false, false, history::URLRows(),
+                         favicon_urls);
   EXPECT_EQ((unsigned long)kFaviconBatchSize/2, GetFaviconCount());
   changes = processor()->GetAndResetChangeList();
   ASSERT_EQ(changes.size(), (unsigned long)kFaviconBatchSize);
   syncer::SyncChangeList changes_1, changes_2;
   for (size_t i = 0; i < kFaviconBatchSize/2; ++i) {
     changes_1.push_back(changes[i]);
     changes_2.push_back(changes[i + kFaviconBatchSize/2]);
   }
   VerifyChanges(syncer::FAVICON_IMAGES,
                 expected_deletions,
@@ skipping 382 matching lines @@
   EXPECT_EQ(changes[4].change_type(), syncer::SyncChange::ACTION_ADD);
   EXPECT_EQ(changes[4].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
   EXPECT_EQ(kMaxSyncFavicons, GetFaviconId(changes[4]));
   // Expire tracking for favicon[0].
   EXPECT_EQ(changes[5].change_type(), syncer::SyncChange::ACTION_DELETE);
   EXPECT_EQ(changes[5].sync_data().GetDataType(), syncer::FAVICON_TRACKING);
   EXPECT_EQ(0, GetFaviconId(changes[5]));
 }
 
 }  // namespace browser_sync