Remove NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/android/provider/chrome_browser_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
 #define CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/history/core/android/android_history_types.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class AndroidHistoryProviderService;
 class FaviconService;
 class Profile;
 
 namespace history {
 class TopSites;
 }
 
 namespace sql {
 class Statement;
 }
 
 // This class implements the native methods of ChromeBrowserProvider.java
 class ChromeBrowserProvider : public BaseBookmarkModelObserver,
-                              public content::NotificationObserver {
+                              public content::NotificationObserver,
+                              public history::HistoryServiceObserver {
  public:
   ChromeBrowserProvider(JNIEnv* env, jobject obj);
   void Destroy(JNIEnv*, jobject);
 
   // JNI registration.
   static bool RegisterChromeBrowserProvider(JNIEnv* env);
 
   // Adds either a new bookmark or bookmark folder based on |is_folder|.  The
   // bookmark is added to the beginning of the specified parent and if the
   // parent ID is not valid (i.e. < 0) then it will be added to the bookmark
@@ skipping 129 matching lines @@
                                                              jstring url);
 
  private:
   virtual ~ChromeBrowserProvider();
 
   // Override BaseBookmarkModelObserver.
   virtual void BookmarkModelChanged() override;
   virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override;
   virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override;
 
+  void OnHistoryChanged();
+
+  // Override HistoryServiceObserver.
+  virtual void OnURLVisited(HistoryService* history_service,
+                            ui::PageTransition transition,
+                            const history::URLRow& row,
+                            const history::RedirectList& redirects,
+                            base::Time visit_time) override;
+
   // Override NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
 
   JavaObjectWeakGlobalRef weak_java_provider_;
 
   Profile* profile_;

[brettw, 2014/10/14 18:16:57]

Can you add a note above this block of profile-related stuff about the lifetime
of this class relative to the profile stuff, so it's clear why these raw
pointers are OK?

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

Done.

   BookmarkModel* bookmark_model_;
+  HistoryService* history_service_;
   history::TopSites* top_sites_;
 
   scoped_ptr<AndroidHistoryProviderService> service_;
   scoped_ptr<FaviconService> favicon_service_;
 
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Used to register/unregister notification observer.
   content::NotificationRegistrar notification_registrar_;
 
   bool handling_extensive_changes_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_