Use ExtensionRegistryObserver instead of deprecated extension notification from autocomplete

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/autocomplete/autocomplete_match.h"
 #include "chrome/browser/history/shortcuts_database.h"
 #include "components/keyed_service/content/refcounted_browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/extension_registry_observer.h"
 #include "url/gurl.h"
 
 class Profile;
 
+namespace extensions {
+class ExtensionRegistry;
+}
+
 namespace history {
 class ShortcutsDatabase;
 };  // namespace history
 
 // This class manages the shortcut provider backend - access to database on the
 // db thread, etc.
 class ShortcutsBackend : public RefcountedBrowserContextKeyedService,
-                         public content::NotificationObserver {
+                         public content::NotificationObserver,
+                         public extensions::ExtensionRegistryObserver {
  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 50 matching lines @@
       const AutocompleteMatch& match, Profile* profile);
 
   // RefcountedBrowserContextKeyedService:
   virtual void ShutdownOnUIThread() OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // Overridden from extensions::ExtensionRegistryObserver.

[Peter Kasting, 2014/05/12 19:46:55]

Nit: File style seems to be "extensions::ExtensionRegistryObserver:"

[limasdf, 2014/05/13 14:38:44]

Done.

+  virtual void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const extensions::Extension* extension,
+      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+
   // Internal initialization of the back-end. Posted by Init() to the DB thread.
   // On completion posts InitCompleted() back to UI thread.
   void InitInternal();
 
   // Finishes initialization on UI thread, notifies all observers.
   void InitCompleted();
 
   // Adds the Shortcut to the database.
   bool AddShortcut(const history::ShortcutsDatabase::Shortcut& shortcut);
 
@@ skipping 21 matching lines @@
   // 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_;
 
+  // Listen to extension load, unload notifications.

[Peter Kasting, 2014/05/12 19:46:55]

Remove this comment; it's both inaccurate (you're not caring about load
notifications) and not useful.

[limasdf, 2014/05/13 14:38:44]

Done.

+  ScopedObserver<extensions::ExtensionRegistry,
+                 extensions::ExtensionRegistryObserver>
+      extension_registry_observer_;
+
   // For some unit-test only.
   bool no_db_access_;
 
   DISALLOW_COPY_AND_ASSIGN(ShortcutsBackend);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SHORTCUTS_BACKEND_H_