Refactor sending NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/sync/profile_sync_service_typed_url_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 <string>
 #include <utility>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 88 matching lines @@
   MOCK_METHOD3(AddVisits, bool(const GURL& url,
                                const std::vector<history::VisitInfo>& visits,
                                history::VisitSource visit_source));
   MOCK_METHOD1(RemoveVisits, bool(const history::VisitVector& visits));
   MOCK_METHOD2(GetURL, bool(const GURL& url_id, history::URLRow* url_row));
   MOCK_METHOD2(SetPageTitle, void(const GURL& url,
                                   const base::string16& title));
   MOCK_METHOD1(DeleteURL, void(const GURL& url));
 
  private:
+  friend class ProfileSyncServiceTypedUrlTest;
+
   virtual ~HistoryBackendMock() {}
 };
 
 class HistoryServiceMock : public HistoryService {
  public:
   HistoryServiceMock(history::HistoryClient* client, Profile* profile)
       : HistoryService(client, profile), backend_(NULL) {}
 
   virtual void ScheduleDBTask(scoped_ptr<history::HistoryDBTask> task,
                               base::CancelableTaskTracker* tracker) override {
@@ skipping 199 matching lines @@
     }
   }
 
   void SetIdleChangeProcessorExpectations() {
     EXPECT_CALL((*history_backend_.get()), SetPageTitle(_, _)).Times(0);
     EXPECT_CALL((*history_backend_.get()), UpdateURL(_, _)).Times(0);
     EXPECT_CALL((*history_backend_.get()), GetURL(_, _)).Times(0);
     EXPECT_CALL((*history_backend_.get()), DeleteURL(_)).Times(0);
   }
 
+  void SendNotificationAddVisit(ui::PageTransition transition,
+                                const history::URLRow& row) {
+    base::Time visit_time;
+    history::RedirectList redirects;
+    history_thread_->task_runner()->PostTaskAndReply(
+        FROM_HERE,
+        base::Bind(&HistoryBackendMock::NotifyAddVisit,
+                   base::Unretained(history_backend_.get()),
+                   transition,
+                   row,
+                   redirects,
+                   visit_time),
+        base::Bind(&base::MessageLoop::QuitNow,
+                   base::Unretained(base::MessageLoop::current())));
+    base::MessageLoop::current()->Run();
+  }
+
   static bool URLsEqual(history::URLRow& lhs, history::URLRow& rhs) {
     // Only verify the fields we explicitly sync (i.e. don't verify typed_count
     // or visit_count because we rely on the history DB to manage those values
     // and they are left unchanged by HistoryBackendMock).
     return (lhs.url().spec().compare(rhs.url().spec()) == 0) &&
            (lhs.title().compare(rhs.title()) == 0) &&
            (lhs.last_visit() == rhs.last_visit()) &&
            (lhs.hidden() == rhs.hidden());
   }
 
@@ skipping 357 matching lines @@
 
   EXPECT_CALL((*history_backend_.get()), GetAllTypedURLs(_)).
       WillOnce(Return(true));
   EXPECT_CALL((*history_backend_.get()), GetMostRecentVisitsForURL(_, _, _)).
       WillOnce(DoAll(SetArgumentPointee<2>(added_visits), Return(true)));
 
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
-  history::URLVisitedDetails details;
-  details.row = added_entry;
-  details.transition = ui::PAGE_TRANSITION_TYPED;
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLVisitedDetails>(&details));
+  SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, added_entry);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(added_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeUpdateFromVisit) {
   history::VisitVector original_visits;
   history::URLRow original_entry(MakeTypedUrlEntry("http://mine.com", "entry",
@@ skipping 11 matching lines @@
   StartSyncService(create_root.callback());
 
   history::VisitVector updated_visits;
   history::URLRow updated_entry(MakeTypedUrlEntry("http://mine.com", "entry",
                                                   7, 17, false,
                                                   &updated_visits));
   EXPECT_CALL((*history_backend_.get()), GetMostRecentVisitsForURL(_, _, _)).
       WillOnce(DoAll(SetArgumentPointee<2>(updated_visits),
                            Return(true)));
 
-  history::URLVisitedDetails details;
-  details.row = updated_entry;
-  details.transition = ui::PAGE_TRANSITION_TYPED;
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLVisitedDetails>(&details));
+  SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, updated_entry);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(updated_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserIgnoreChangeUpdateFromVisit) {
   history::VisitVector original_visits;
   history::URLRow original_entry(MakeTypedUrlEntry("http://mine.com", "entry",
@@ skipping 11 matching lines @@
   StartSyncService(create_root.callback());
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(original_entry, new_sync_entries[0]));
 
   history::VisitVector updated_visits;
   history::URLRow updated_entry(MakeTypedUrlEntry("http://mine.com", "entry",
                                                   7, 15, false,
                                                   &updated_visits));
-  history::URLVisitedDetails details;
-  details.row = updated_entry;
 
   // Should ignore this change because it's not TYPED.
-  details.transition = ui::PAGE_TRANSITION_RELOAD;
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLVisitedDetails>(&details));
-
+  SendNotificationAddVisit(ui::PAGE_TRANSITION_RELOAD, updated_entry);
   GetTypedUrlsFromSyncDB(&new_sync_entries);
 
   // Should be no changes to the sync DB from this notification.
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(original_entry, new_sync_entries[0]));
 
   // Now, try updating it with a large number of visits not divisible by 10
   // (should ignore this visit).
   history::URLRow twelve_visits(MakeTypedUrlEntry("http://mine.com", "entry",
                                                   12, 15, false,
                                                   &updated_visits));
-  details.row = twelve_visits;
-  details.transition = ui::PAGE_TRANSITION_TYPED;
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLVisitedDetails>(&details));
+  SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, twelve_visits);
   GetTypedUrlsFromSyncDB(&new_sync_entries);
+
   // Should be no changes to the sync DB from this notification.
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(original_entry, new_sync_entries[0]));
 
   // Now, try updating it with a large number of visits that is divisible by 10
   // (should *not* be ignored).
   history::URLRow twenty_visits(MakeTypedUrlEntry("http://mine.com", "entry",
                                                   20, 15, false,
                                                   &updated_visits));
-  details.row = twenty_visits;
-  details.transition = ui::PAGE_TRANSITION_TYPED;
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLVisitedDetails>(&details));
+  SendNotificationAddVisit(ui::PAGE_TRANSITION_TYPED, twenty_visits);
   GetTypedUrlsFromSyncDB(&new_sync_entries);
+
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(twenty_visits, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeRemove) {
   history::VisitVector original_visits1;
   history::URLRow original_entry1(MakeTypedUrlEntry("http://mine.com", "entry",
                                                     2, 15, false,
                                                     &original_visits1));
   history::VisitVector original_visits2;
@@ skipping 302 matching lines @@
   notifier->Notify(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
                    content::Source<Profile>(profile_),
                    content::Details<history::URLsModifiedDetails>(&details));
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
 
   // The change should be ignored.
   ASSERT_EQ(0U, new_sync_entries.size());
 }