Remove NOTIFICATION_EXTENSIONS_READY from ephemeral_app_service.cc

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 "apps/app_lifetime_monitor_factory.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
-#include "extensions/browser/notification_types.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
+#include "extensions/common/one_shot_event.h"
 
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSet;
 using extensions::ExtensionSystem;
 
 namespace {
 
 // The number of seconds after startup before performing garbage collection
@@ skipping 27 matching lines @@
   return EphemeralAppServiceFactory::GetForProfile(profile);
 }
 
 EphemeralAppService::EphemeralAppService(Profile* profile)
     : profile_(profile),
       extension_registry_observer_(this),
       app_lifetime_monitor_observer_(this),
       ephemeral_app_count_(-1),
       disable_idle_app_delay_(kDefaultDisableAppDelay),
       weak_ptr_factory_(this) {
-  registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED,
-                 content::Source<Profile>(profile_));
+  ExtensionSystem::Get(profile_)->ready().Post(
+      FROM_HERE,
+      base::Bind(&EphemeralAppService::Init, weak_ptr_factory_.GetWeakPtr()));
 }
 
 EphemeralAppService::~EphemeralAppService() {
 }
 
 void EphemeralAppService::ClearCachedApps() {
   // Cancel any pending garbage collects.
   garbage_collect_apps_timer_.Stop();
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile_);
@@ skipping 21 matching lines @@
     DCHECK(registry->GetExtensionById(extension_id,
                                       ExtensionRegistry::EVERYTHING));
     service->UninstallExtension(
         extension_id,
         extensions::UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION,
         base::Bind(&base::DoNothing),
         NULL);
   }
 }
 
-void EphemeralAppService::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  switch (type) {
-    case extensions::NOTIFICATION_EXTENSIONS_READY_DEPRECATED: {
-      Init();
-      break;
-    }
-    default:
-      NOTREACHED();
-  }
-}
-
 void EphemeralAppService::OnExtensionWillBeInstalled(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     bool is_update,
     bool from_ephemeral,
     const std::string& old_name) {
   if (from_ephemeral) {
     // An ephemeral app was just promoted to a regular installed app.
     --ephemeral_app_count_;
     DCHECK_GE(ephemeral_app_count_, 0);
@@ skipping 237 matching lines @@
     // Remove ephemeral apps that have been inactive for a while or if the cache
     // is larger than the desired size.
     if (it->first < inactive_threshold || app_count > kMaxEphemeralAppsCount) {
       remove_app_ids->insert(it->second);
       --app_count;
     } else {
       break;
     }
   }
 }