chrome/browser/sync/glue/favicon_cache_unittest.cc - Issue 773103004: Remove NOTIFICATION_HISTORY_URLS_DELETED

Unified Diff: chrome/browser/sync/glue/favicon_cache_unittest.cc

Issue 773103004: Remove NOTIFICATION_HISTORY_URLS_DELETED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed styling issue Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/autocomplete/shortcuts_backend.cc ('K') | « chrome/browser/sync/glue/favicon_cache.cc ('k') | chrome/browser/sync/glue/typed_url_change_processor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/favicon_cache_unittest.cc

diff --git a/chrome/browser/sync/glue/favicon_cache_unittest.cc b/chrome/browser/sync/glue/favicon_cache_unittest.cc

index 9ba409185e78548ecc302f5db4bd584a0529bf2a..ee650e616347af9c953e16faef4b17128ba285bb 100644

--- a/chrome/browser/sync/glue/favicon_cache_unittest.cc

+++ b/chrome/browser/sync/glue/favicon_cache_unittest.cc

@@ -8,8 +8,6 @@

#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"

@@ -1469,13 +1467,9 @@ TEST_F(SyncFaviconCacheTest, HistoryFullClear) {

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);

@@ -1500,13 +1494,13 @@ 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_

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,

@@ -1532,10 +1526,8 @@ TEST_F(SyncFaviconCacheTest, HistorySubsetClear) {

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);