Eliminate sending NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED

chrome/browser/history/in_memory_history_backend.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 "chrome/browser/history/in_memory_history_backend.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 43 matching lines @@
   // runs without a browser process. generate_profile should really create
   // a browser process, at which point this check can then be nuked.
   if (!g_browser_process)
     return;
 
   // Register for the notifications we care about.
   // We only want notifications for the associated profile.
   content::Source<Profile> source(profile_);
   registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, source);
   registrar_.Add(
-      this, chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED, source);
-  registrar_.Add(
       this, chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_DELETED, source);
 }
 
 void InMemoryHistoryBackend::DeleteAllSearchTermsForKeyword(
     KeywordID keyword_id) {
   // For simplicity, this will not remove the corresponding URLRows, but
   // this is okay, as the main database does not do so either.
   db_->DeleteAllSearchTermsForKeyword(keyword_id);
 }
 
 void InMemoryHistoryBackend::OnURLVisited(HistoryService* history_service,
                                           ui::PageTransition transition,
                                           const URLRow& row,
                                           const RedirectList& redirects,
                                           base::Time visit_time) {
   OnURLVisitedOrModified(row);
 }
 
 void InMemoryHistoryBackend::OnURLsModified(HistoryService* history_service,
                                             const URLRows& changed_urls) {
   for (const auto& row : changed_urls) {
     OnURLVisitedOrModified(row);
   }
 }
 
+void InMemoryHistoryBackend::HistoryKeywordSearchTermUpdated(
+    HistoryService* history_service,
+    const URLRow& row,
+    KeywordID keyword_id,
+    const base::string16& term) {
+  OnKeywordSearchTermUpdated(row, keyword_id, term);
+}
+
 void InMemoryHistoryBackend::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED:
-      OnKeywordSearchTermUpdated(
-          *content::Details<KeywordSearchUpdatedDetails>(details).ptr());
-      break;
     case chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_DELETED:
       OnKeywordSearchTermDeleted(
           *content::Details<KeywordSearchDeletedDetails>(details).ptr());
       break;
     case chrome::NOTIFICATION_HISTORY_URLS_DELETED:
       OnURLsDeleted(*content::Details<URLsDeletedDetails>(details).ptr());
       break;
     default:
       // For simplicity, the unit tests send us all notifications, even when
       // we haven't registered for them, so don't assert here.
@@ skipping 25 matching lines @@
   // Delete all matching URLs in our database.
   for (URLRows::const_iterator row = details.rows.begin();
        row != details.rows.end(); ++row) {
     // This will also delete the corresponding keyword search term.
     // Ignore errors, as we typically only cache a subset of URLRows.
     db_->DeleteURLRow(row->id());
   }
 }
 
 void InMemoryHistoryBackend::OnKeywordSearchTermUpdated(
-    const KeywordSearchUpdatedDetails& details) {
-  DCHECK(details.url_row.id());
-  db_->InsertOrUpdateURLRowByID(details.url_row);
-  db_->SetKeywordSearchTermsForURL(
-      details.url_row.id(), details.keyword_id, details.term);
+    const URLRow& row,
+    KeywordID keyword_id,
+    const base::string16& term) {
+  DCHECK(row.id());
+  db_->InsertOrUpdateURLRowByID(row);
+  db_->SetKeywordSearchTermsForURL(row.id(), keyword_id, term);
 }
 
 void InMemoryHistoryBackend::OnKeywordSearchTermDeleted(
     const KeywordSearchDeletedDetails& details) {
   // For simplicity, this will not remove the corresponding URLRow, but this is
   // okay, as the main database does not do so either.
   db_->DeleteKeywordSearchTermForURL(details.url_row_id);
 }
 
 }  // namespace history