Extract ProcessManager from ExtensionSystem.

chrome/browser/extensions/chrome_process_manager_delegate.cc

 // Copyright 2014 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/extensions/chrome_process_manager_delegate.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/browser/process_manager_factory.h"
 #include "extensions/common/one_shot_event.h"
 
 namespace extensions {
 
 ChromeProcessManagerDelegate::ChromeProcessManagerDelegate() {
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_WINDOW_READY,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_PROFILE_CREATED,
@@ skipping 66 matching lines @@
 
   // If the extension system isn't ready yet the background hosts will be
   // created automatically when it is.
   ExtensionSystem* system = ExtensionSystem::Get(profile);
   if (!system->ready().is_signaled())
     return;
 
   // Inform the process manager for this profile that the window is ready.
   // We continue to observe the notification in case browser windows open for
   // a related incognito profile or other regular profiles.
-  ProcessManager* manager = system->process_manager();
-  if (!manager)  // Tests may not have a process manager.
-    return;
+  ProcessManager* manager = ProcessManager::Get(profile);
+  DCHECK(manager);
   DCHECK_EQ(profile, manager->GetBrowserContext());
   manager->MaybeCreateStartupBackgroundHosts();
 
   // For incognito profiles also inform the original profile's process manager
   // that the window is ready. This will usually be a no-op because the
   // original profile's process manager should have been informed when the
   // non-incognito window opened.
   if (profile->IsOffTheRecord()) {
     Profile* original_profile = profile->GetOriginalProfile();
-    ProcessManager* original_manager =
-        ExtensionSystem::Get(original_profile)->process_manager();
+    ProcessManager* original_manager = ProcessManager::Get(original_profile);
     DCHECK(original_manager);
     DCHECK_EQ(original_profile, original_manager->GetBrowserContext());
     original_manager->MaybeCreateStartupBackgroundHosts();
   }
 }
 
 void ChromeProcessManagerDelegate::OnProfileCreated(Profile* profile) {
   // Incognito profiles are handled by their original profile.
   if (profile->IsOffTheRecord())
     return;
 
   // The profile can be created before the extension system is ready.
-  ProcessManager* manager = ExtensionSystem::Get(profile)->process_manager();
-  if (!manager)
+  if (!ExtensionSystem::Get(profile)->ready().is_signaled())
     return;
 
   // The profile might have been initialized asynchronously (in parallel with
   // extension system startup). Now that initialization is complete the
   // ProcessManager can load deferred background pages.
-  manager->MaybeCreateStartupBackgroundHosts();
+  ProcessManager::Get(profile)->MaybeCreateStartupBackgroundHosts();
 }
 
 void ChromeProcessManagerDelegate::OnProfileDestroyed(Profile* profile) {
   // Close background hosts when the last profile is closed so that they
   // have time to shutdown various objects on different threads. The
   // ProfileManager destructor is called too late in the shutdown sequence.
   // http://crbug.com/15708
-  ProcessManager* manager = ExtensionSystem::Get(profile)->process_manager();
-  if (manager)
+  ProcessManager* manager =
+      ProcessManagerFactory::GetForBrowserContextIfExists(profile);
+  if (manager) {
     manager->CloseBackgroundHosts();
+  }
 
   // If this profile owns an incognito profile, but it is destroyed before the
   // incognito profile is destroyed, then close the incognito background hosts
   // as well. This happens in a few tests. http://crbug.com/138843
   if (!profile->IsOffTheRecord() && profile->HasOffTheRecordProfile()) {
     ProcessManager* incognito_manager =
-        ExtensionSystem::Get(profile->GetOffTheRecordProfile())
-            ->process_manager();
-    if (incognito_manager)
+        ProcessManagerFactory::GetForBrowserContextIfExists(
+            profile->GetOffTheRecordProfile());
+    if (incognito_manager) {
       incognito_manager->CloseBackgroundHosts();
+    }
   }
 }
 
 }  // namespace extensions