Refactor sending NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/history/chrome_history_client.cc

 // Copyright 2014 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/chrome_history_client.h"
 
 #include "base/logging.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/history/top_sites.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/notification_service.h"
 
 ChromeHistoryClient::ChromeHistoryClient(BookmarkModel* bookmark_model,
                                          Profile* profile,
                                          history::TopSites* top_sites)
     : bookmark_model_(bookmark_model),
       profile_(profile),
+      history_service_(nullptr),
       top_sites_(top_sites) {
   DCHECK(bookmark_model_);
   if (top_sites_)
     top_sites_->AddObserver(this);
 }
 
 ChromeHistoryClient::~ChromeHistoryClient() {
   if (top_sites_)
     top_sites_->RemoveObserver(this);
 }
 
+void ChromeHistoryClient::SetHistoryService(HistoryService* history_service) {
+  DCHECK(history_service);
+  history_service_ = history_service;
+  history_service_->AddHistoryServiceObserver(this);
+}
+
 void ChromeHistoryClient::BlockUntilBookmarksLoaded() {
   bookmark_model_->BlockTillLoaded();
 }
 
 bool ChromeHistoryClient::IsBookmarked(const GURL& url) {
   return bookmark_model_->IsBookmarked(url);
 }
 
 void ChromeHistoryClient::GetBookmarks(
     std::vector<history::URLAndTitle>* bookmarks) {
@@ skipping 28 matching lines @@
 
 void ChromeHistoryClient::Shutdown() {
   // It's possible that bookmarks haven't loaded and history is waiting for
   // bookmarks to complete loading. In such a situation history can't shutdown
   // (meaning if we invoked HistoryService::Cleanup now, we would deadlock). To
   // break the deadlock we tell BookmarkModel it's about to be deleted so that
   // it can release the signal history is waiting on, allowing history to
   // shutdown (HistoryService::Cleanup to complete). In such a scenario history
   // sees an incorrect view of bookmarks, but it's better than a deadlock.
   bookmark_model_->Shutdown();
+  if (history_service_)
+    history_service_->RemoveHistoryServiceObserver(this);
+}
+
+void ChromeHistoryClient::OnURLVisited(ui::PageTransition transition,
+                                       const history::URLRow& row,
+                                       const history::RedirectList& redirects,
+                                       const base::Time& visit_time) {
+  scoped_ptr<history::URLVisitedDetails> details(

[blundell, 2014/10/08 09:59:13]

This should have a TODO and bug reference about removing this notification.

[sdefresne, 2014/10/09 09:38:15]

Done.

+      new history::URLVisitedDetails);
+  details->transition = transition;
+  details->row = row;
+  details->redirects = redirects;
+  details->visit_time = visit_time;
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_HISTORY_URL_VISITED,
+      content::Source<Profile>(profile_),
+      content::Details<history::HistoryDetails>(details.get()));
 }
 
 void ChromeHistoryClient::TopSitesLoaded(history::TopSites* top_sites) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_LOADED,
       content::Source<Profile>(profile_),
       content::Details<history::TopSites>(top_sites));
 }
 
 void ChromeHistoryClient::TopSitesChanged(history::TopSites* top_sites) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_CHANGED,
       content::Source<history::TopSites>(top_sites),
       content::NotificationService::NoDetails());
 }