Refactor sending NOTIFICATION_HISTORY_URL_VISITED

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"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_notifications.h"
+#include "chrome/browser/history/history_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/history/core/browser/in_memory_database.h"
 #include "components/history/core/browser/url_database.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 namespace history {
 
 InMemoryHistoryBackend::InMemoryHistoryBackend()
-    : profile_(NULL) {
+    : profile_(nullptr), history_service_(nullptr) {
 }
 
-InMemoryHistoryBackend::~InMemoryHistoryBackend() {}
+InMemoryHistoryBackend::~InMemoryHistoryBackend() {
+  if (history_service_)
+    history_service_->RemoveObserver(this);
+}
 
 bool InMemoryHistoryBackend::Init(const base::FilePath& history_filename) {
   db_.reset(new InMemoryDatabase);
   return db_->InitFromDisk(history_filename);
 }
 
-void InMemoryHistoryBackend::AttachToHistoryService(Profile* profile) {
+void InMemoryHistoryBackend::AttachToHistoryService(
+    Profile* profile,
+    HistoryService* history_service) {
   if (!db_) {
     NOTREACHED();
     return;
   }
 
+  DCHECK(history_service);
+  history_service_ = history_service;
+  history_service_->AddObserver(this);
+
   profile_ = profile;
 
   // 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_URL_VISITED, source);
   registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, source);
   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::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_HISTORY_URL_VISITED:
-      OnURLVisitedOrModified(content::Details<URLVisitedDetails>(details)->row);
-      break;
     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_MODIFIED: {
       const URLsModifiedDetails* modified_details =
@@ skipping 54 matching lines @@
 }
 
 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