Remove NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED from c/b/e/api

chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

 // Copyright 2013 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/extensions/api/settings_overrides/settings_overrides_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_factory.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_constants.h"
 
 namespace extensions {
 
 namespace {
 
 base::LazyInstance<BrowserContextKeyedAPIFactory<SettingsOverridesAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 51 matching lines @@
             search_provider.alternate_urls->at(i), install_parameter));
     }
   }
   return data;
 }
 
 }  // namespace
 
 SettingsOverridesAPI::SettingsOverridesAPI(content::BrowserContext* context)
     : profile_(Profile::FromBrowserContext(context)),
-      url_service_(TemplateURLServiceFactory::GetForProfile(profile_)) {
-  DCHECK(profile_);
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
+      url_service_(TemplateURLServiceFactory::GetForProfile(profile_)),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
 }
 
 SettingsOverridesAPI::~SettingsOverridesAPI() {
 }
 
 BrowserContextKeyedAPIFactory<SettingsOverridesAPI>*
 SettingsOverridesAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
@@ skipping 13 matching lines @@
                                      const std::string& pref_key) {
   PreferenceAPI* prefs = PreferenceAPI::Get(profile_);
   if (!prefs)
     return;  // Expected in unit tests.
   prefs->RemoveExtensionControlledPref(
       extension_id,
       pref_key,
       kExtensionPrefsScopeRegular);
 }
 
-void SettingsOverridesAPI::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      const Extension* extension =
-          content::Details<const Extension>(details).ptr();
-      const SettingsOverrides* settings =
-          SettingsOverrides::Get(extension);
-      if (settings) {
-        std::string install_parameter =
-            ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id());
-        if (settings->homepage) {
-          SetPref(extension->id(),
-                  prefs::kHomePage,
-                  new base::StringValue(SubstituteInstallParam(
-                      settings->homepage->spec(), install_parameter)));
-          SetPref(extension->id(), prefs::kHomePageIsNewTabPage,
-                  new base::FundamentalValue(false));
+void SettingsOverridesAPI::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  const SettingsOverrides* settings = SettingsOverrides::Get(extension);
+  if (settings) {
+    std::string install_parameter =
+        ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id());
+    if (settings->homepage) {
+      SetPref(extension->id(),
+              prefs::kHomePage,
+              new base::StringValue(SubstituteInstallParam(
+                  settings->homepage->spec(), install_parameter)));
+      SetPref(extension->id(),
+              prefs::kHomePageIsNewTabPage,
+              new base::FundamentalValue(false));
+    }
+    if (!settings->startup_pages.empty()) {
+      SetPref(extension->id(),
+              prefs::kRestoreOnStartup,
+              new base::FundamentalValue(SessionStartupPref::kPrefValueURLs));
+      if (settings->startup_pages.size() > 1) {
+        VLOG(1) << extensions::ErrorUtils::FormatErrorMessage(
+                       kManyStartupPagesWarning,
+                       manifest_keys::kSettingsOverride);
+      }
+      scoped_ptr<base::ListValue> url_list(new base::ListValue);
+      url_list->Append(new base::StringValue(SubstituteInstallParam(
+          settings->startup_pages[0].spec(), install_parameter)));
+      SetPref(
+          extension->id(), prefs::kURLsToRestoreOnStartup, url_list.release());
+    }
+    if (settings->search_engine) {
+      // Bring the preference to the correct state. Before this code set it
+      // to "true" for all search engines. Thus, we should overwrite it for
+      // all search engines.
+      if (settings->search_engine->is_default) {
+        SetPref(extension->id(),
+                prefs::kDefaultSearchProviderEnabled,
+                new base::FundamentalValue(true));
+      } else {
+        UnsetPref(extension->id(), prefs::kDefaultSearchProviderEnabled);
+      }
+      DCHECK(url_service_);
+      if (url_service_->loaded()) {
+        RegisterSearchProvider(extension);
+      } else {
+        if (!template_url_sub_) {
+          template_url_sub_ = url_service_->RegisterOnLoadedCallback(
+              base::Bind(&SettingsOverridesAPI::OnTemplateURLsLoaded,
+                         base::Unretained(this)));
         }
-        if (!settings->startup_pages.empty()) {
-          SetPref(extension->id(), prefs::kRestoreOnStartup,
-                  new base::FundamentalValue(
-                      SessionStartupPref::kPrefValueURLs));
-          if (settings->startup_pages.size() > 1) {
-            VLOG(1) << extensions::ErrorUtils::FormatErrorMessage(
-                kManyStartupPagesWarning, manifest_keys::kSettingsOverride);
-          }
-          scoped_ptr<base::ListValue> url_list(new base::ListValue);
-          url_list->Append(new base::StringValue(SubstituteInstallParam(
-              settings->startup_pages[0].spec(), install_parameter)));
-          SetPref(extension->id(), prefs::kURLsToRestoreOnStartup,
-                  url_list.release());
-        }
-        if (settings->search_engine) {
-          // Bring the preference to the correct state. Before this code set it
-          // to "true" for all search engines. Thus, we should overwrite it for
-          // all search engines.
-          if (settings->search_engine->is_default) {
-            SetPref(extension->id(), prefs::kDefaultSearchProviderEnabled,
-                    new base::FundamentalValue(true));
-          } else {
-            UnsetPref(extension->id(), prefs::kDefaultSearchProviderEnabled);
-          }
-          DCHECK(url_service_);
-          if (url_service_->loaded()) {
-            RegisterSearchProvider(extension);
-          } else {
-            if (!template_url_sub_) {
-              template_url_sub_ = url_service_->RegisterOnLoadedCallback(
-                  base::Bind(&SettingsOverridesAPI::OnTemplateURLsLoaded,
-                             base::Unretained(this)));
-            }
-            url_service_->Load();
-            pending_extensions_.insert(extension);
-          }
-        }
+        url_service_->Load();
+        pending_extensions_.insert(extension);
       }
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      const Extension* extension =
-          content::Details<UnloadedExtensionInfo>(details)->extension;
-      const SettingsOverrides* settings = SettingsOverrides::Get(extension);
-      if (settings) {
-        if (settings->homepage) {
-          UnsetPref(extension->id(), prefs::kHomePage);
-          UnsetPref(extension->id(), prefs::kHomePageIsNewTabPage);
-        }
-        if (!settings->startup_pages.empty()) {
-          UnsetPref(extension->id(), prefs::kRestoreOnStartup);
-          UnsetPref(extension->id(), prefs::kURLsToRestoreOnStartup);
-        }
-        if (settings->search_engine) {
-          DCHECK(url_service_);
-          if (url_service_->loaded())
-            url_service_->RemoveExtensionControlledTURL(extension->id());
-          else
-            pending_extensions_.erase(extension);
-        }
-      }
-      break;
-    }
-    default: {
-      NOTREACHED();
-      break;
     }
   }
 }
+void SettingsOverridesAPI::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  const SettingsOverrides* settings = SettingsOverrides::Get(extension);
+  if (settings) {
+    if (settings->homepage) {
+      UnsetPref(extension->id(), prefs::kHomePage);
+      UnsetPref(extension->id(), prefs::kHomePageIsNewTabPage);
+    }
+    if (!settings->startup_pages.empty()) {
+      UnsetPref(extension->id(), prefs::kRestoreOnStartup);
+      UnsetPref(extension->id(), prefs::kURLsToRestoreOnStartup);
+    }
+    if (settings->search_engine) {
+      DCHECK(url_service_);
+      if (url_service_->loaded())
+        url_service_->RemoveExtensionControlledTURL(extension->id());
+      else
+        pending_extensions_.erase(extension);
+    }
+  }
+}
 
 void SettingsOverridesAPI::Shutdown() {
   template_url_sub_.reset();
 }
 
 void SettingsOverridesAPI::OnTemplateURLsLoaded() {
   // Register search providers for pending extensions.
   template_url_sub_.reset();
   for (PendingExtensions::const_iterator i(pending_extensions_.begin());
        i != pending_extensions_.end(); ++i) {
@@ skipping 24 matching lines @@
 
 template <>
 void BrowserContextKeyedAPIFactory<
     SettingsOverridesAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionPrefsFactory::GetInstance());
   DependsOn(PreferenceAPI::GetFactoryInstance());
   DependsOn(TemplateURLServiceFactory::GetInstance());
 }
 
 }  // namespace extensions