cleanup: Remove NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED from c/b/apps

chrome/browser/apps/ephemeral_app_service.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/apps/ephemeral_app_service.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/data_deleter.h"
@@ skipping 44 matching lines @@
 const int EphemeralAppService::kMaxEphemeralAppsCount = 30;
 const int EphemeralAppService::kDataInactiveThreshold = 90;
 
 // static
 EphemeralAppService* EphemeralAppService::Get(Profile* profile) {
   return EphemeralAppServiceFactory::GetForProfile(profile);
 }
 
 EphemeralAppService::EphemeralAppService(Profile* profile)
     : profile_(profile),
+      extension_registry_observer_(this),
       ephemeral_app_count_(-1) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableEphemeralApps))
     return;
 
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED,
-                 content::Source<Profile>(profile_));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
-                 content::Source<Profile>(profile_));
+  extension_registry_observer_.Add(
+      extensions::ExtensionRegistry::Get(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
                  content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                  content::Source<Profile>(profile_));
 }
 
 EphemeralAppService::~EphemeralAppService() {
 }
 
 void EphemeralAppService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSIONS_READY: {
       Init();
       break;
     }
-    case chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED: {
-      const Extension* extension =
-          content::Details<const InstalledExtensionInfo>(details)->extension;
-      DCHECK(extension);
-      if (extensions::util::IsEphemeralApp(extension->id(), profile_)) {
-        ++ephemeral_app_count_;
-        if (ephemeral_app_count_ >= kGarbageCollectAppsTriggerCount)
-          TriggerGarbageCollect(
-              base::TimeDelta::FromSeconds(kGarbageCollectAppsInstallDelay));
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
-      const Extension* extension =
-          content::Details<const Extension>(details).ptr();
-      DCHECK(extension);
-      if (extensions::util::IsEphemeralApp(extension->id(), profile_))
-        --ephemeral_app_count_;
-      break;
-    }
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       // Ideally we need to know when the extension system is shutting down.
       garbage_collect_apps_timer_.Stop();
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
+void EphemeralAppService::OnExtensionWillBeInstalled(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    bool is_update,
+    const std::string& old_name) {
+  DCHECK(extension);

[not at google - send to devlin, 2014/05/27 17:40:16]

no need for DCHECK

[limasdf, 2014/05/27 17:54:07]

Done.

+  if (extensions::util::IsEphemeralApp(extension->id(), profile_)) {
+    ++ephemeral_app_count_;
+    if (ephemeral_app_count_ >= kGarbageCollectAppsTriggerCount)
+      TriggerGarbageCollect(
+          base::TimeDelta::FromSeconds(kGarbageCollectAppsInstallDelay));
+  }
+}
+
+void EphemeralAppService::OnExtensionUninstalled(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
+  DCHECK(extension);

[not at google - send to devlin, 2014/05/27 17:40:16]

no need for DCHECK

[limasdf, 2014/05/27 17:54:07]

Done.

+  if (extensions::util::IsEphemeralApp(extension->id(), profile_))
+    --ephemeral_app_count_;
+}
+
 void EphemeralAppService::Init() {
   InitEphemeralAppCount();
   TriggerGarbageCollect(
       base::TimeDelta::FromSeconds(kGarbageCollectAppsStartupDelay));
 
   garbage_collect_data_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromSeconds(kGarbageCollectDataStartupDelay),
       this,
       &EphemeralAppService::GarbageCollectData);
@@ skipping 147 matching lines @@
           info->extension_id,
           &error));
 
       if (extension.get())
         extensions::DataDeleter::StartDeleting(profile_, extension.get());
     }
 
     prefs->RemoveEvictedEphemeralApp(info->extension_id);
   }
 }