Use ExtensionRegistryObserver instead of deprecated extension notification from autocomplete

chrome/browser/autocomplete/extension_app_provider.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/extension_app_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/strings/string16.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "ui/base/l10n/l10n_util.h"
 
 ExtensionAppProvider::ExtensionAppProvider(
     AutocompleteProviderListener* listener,
     Profile* profile)
-    : AutocompleteProvider(listener, profile,
-          AutocompleteProvider::TYPE_EXTENSION_APP) {
+    : AutocompleteProvider(listener,
+                           profile,
+                           AutocompleteProvider::TYPE_EXTENSION_APP),
+      extension_registry_observer_(this) {
   // Notifications of extensions loading and unloading always come from the
   // non-incognito profile, but we need to see them regardless, as the incognito
   // windows can be affected.
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(profile_->GetOriginalProfile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  content::Source<Profile>(profile_->GetOriginalProfile()));
+
+  // ExtensionRegistryObserver will handle getting the original profile itself
+  // as necessary.
+  extension_registry_observer_.Add(
+      extensions::ExtensionRegistry::Get(profile_));
+
   RefreshAppList();
 }
 
 // static.
 void ExtensionAppProvider::LaunchAppFromOmnibox(
     const AutocompleteMatch& match,
     Profile* profile,
     WindowOpenDisposition disposition) {
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile)
@@ skipping 124 matching lines @@
         base::UTF8ToUTF16(launch_url.spec()),
         // Only hosted apps have recognizable URLs that users might type in,
         // packaged apps and hosted apps use chrome-extension:// URLs that are
         // normally not shown to users.
         app->is_hosted_app()
     };
     extension_apps_.push_back(extension_app);
   }
 }
 
+void ExtensionAppProvider::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
+  RefreshAppList();
+}
+
 void ExtensionAppProvider::Observe(int type,
                                    const content::NotificationSource& source,
                                    const content::NotificationDetails& details) {
+  DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_UNINSTALLED, type);
   RefreshAppList();
 }
 
 int ExtensionAppProvider::CalculateRelevance(AutocompleteInput::Type type,
                                              int input_length,
                                              int target_length,
                                              const GURL& url) {
   // If you update the algorithm here, please remember to update the tables in
   // autocomplete.h also.
   const int kMaxRelevance = 1425;
@@ skipping 19 matching lines @@
     history::URLRow info;
     url_db->GetRowForURL(url, &info);
     type_count_boost =
         400 * (1.0 - (std::pow(static_cast<double>(2), -info.typed_count())));
   }
   int relevance = 575 + static_cast<int>(type_count_boost) +
                         static_cast<int>(fraction_boost);
   DCHECK_LE(relevance, kMaxRelevance);
   return relevance;
 }