Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3446)

Unified Diff: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

Issue 651193002: Remove NOTIFICATION_HISTORY_URL_VISITED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@373326.2
Patch Set: Address comments Created 6 years, 2 months 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
Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index c5092e44c033d2d5562717bf60377fcc09a083e5..1cf59ebaa14f338e755601741cabc15311d30a25 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -327,21 +327,26 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
EXPECT_CALL((*history_backend_.get()), DeleteURL(_)).Times(0);
}
- void SendNotificationAddVisit(ui::PageTransition transition,
- const history::URLRow& row) {
- base::Time visit_time;
- history::RedirectList redirects;
+ void SendNotification(const base::Closure& task) {
history_thread_->task_runner()->PostTaskAndReply(
FROM_HERE,
- base::Bind(&HistoryBackendMock::NotifyAddVisit,
+ task,
+ base::Bind(&base::MessageLoop::QuitNow,
+ base::Unretained(base::MessageLoop::current())));
+ base::MessageLoop::current()->Run();
+ }
+
+ void SendNotificationURLVisited(ui::PageTransition transition,
+ const history::URLRow& row) {
+ base::Time visit_time;
+ history::RedirectList redirects;
+ SendNotification(
+ base::Bind(&HistoryBackendMock::NotifyURLVisited,
base::Unretained(history_backend_.get()),
transition,
row,
redirects,
- visit_time),
- base::Bind(&base::MessageLoop::QuitNow,
- base::Unretained(base::MessageLoop::current())));
- base::MessageLoop::current()->Run();
+ visit_time));
}
static bool URLsEqual(history::URLRow& lhs, history::URLRow& rhs) {
@@ -721,7 +726,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeAddFromVisit) {
CreateRootHelper create_root(this, syncer::TYPED_URLS);
StartSyncService(create_root.callback());
- SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, added_entry);
+ SendNotificationURLVisited(ui::PAGE_TRANSITION_TYPED, added_entry);
history::URLRows new_sync_entries;
GetTypedUrlsFromSyncDB(&new_sync_entries);
@@ -753,7 +758,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeUpdateFromVisit) {
WillOnce(DoAll(SetArgumentPointee<2>(updated_visits),
Return(true)));
- SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, updated_entry);
+ SendNotificationURLVisited(ui::PAGE_TRANSITION_TYPED, updated_entry);
history::URLRows new_sync_entries;
GetTypedUrlsFromSyncDB(&new_sync_entries);
@@ -787,7 +792,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
&updated_visits));
// Should ignore this change because it's not TYPED.
- SendNotificationAddVisit(ui::PAGE_TRANSITION_RELOAD, updated_entry);
+ SendNotificationURLVisited(ui::PAGE_TRANSITION_RELOAD, updated_entry);
GetTypedUrlsFromSyncDB(&new_sync_entries);
// Should be no changes to the sync DB from this notification.
@@ -799,7 +804,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
history::URLRow twelve_visits(MakeTypedUrlEntry("http://mine.com", "entry",
12, 15, false,
&updated_visits));
- SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, twelve_visits);
+ SendNotificationURLVisited(ui::PAGE_TRANSITION_TYPED, twelve_visits);
GetTypedUrlsFromSyncDB(&new_sync_entries);
// Should be no changes to the sync DB from this notification.
@@ -811,7 +816,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
history::URLRow twenty_visits(MakeTypedUrlEntry("http://mine.com", "entry",
20, 15, false,
&updated_visits));
- SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, twenty_visits);
+ SendNotificationURLVisited(ui::PAGE_TRANSITION_TYPED, twenty_visits);
GetTypedUrlsFromSyncDB(&new_sync_entries);
ASSERT_EQ(1U, new_sync_entries.size());
« no previous file with comments | « chrome/browser/sync/glue/typed_url_change_processor.h ('k') | chrome/browser/ui/cocoa/history_menu_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698