Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/autocomplete/shortcuts_backend.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_AUTOCOMPLETE_SHORTCUTS_BACKEND_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_BACKEND_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/shortcuts_database.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "url/gurl.h"
 
 class Profile;
 
 namespace history {
 class ShortcutsDatabase;
 };  // namespace history
 
 // This class manages the shortcut provider backend - access to database on the
 // db thread, etc.
 class ShortcutsBackend : public RefcountedKeyedService,
-                         public content::NotificationObserver {
+                         public content::NotificationObserver,
+                         public history::HistoryServiceObserver {
  public:
   typedef std::multimap<base::string16,
                         const history::ShortcutsDatabase::Shortcut> ShortcutMap;
 
   // |profile| is necessary for profile notifications only and can be NULL in
   // unit-tests. For unit testing, set |suppress_db| to true to prevent creation
   // of the database, in which case all operations are performed in memory only.
   ShortcutsBackend(Profile* profile, bool suppress_db);
 
   // The interface is guaranteed to be called on the thread AddObserver()
@@ skipping 74 matching lines @@
   bool DeleteShortcutsWithIDs(
       const history::ShortcutsDatabase::ShortcutIDs& shortcut_ids);
 
   // Deletes all shortcuts whose URLs begin with |url|.  If |exact_match| is
   // true, only shortcuts from exactly |url| are deleted.
   bool DeleteShortcutsWithURL(const GURL& url, bool exact_match);
 
   // Deletes all of the shortcuts.
   bool DeleteAllShortcuts();
 
+  // history::HistoryServiceObserver:

[Peter Kasting, 2014/12/11 19:59:35]

Nit: Please move this to just below the private NotificationObserver override
(also in the .cc file).

[nshaik, 2014/12/12 05:40:56]

Done.

+  void OnURLsDeleted(HistoryService* history_service,
+                     bool all_history,
+                     bool expired,
+                     const history::URLRows& deleted_rows,
+                     const std::set<GURL>& favicon_urls) override;
+
   Profile* profile_;
   CurrentState current_state_;
   ObserverList<ShortcutsBackendObserver> observer_list_;
   scoped_refptr<history::ShortcutsDatabase> db_;
 
   // The |temp_shortcuts_map_| and |temp_guid_map_| used for temporary storage
   // between InitInternal() and InitComplete() to avoid doing a potentially huge
   // copy.
   scoped_ptr<ShortcutMap> temp_shortcuts_map_;
   scoped_ptr<GuidMap> temp_guid_map_;
 
   ShortcutMap shortcuts_map_;
   // This is a helper map for quick access to a shortcut by guid.
   GuidMap guid_map_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // For some unit-test only.
   bool no_db_access_;
 
+  ScopedObserver<HistoryService, HistoryServiceObserver>

[Peter Kasting, 2014/12/11 19:59:35]

Nit: I would probably move this above the |no_db_access_| variable so that it
sits right by the similarly-purposed notification registrar.

[nshaik, 2014/12/12 05:40:56]

Done.

+      history_service_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(ShortcutsBackend);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_BACKEND_H_