Revert of Use ExtensionRegistryObserver

chrome/browser/autocomplete/shortcuts_backend.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/autocomplete/shortcuts_backend.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/shortcuts_database.h"
 #include "chrome/browser/omnibox/omnibox_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/autocomplete_match_type.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
-#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Takes Match classification vector and removes all matched positions,
 // compacting repetitions if necessary.
 std::string StripMatchMarkers(const ACMatchClassifications& matches) {
   ACMatchClassifications unmatched;
@@ skipping 25 matching lines @@
 }
 
 }  // namespace
 
 
 // ShortcutsBackend -----------------------------------------------------------
 
 ShortcutsBackend::ShortcutsBackend(Profile* profile, bool suppress_db)
     : profile_(profile),
       current_state_(NOT_INITIALIZED),
-      extension_registry_observer_(this),
       no_db_access_(suppress_db) {
   if (!suppress_db) {
     db_ = new history::ShortcutsDatabase(
         profile->GetPath().Append(chrome::kShortcutsDatabaseName));
   }
   // |profile| can be NULL in tests.
   if (profile) {
     notification_registrar_.Add(
+        this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
+        content::Source<Profile>(profile));
+    notification_registrar_.Add(
         this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
         content::Source<Profile>(profile));
-    extension_registry_observer_.Add(
-        extensions::ExtensionRegistry::Get(profile));
   }
 }
 
 bool ShortcutsBackend::Init() {
   if (current_state_ != NOT_INITIALIZED)
     return false;
 
   if (no_db_access_) {
     current_state_ = INITIALIZED;
     return true;
@@ skipping 61 matching lines @@
 
 void ShortcutsBackend::ShutdownOnUIThread() {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   notification_registrar_.RemoveAll();
 }
 
 void ShortcutsBackend::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
+  if (!initialized())
+    return;
+
+  if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED) {
+    // When an extension is unloaded, we want to remove any Shortcuts associated
+    // with it.
+    DeleteShortcutsWithURL(content::Details<extensions::UnloadedExtensionInfo>(
+        details)->extension->url(), false);
+    return;
+  }
+
   DCHECK_EQ(chrome::NOTIFICATION_HISTORY_URLS_DELETED, type);
   const history::URLsDeletedDetails* deleted_details =
       content::Details<const history::URLsDeletedDetails>(details).ptr();
   if (deleted_details->all_history) {
     DeleteAllShortcuts();
     return;
   }
 
   const history::URLRows& rows(deleted_details->rows);
   history::ShortcutsDatabase::ShortcutIDs shortcut_ids;
   for (GuidMap::const_iterator it(guid_map_.begin()); it != guid_map_.end();
         ++it) {
     if (std::find_if(
         rows.begin(), rows.end(), history::URLRow::URLRowHasURL(
             it->second->second.match_core.destination_url)) != rows.end())
       shortcut_ids.push_back(it->first);
   }
   DeleteShortcutsWithIDs(shortcut_ids);
 }
 
-void ShortcutsBackend::OnExtensionUnloaded(
-    content::BrowserContext* browser_context,
-    const extensions::Extension* extension,
-    extensions::UnloadedExtensionInfo::Reason reason) {
-  if (!initialized())
-    return;
-
-  // When an extension is unloaded, we want to remove any Shortcuts associated
-  // with it.
-  DeleteShortcutsWithURL(extension->url(), false);
-}
-
 void ShortcutsBackend::InitInternal() {
   DCHECK(current_state_ == INITIALIZING);
   db_->Init();
   history::ShortcutsDatabase::GuidToShortcutMap shortcuts;
   db_->LoadShortcuts(&shortcuts);
   temp_shortcuts_map_.reset(new ShortcutMap);
   temp_guid_map_.reset(new GuidMap);
   for (history::ShortcutsDatabase::GuidToShortcutMap::const_iterator it(
        shortcuts.begin()); it != shortcuts.end(); ++it) {
     (*temp_guid_map_)[it->first] = temp_shortcuts_map_->insert(
@@ skipping 103 matching lines @@
   guid_map_.clear();
   FOR_EACH_OBSERVER(ShortcutsBackendObserver, observer_list_,
                     OnShortcutsChanged());
   return no_db_access_ ||
       BrowserThread::PostTask(
           BrowserThread::DB, FROM_HERE,
           base::Bind(base::IgnoreResult(
                          &history::ShortcutsDatabase::DeleteAllShortcuts),
                      db_.get()));
 }