Eliminate sending NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_DELETED

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 42 matching lines @@
   // TODO(evanm): this is currently necessitated by generate_profile, which
   // 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_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,
@@ skipping 14 matching lines @@
 void InMemoryHistoryBackend::OnKeywordSearchTermUpdated(
     HistoryService* history_service,
     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(
+    HistoryService* history_service,
+    URLID url_id) {
+  // For simplicity, this will not remove the corresponding URLRow, but this is
+  // okay, as the main database does not do so either.
+  db_->DeleteKeywordSearchTermForURL(url_id);
+}
+
 void InMemoryHistoryBackend::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    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.
       break;
   }
 }
 
@@ skipping 20 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::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