Remove NOTIFICATION_HISTORY_URLS_MODIFIED

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 333 matching lines @@
     history::RedirectList redirects;
     SendNotification(
         base::Bind(&HistoryBackendNotifier::NotifyURLVisited,
                    base::Unretained(history_backend_.get()),
                    transition,
                    row,
                    redirects,
                    visit_time));
   }
 
+  void SendNotificationURLsModified(const history::URLRows& rows) {
+    SendNotification(base::Bind(&HistoryBackendNotifier::NotifyURLsModified,
+                                base::Unretained(history_backend_.get()),
+                                rows));
+  }
+
   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 260 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::URLsModifiedDetails details;
-  details.changed_urls.push_back(added_entry);
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLsModifiedDetails>(&details));
+  history::URLRows changed_urls;
+  changed_urls.push_back(added_entry);
+  SendNotificationURLsModified(changed_urls);
 
   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, ProcessUserChangeAddWithBlank) {
   history::VisitVector added_visits;
   history::URLRow empty_entry(MakeTypedUrlEntry("", "entry",
                                                 2, 15, false, &added_visits));
   history::URLRow added_entry(MakeTypedUrlEntry("http://added.com", "entry",
                                                 2, 15, false, &added_visits));
 
   EXPECT_CALL((*history_backend_.get()), GetAllTypedURLs(_)).
       WillOnce(Return(true));
   EXPECT_CALL((*history_backend_.get()), GetMostRecentVisitsForURL(_, _, _)).
       WillRepeatedly(DoAll(SetArgumentPointee<2>(added_visits), Return(true)));
 
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
-  history::URLsModifiedDetails details;
-  details.changed_urls.push_back(empty_entry);
-  details.changed_urls.push_back(added_entry);
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLsModifiedDetails>(&details));
+  history::URLRows changed_urls;
+  changed_urls.push_back(empty_entry);
+  changed_urls.push_back(added_entry);
+  SendNotificationURLsModified(changed_urls);
 
   std::vector<history::URLRow> 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, ProcessUserChangeUpdate) {
   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::URLsModifiedDetails details;
-  details.changed_urls.push_back(updated_entry);
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLsModifiedDetails>(&details));
+  history::URLRows changed_urls;
+  changed_urls.push_back(updated_entry);
+  SendNotificationURLsModified(changed_urls);
 
   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, ProcessUserChangeAddFromVisit) {
   history::VisitVector added_visits;
   history::URLRow added_entry(MakeTypedUrlEntry("http://added.com", "entry",
@@ skipping 317 matching lines @@
   // Create updates for the previous urls + a new file one.
   history::URLRow updated_url_entry(MakeTypedUrlEntry("http://yey.com",
                                                       "yey", 20, 15, false,
                                                       &updated_visits));
   history::URLRow updated_file_entry(MakeTypedUrlEntry("file:///cat.jpg",
                                                        "cat", 20, 15, false,
                                                        &updated_visits));
   history::URLRow new_file_entry(MakeTypedUrlEntry("file:///dog.jpg",
                                                    "dog", 20, 15, false,
                                                    &updated_visits));
-  history::URLsModifiedDetails details;
-  details.changed_urls.push_back(updated_url_entry);
-  details.changed_urls.push_back(updated_file_entry);
-  details.changed_urls.push_back(new_file_entry);
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLsModifiedDetails>(&details));
+
+  history::URLRows changed_urls;
+  changed_urls.push_back(updated_url_entry);
+  changed_urls.push_back(updated_file_entry);
+  changed_urls.push_back(new_file_entry);
+  SendNotificationURLsModified(changed_urls);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
 
   // We should ignore the local file urls (existing and updated),
   // and only be left with the updated http url.
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(updated_url_entry, new_sync_entries[0]));
 }
 
@@ skipping 25 matching lines @@
   history::URLRow updated_url_entry(MakeTypedUrlEntry("http://yey.com",
                                                   "yey", 20, 15, false,
                                                   &updated_visits));
   history::URLRow updated_localhost_entry(MakeTypedUrlEntry(
                                                   "http://localhost:80",
                                                   "localhost", 20, 15, false,
                                                   &original_visits));
   history::URLRow localhost_ip_entry(MakeTypedUrlEntry("http://127.0.0.1",
                                                   "localhost", 12, 15, false,
                                                   &original_visits));
-  history::URLsModifiedDetails details;
-  details.changed_urls.push_back(updated_url_entry);
-  details.changed_urls.push_back(updated_localhost_entry);
-  details.changed_urls.push_back(localhost_ip_entry);
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLsModifiedDetails>(&details));
+
+  history::URLRows changed_urls;
+  changed_urls.push_back(updated_url_entry);
+  changed_urls.push_back(updated_localhost_entry);
+  changed_urls.push_back(localhost_ip_entry);
+  SendNotificationURLsModified(changed_urls);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
 
   // We should ignore the localhost urls and left only with http url.
   ASSERT_EQ(1U, new_sync_entries.size());
   EXPECT_TRUE(URLsEqual(updated_url_entry, new_sync_entries[0]));
 }
 
 TEST_F(ProfileSyncServiceTypedUrlTest, IgnoreModificationWithoutValidVisit) {
   EXPECT_CALL((*history_backend_.get()), GetAllTypedURLs(_)).
       WillRepeatedly(Return(true));
   EXPECT_CALL((*history_backend_.get()), GetMostRecentVisitsForURL(_, _, _)).
       WillRepeatedly(Return(true));
 
   CreateRootHelper create_root(this, syncer::TYPED_URLS);
   StartSyncService(create_root.callback());
 
   history::VisitVector updated_visits;
   history::URLRow updated_url_entry(MakeTypedUrlEntry("http://yey.com",
                                                   "yey", 20, 0, false,
                                                   &updated_visits));
-  history::URLsModifiedDetails details;
-  details.changed_urls.push_back(updated_url_entry);
-  scoped_refptr<ThreadNotifier> notifier(
-      new ThreadNotifier(history_thread_.get()));
-  notifier->Notify(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
-                   content::Source<Profile>(profile_),
-                   content::Details<history::URLsModifiedDetails>(&details));
+
+  history::URLRows changed_urls;
+  changed_urls.push_back(updated_url_entry);
+  SendNotificationURLsModified(changed_urls);
 
   history::URLRows new_sync_entries;
   GetTypedUrlsFromSyncDB(&new_sync_entries);
 
   // The change should be ignored.
   ASSERT_EQ(0U, new_sync_entries.size());
 }