Make LoadMonitoringExtensionHostQueue remove itself as an ExtensionHost observer at the correct tim…

apps/app_load_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 "apps/app_load_service.h"
 
 #include "apps/app_load_service_factory.h"
 #include "apps/app_restore_service.h"
 #include "apps/launcher.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 17 matching lines @@
 namespace apps {
 
 AppLoadService::PostReloadAction::PostReloadAction()
     : action_type(LAUNCH_FOR_RELOAD),
       command_line(base::CommandLine::NO_PROGRAM) {
 }
 
 AppLoadService::AppLoadService(Profile* profile)
     : profile_(profile) {
   registrar_.Add(this,
-                 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+                 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD,
                  content::NotificationService::AllSources());
   extensions::ExtensionRegistry::Get(profile_)->AddObserver(this);
 }
 
 AppLoadService::~AppLoadService() {
   extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this);
 }
 
 void AppLoadService::RestartApplication(const std::string& extension_id) {
   post_reload_actions_[extension_id].action_type = RESTART;
@@ skipping 37 matching lines @@
 }
 
 // static
 AppLoadService* AppLoadService::Get(Profile* profile) {
   return apps::AppLoadServiceFactory::GetForProfile(profile);
 }
 
 void AppLoadService::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
-  DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING);
+  DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD);
   extensions::ExtensionHost* host =
       content::Details<extensions::ExtensionHost>(details).ptr();
   const Extension* extension = host->extension();
   // It is possible for an extension to be unloaded before it stops loading.
   if (!extension)
     return;
   std::map<std::string, PostReloadAction>::iterator it =
       post_reload_actions_.find(extension->id());
   if (it == post_reload_actions_.end())
     return;
@@ skipping 44 matching lines @@
             Extension::DISABLE_RELOAD) != 0;
   }
   return false;
 }
 
 bool AppLoadService::HasPostReloadAction(const std::string& extension_id) {
   return post_reload_actions_.find(extension_id) != post_reload_actions_.end();
 }
 
 }  // namespace apps