Remove chrome::NOTIFICATION_PROFILE_DESTROYED usage from src/extensions

extensions/browser/process_manager.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 "extensions/browser/process_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 245 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
                  content::Source<BrowserContext>(original_context));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
                  content::Source<BrowserContext>(context));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<BrowserContext>(context));
   registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_CONNECTED,
                  content::NotificationService::AllSources());
-  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
-                 content::Source<BrowserContext>(context));
-  if (context->IsOffTheRecord()) {
-    registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
-                   content::Source<BrowserContext>(original_context));
-  }
 
   // Note: event_page_idle_time_ must be sufficiently larger (e.g. 2x) than
   // kKeepaliveThrottleIntervalInSeconds in ppapi/proxy/plugin_globals.
   event_page_idle_time_ = base::TimeDelta::FromSeconds(10);
   unsigned idle_time_msec = 0;
   if (base::StringToUint(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           extensions::switches::kEventPageIdleTime), &idle_time_msec)) {
     CHECK_GT(idle_time_msec, 0u);  // OnKeepaliveImpulseCheck requires non zero.
     event_page_idle_time_ = base::TimeDelta::FromMilliseconds(idle_time_msec);
   }
@@ skipping 344 matching lines @@
         new ExtensionMsg_CancelSuspend(extension->id()));
     // This increment / decrement is to simulate an instantaneous event. This
     // has the effect of invalidating close_sequence_id, preventing any in
     // progress closes from completing and starting a new close process if
     // necessary.
     IncrementLazyKeepaliveCount(extension);
     DecrementLazyKeepaliveCount(extension);
   }
 }
 
+void ProcessManager::CloseBackgroundHosts() {

[James Cook, 2014/07/24 18:27:54]

Moved unchanged from below to match declaration order.

+  for (ExtensionHostSet::iterator iter = background_hosts_.begin();
+       iter != background_hosts_.end();) {
+    ExtensionHostSet::iterator current = iter++;
+    delete *current;
+  }
+}
+
 content::BrowserContext* ProcessManager::GetBrowserContext() const {
   return site_instance_->GetBrowserContext();
 }
 
 void ProcessManager::SetKeepaliveImpulseCallbackForTesting(
     const ImpulseCallbackForTesting& callback) {
   keepalive_impulse_callback_for_testing_ = callback;
 }
 
 void ProcessManager::SetKeepaliveImpulseDecrementCallbackForTesting(
@@ skipping 92 matching lines @@
 
       // RegisterRenderViewHost is called too early (before the process is
       // available), so we need to wait until now to notify.
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_EXTENSION_VIEW_REGISTERED,
           content::Source<BrowserContext>(GetBrowserContext()),
           content::Details<RenderViewHost>(contents->GetRenderViewHost()));
       break;
     }
 
-    case chrome::NOTIFICATION_PROFILE_DESTROYED: {
-      // Close background hosts when the last browser is closed so that they
-      // have time to shutdown various objects on different threads. Our
-      // destructor is called too late in the shutdown sequence.
-      CloseBackgroundHosts();
-      break;
-    }
-
     default:
       NOTREACHED();
   }
 }
 
 void ProcessManager::OnDevToolsStateChanged(
     content::DevToolsAgentHost* agent_host,
     bool attached) {
   RenderViewHost* rvh = agent_host->GetRenderViewHost();
   // Ignore unrelated notifications.
@@ skipping 81 matching lines @@
 }
 
 void ProcessManager::CloseBackgroundHost(ExtensionHost* host) {
   CHECK(host->extension_host_type() ==
         VIEW_TYPE_EXTENSION_BACKGROUND_PAGE);
   delete host;
   // |host| should deregister itself from our structures.
   CHECK(background_hosts_.find(host) == background_hosts_.end());
 }
 
-void ProcessManager::CloseBackgroundHosts() {
-  for (ExtensionHostSet::iterator iter = background_hosts_.begin();
-       iter != background_hosts_.end(); ) {
-    ExtensionHostSet::iterator current = iter++;
-    delete *current;
-  }
-}
-
 void ProcessManager::UnregisterExtension(const std::string& extension_id) {
   // The lazy_keepalive_count may be greater than zero at this point because
   // RenderViewHosts are still alive. During extension reloading, they will
   // decrement the lazy_keepalive_count to negative for the new extension
   // instance when they are destroyed. Since we are erasing the background page
   // data for the unloaded extension, unregister the RenderViewHosts too.
   BrowserContext* context = GetBrowserContext();
   for (ExtensionRenderViews::iterator it = all_extension_views_.begin();
        it != all_extension_views_.end(); ) {
     if (GetExtensionID(it->first) == extension_id) {
@@ skipping 57 matching lines @@
 SiteInstance* IncognitoProcessManager::GetSiteInstanceForURL(const GURL& url) {
   const Extension* extension =
       extension_registry_->enabled_extensions().GetExtensionOrAppByURL(url);
   if (extension && !IncognitoInfo::IsSplitMode(extension))
     return original_manager_->GetSiteInstanceForURL(url);
 
   return ProcessManager::GetSiteInstanceForURL(url);
 }
 
 }  // namespace extensions