Remove deprecated extension notification from content_settings

chrome/browser/content_settings/content_settings_internal_extension_provider.cc

Index: chrome/browser/content_settings/content_settings_internal_extension_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
index ef010c509ec64cc073c72d30f6d6c3fe285992c7..eaad351b8980e2af86e7ee624966e2369a6b3dc2 100644
--- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
+++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
@@ -15,6 +16,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_host.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
@@ -26,7 +28,8 @@ namespace content_settings {
 
 InternalExtensionProvider::InternalExtensionProvider(
     ExtensionService* extension_service)
-    : registrar_(new content::NotificationRegistrar) {
+    : registrar_(new content::NotificationRegistrar),
+      extension_registry_(NULL) {
   // Whitelist all extensions loaded so far.
   const extensions::ExtensionSet* extensions = extension_service->extensions();
   for (extensions::ExtensionSet::const_iterator it = extensions->begin();
@@ -37,11 +40,8 @@ InternalExtensionProvider::InternalExtensionProvider(
   Profile* profile = extension_service->profile();
   registrar_->Add(this, chrome::NOTIFICATION_EXTENSION_HOST_CREATED,
                   content::Source<Profile>(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));
+  extension_registry_ = extensions::ExtensionRegistry::Get(profile);

[Bernhard Bauer, 2014/06/10 08:57:05]

Could you initialize this in the initializer list above?

[limasdf, 2014/06/10 09:29:51]

Done.

+  extension_registry_->AddObserver(this);
 }
 
 InternalExtensionProvider::~InternalExtensionProvider() {
@@ -67,76 +67,77 @@ bool InternalExtensionProvider::SetWebsiteSetting(
 void InternalExtensionProvider::ClearAllContentSettingsRules(
     ContentSettingsType content_type) {}
 
+void InternalExtensionProvider::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
+  if (extensions::PluginInfo::HasPlugins(extension))
+    SetContentSettingForExtension(extension, CONTENT_SETTING_ALLOW);
+}
+
+void InternalExtensionProvider::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    extensions::UnloadedExtensionInfo::Reason reason) {
+  if (extensions::PluginInfo::HasPlugins(extension))
+    SetContentSettingForExtension(extension, CONTENT_SETTING_DEFAULT);
+}
+
+void InternalExtensionProvider::OnShutdown(
+    extensions::ExtensionRegistry* registry) {
+  DCHECK_EQ(extension_registry_, registry);
+  if (extension_registry_) {

[Bernhard Bauer, 2014/06/10 08:57:05]

When can it happen that |extension_registry_| is NULL?

[limasdf, 2014/06/10 09:29:51]

Hm, it seems doesn't necessary. Removed if statement.

+    extension_registry_->RemoveObserver(this);
+    extension_registry_ = NULL;
+  }
+}
+
 void InternalExtensionProvider::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_HOST_CREATED: {
-      const extensions::ExtensionHost* host =
-          content::Details<extensions::ExtensionHost>(details).ptr();
-      if (host->extension()->is_platform_app()) {
-        SetContentSettingForExtension(host->extension(), CONTENT_SETTING_BLOCK);
-
-        // White-list CRD's v2 app, until crbug.com/134216 is complete.
-        const char* kAppWhitelist[] = {
-          "2775E568AC98F9578791F1EAB65A1BF5F8CEF414",
-          "4AA3C5D69A4AECBD236CAD7884502209F0F5C169",
-          "97B23E01B2AA064E8332EE43A7A85C628AADC3F2",
-          "9E930B2B5EABA6243AE6C710F126E54688E8FAF6",
-          "C449A798C495E6CF7D6AF10162113D564E67AD12",
-          "E410CDAB2C6E6DD408D731016CECF2444000A912",
-          "EBA908206905323CECE6DC4B276A58A0F4AC573F",
-
-          // http://crbug.com/327507
-          "FAFE8EFDD2D6AE2EEB277AFEB91C870C79064D9E",
-          "3B52D273A271D4E2348233E322426DBAE854B567",
-          "5DF6ADC8708DF59FCFDDBF16AFBFB451380C2059",
-          "1037DEF5F6B06EA46153AD87B6C5C37440E3F2D1",
-          "F5815DAFEB8C53B078DD1853B2059E087C42F139",
-          "6A08EFFF9C16E090D6DCC7EC55A01CADAE840513",
-
-          // http://crbug.com/354258
-          "C32D6D93E12F5401DAA3A723E0C3CC5F25429BA4",
-          "9099782647D39C778E15C8C6E0D23C88F5CDE170",
-          "B7D5B52D1E5B106288BD7F278CAFA5E8D76108B0",
-          "89349DBAA2C4022FB244AA50182AB60934EB41EE",
-          "CB593E510640572A995CB1B6D41BD85ED51E63F8",
-          "1AD1AC86C87969CD3434FA08D99DBA6840AEA612",
-          "9C2EA21D7975BDF2B3C01C3A454EE44854067A6D",
-          "D2C488C80C3C90C3E01A991112A05E37831E17D0",
-          "6EEC061C0E74B46C7B5BE2EEFA49436368F4988F",
-          "8B344D9E8A4C505EF82A0DBBC25B8BD1F984E777",
-          "E06AFCB1EB0EFD237824CC4AC8FDD3D43E8BC868"
-        };
-        if (extensions::SimpleFeature::IsIdInList(
-                host->extension()->id(),
-                std::set<std::string>(
-                    kAppWhitelist, kAppWhitelist + arraysize(kAppWhitelist)))) {
-          SetContentSettingForExtensionAndResource(
-              host->extension(),
-              ChromeContentClient::kRemotingViewerPluginPath,
-              CONTENT_SETTING_ALLOW);
-        }
-      }
-
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      const extensions::Extension* extension =
-          content::Details<extensions::Extension>(details).ptr();
-      if (extensions::PluginInfo::HasPlugins(extension))
-        SetContentSettingForExtension(extension, CONTENT_SETTING_ALLOW);
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      const UnloadedExtensionInfo& info =
-          *(content::Details<UnloadedExtensionInfo>(details).ptr());
-      if (extensions::PluginInfo::HasPlugins(info.extension))
-        SetContentSettingForExtension(info.extension, CONTENT_SETTING_DEFAULT);
-      break;
+  DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_HOST_CREATED, type);
+  const extensions::ExtensionHost* host =
+      content::Details<extensions::ExtensionHost>(details).ptr();
+  if (host->extension()->is_platform_app()) {
+    SetContentSettingForExtension(host->extension(), CONTENT_SETTING_BLOCK);
+
+    // White-list CRD's v2 app, until crbug.com/134216 is complete.
+    const char* kAppWhitelist[] = {"2775E568AC98F9578791F1EAB65A1BF5F8CEF414",
+                                   "4AA3C5D69A4AECBD236CAD7884502209F0F5C169",
+                                   "97B23E01B2AA064E8332EE43A7A85C628AADC3F2",
+                                   "9E930B2B5EABA6243AE6C710F126E54688E8FAF6",
+                                   "C449A798C495E6CF7D6AF10162113D564E67AD12",
+                                   "E410CDAB2C6E6DD408D731016CECF2444000A912",
+                                   "EBA908206905323CECE6DC4B276A58A0F4AC573F",
+
+                                   // http://crbug.com/327507
+                                   "FAFE8EFDD2D6AE2EEB277AFEB91C870C79064D9E",
+                                   "3B52D273A271D4E2348233E322426DBAE854B567",
+                                   "5DF6ADC8708DF59FCFDDBF16AFBFB451380C2059",
+                                   "1037DEF5F6B06EA46153AD87B6C5C37440E3F2D1",
+                                   "F5815DAFEB8C53B078DD1853B2059E087C42F139",
+                                   "6A08EFFF9C16E090D6DCC7EC55A01CADAE840513",
+
+                                   // http://crbug.com/354258
+                                   "C32D6D93E12F5401DAA3A723E0C3CC5F25429BA4",
+                                   "9099782647D39C778E15C8C6E0D23C88F5CDE170",
+                                   "B7D5B52D1E5B106288BD7F278CAFA5E8D76108B0",
+                                   "89349DBAA2C4022FB244AA50182AB60934EB41EE",
+                                   "CB593E510640572A995CB1B6D41BD85ED51E63F8",
+                                   "1AD1AC86C87969CD3434FA08D99DBA6840AEA612",
+                                   "9C2EA21D7975BDF2B3C01C3A454EE44854067A6D",
+                                   "D2C488C80C3C90C3E01A991112A05E37831E17D0",
+                                   "6EEC061C0E74B46C7B5BE2EEFA49436368F4988F",
+                                   "8B344D9E8A4C505EF82A0DBBC25B8BD1F984E777",
+                                   "E06AFCB1EB0EFD237824CC4AC8FDD3D43E8BC868"};
+    if (extensions::SimpleFeature::IsIdInList(
+            host->extension()->id(),
+            std::set<std::string>(kAppWhitelist,
+                                  kAppWhitelist + arraysize(kAppWhitelist)))) {
+      SetContentSettingForExtensionAndResource(
+          host->extension(),
+          ChromeContentClient::kRemotingViewerPluginPath,
+          CONTENT_SETTING_ALLOW);
     }
-    default:
-      NOTREACHED();
   }
 }