Remove NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/extensions/api/history/history_api.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/extensions/api/history/history_api.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 114 matching lines @@
       DCHECK(false);
   }
 
   visit_item->transition = transition;
 
   return visit_item.Pass();
 }
 
 }  // namespace
 
-HistoryEventRouter::HistoryEventRouter(Profile* profile) {
+HistoryEventRouter::HistoryEventRouter(Profile* profile,
+                                       HistoryService* history_service)
+    : profile_(profile), history_service_(history_service) {
+  DCHECK(profile);
+  DCHECK(history_service);
   const content::Source<Profile> source = content::Source<Profile>(profile);

[not at google - send to devlin, 2014/10/14 16:06:41]

Remove this alias now?

[sdefresne, 2014/10/17 14:32:38]

Done.

   registrar_.Add(this,
-                 chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                 source);
-  registrar_.Add(this,
                  chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                  source);
+  history_service_->AddObserver(this);
 }
 
-HistoryEventRouter::~HistoryEventRouter() {}
+HistoryEventRouter::~HistoryEventRouter() {
+  history_service_->RemoveObserver(this);

[not at google - send to devlin, 2014/10/14 16:06:41]

Incidentally - have a look at ScopedObserver.

https://code.google.com/p/chromium/codesearch#chromium/src/base/scoped_observ...

It helps a little with this boilerplate.

[sdefresne, 2014/10/17 14:32:38]

Done.

+}
 
 void HistoryEventRouter::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_HISTORY_URL_VISITED:
-      HistoryUrlVisited(
-          content::Source<Profile>(source).ptr(),
-          content::Details<const history::URLVisitedDetails>(details).ptr());
-      break;
     case chrome::NOTIFICATION_HISTORY_URLS_DELETED:

[not at google - send to devlin, 2014/10/14 16:06:41]

Now that there's only 1 case, simpler to convert it to a DCHECK_EQ.

[sdefresne, 2014/10/17 14:32:38]

Done.

       HistoryUrlsRemoved(
           content::Source<Profile>(source).ptr(),
           content::Details<const history::URLsDeletedDetails>(details).ptr());
       break;
     default:
       NOTREACHED();
   }
 }
 
-void HistoryEventRouter::HistoryUrlVisited(
-    Profile* profile,
-    const history::URLVisitedDetails* details) {
-  scoped_ptr<HistoryItem> history_item = GetHistoryItem(details->row);
+void HistoryEventRouter::OnURLVisited(HistoryService* history_service,
+                                      ui::PageTransition transition,
+                                      const history::URLRow& row,
+                                      const history::RedirectList& redirects,
+                                      base::Time visit_time) {
+  DCHECK_EQ(history_service_, history_service);
+  scoped_ptr<HistoryItem> history_item = GetHistoryItem(row);
   scoped_ptr<base::ListValue> args = OnVisited::Create(*history_item);
-
-  DispatchEvent(profile, api::history::OnVisited::kEventName, args.Pass());
+  DispatchEvent(profile_, api::history::OnVisited::kEventName, args.Pass());
 }
 
 void HistoryEventRouter::HistoryUrlsRemoved(
     Profile* profile,
     const history::URLsDeletedDetails* details) {
   OnVisitRemoved::Removed removed;
   removed.all_history = details->all_history;
 
   std::vector<std::string>* urls = new std::vector<std::string>();
   for (history::URLRows::const_iterator iterator = details->rows.begin();
@@ skipping 45 matching lines @@
 void BrowserContextKeyedAPIFactory<HistoryAPI>::DeclareFactoryDependencies() {
   DependsOn(ActivityLog::GetFactoryInstance());
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
 }
 
 void HistoryAPI::OnListenerAdded(const EventListenerInfo& details) {
   // TODO(vadimt): Remove ScopedProfile below once crbug.com/417106 is fixed.
   tracked_objects::ScopedProfile tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION("HistoryAPI::OnListenerAdded"));
 
-  history_event_router_.reset(
-      new HistoryEventRouter(Profile::FromBrowserContext(browser_context_)));
+  Profile* profile = Profile::FromBrowserContext(browser_context_);
+  history_event_router_.reset(new HistoryEventRouter(
+      profile,
+      HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS)));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 bool HistoryFunction::ValidateUrl(const std::string& url_string, GURL* url) {
   GURL temp_url(url_string);
   if (!temp_url.is_valid()) {
     error_ = kInvalidUrlError;
     return false;
   }
   url->Swap(&temp_url);
@@ skipping 228 matching lines @@
   }
 
   return true;
 }
 
 void HistoryDeleteAllFunction::DeleteComplete() {
   SendAsyncResponse();
 }
 
 }  // namespace extensions