Remove NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/search_engines/chrome_template_url_service_client.h

Index: chrome/browser/search_engines/chrome_template_url_service_client.h
diff --git a/chrome/browser/search_engines/chrome_template_url_service_client.h b/chrome/browser/search_engines/chrome_template_url_service_client.h
index 9bfe2ef7b74346cb14d0d02d7bbec6e8b2d52205..0a39438c833ced6132d45e45199a3cc5eb90a0d7 100644
--- a/chrome/browser/search_engines/chrome_template_url_service_client.h
+++ b/chrome/browser/search_engines/chrome_template_url_service_client.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_CHROME_TEMPLATE_URL_SERVICE_CLIENT_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_CHROME_TEMPLATE_URL_SERVICE_CLIENT_H_
 
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/search_engines/template_url_service_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"

[droger, 2014/10/14 15:15:24]

Remove these includes.

[sdefresne, 2014/10/14 16:02:05]

Done.

@@ -15,9 +16,9 @@ class Profile;
 // ChromeTemplateURLServiceClient provides keyword related history
 // functionality for TemplateURLService.
 class ChromeTemplateURLServiceClient : public TemplateURLServiceClient,
-                                       public content::NotificationObserver {
+                                       public history::HistoryServiceObserver {
  public:
-  explicit ChromeTemplateURLServiceClient(Profile* profile);
+  explicit ChromeTemplateURLServiceClient(HistoryService* history_service);
   virtual ~ChromeTemplateURLServiceClient();
 
   // TemplateURLServiceClient:
@@ -31,15 +32,16 @@ class ChromeTemplateURLServiceClient : public TemplateURLServiceClient,
   virtual void RestoreExtensionInfoIfNecessary(
       TemplateURL* template_url) override;
 
-  // content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  // history::HistoryServiceObserver:
+  virtual void OnURLVisited(HistoryService* history_service,
+                            ui::PageTransition transition,
+                            const history::URLRow& row,
+                            const history::RedirectList& redirects,
+                            base::Time visit_time) override;

[droger, 2014/10/14 15:15:24]

You need includes or forward declarations for these types.

[sdefresne, 2014/10/14 16:02:05]

They are forward-declared / included in
"components/history/core/browser/history_service_observer.h". Do I really need
to re-foward-declare / include them?

[droger, 2014/10/14 16:11:09]

Ok, you are probably right.

 
  private:
-  Profile* profile_;
   TemplateURLService* owner_;
-  content::NotificationRegistrar notification_registrar_;
+  HistoryService* history_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeTemplateURLServiceClient);
 };