Reland: Refactor code that defers extension background page loading

extensions/browser/process_manager.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_PROCESS_MANAGER_H_
 #define EXTENSIONS_BROWSER_PROCESS_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 15 matching lines @@
 class DevToolsAgentHost;
 class RenderViewHost;
 class RenderFrameHost;
 class SiteInstance;
 };
 
 namespace extensions {
 
 class Extension;
 class ExtensionHost;
+class ExtensionRegistry;
+class ProcessManagerDelegate;
 class ProcessManagerObserver;
 
 // Manages dynamic state of running Chromium extensions. There is one instance
 // of this class per Profile. OTR Profiles have a separate instance that keeps
 // track of split-mode extensions only.
 class ProcessManager : public content::NotificationObserver {
  public:
   typedef std::set<extensions::ExtensionHost*> ExtensionHostSet;
   typedef ExtensionHostSet::const_iterator const_iterator;
 
@@ skipping 69 matching lines @@
 
   // Tracks network requests for a given RenderFrameHost, used to know
   // when network activity is idle for lazy background pages.
   void OnNetworkRequestStarted(content::RenderFrameHost* render_frame_host);
   void OnNetworkRequestDone(content::RenderFrameHost* render_frame_host);
 
   // Prevents |extension|'s background page from being closed and sends the
   // onSuspendCanceled() event to it.
   void CancelSuspend(const Extension* extension);
 
-  // Ensures background hosts are loaded for a new browser window.
-  void OnBrowserWindowReady();
+  // Creates background hosts if the embedder is ready and they are not already
+  // loaded.
+  void MaybeCreateStartupBackgroundHosts();
 
   // Gets the BrowserContext associated with site_instance_ and all other
   // related SiteInstances.
   content::BrowserContext* GetBrowserContext() const;
 
   // Sets callbacks for testing keepalive impulse behavior.
   typedef base::Callback<void(const std::string& extension_id)>
       ImpulseCallbackForTesting;
   void SetKeepaliveImpulseCallbackForTesting(
       const ImpulseCallbackForTesting& callback);
   void SetKeepaliveImpulseDecrementCallbackForTesting(
       const ImpulseCallbackForTesting& callback);
 
-  // Creates an incognito-context instance for tests. Tests for non-incognito
-  // contexts can just use Create() above.
+  // Creates a non-incognito instance for tests. |registry| allows unit tests
+  // to inject an ExtensionRegistry that is not managed by the usual
+  // BrowserContextKeyedServiceFactory system.
+  static ProcessManager* CreateForTesting(content::BrowserContext* context,
+                                          ExtensionRegistry* registry);
+
+  // Creates an incognito-context instance for tests.
   static ProcessManager* CreateIncognitoForTesting(
       content::BrowserContext* incognito_context,
       content::BrowserContext* original_context,
-      ProcessManager* original_manager);
+      ProcessManager* original_manager,
+      ExtensionRegistry* registry);
+
+  bool startup_background_hosts_created_for_test() const {
+    return startup_background_hosts_created_;
+  }
 
  protected:
   // If |context| is incognito pass the master context as |original_context|.
-  // Otherwise pass the same context for both.
+  // Otherwise pass the same context for both. Pass the ExtensionRegistry for
+  // |context| as |registry|, or override it for testing.
   ProcessManager(content::BrowserContext* context,
-                 content::BrowserContext* original_context);
+                 content::BrowserContext* original_context,
+                 ExtensionRegistry* registry);
 
   // Called on browser shutdown to close our extension hosts.
   void CloseBackgroundHosts();
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Load all background pages once the profile data is ready and the pages
-  // should be loaded.
-  void CreateBackgroundHostsForProfileStartup();
-
   content::NotificationRegistrar registrar_;
 
   // The set of ExtensionHosts running viewless background extensions.
   ExtensionHostSet background_hosts_;
 
   // A SiteInstance related to the SiteInstance for all extensions in
   // this profile.  We create it in such a way that a new
   // browsing instance is created.  This controls process grouping.
   scoped_refptr<content::SiteInstance> site_instance_;
 
+  // Not owned. Also used by IncognitoProcessManager.
+  ExtensionRegistry* extension_registry_;
+
  private:
   friend class ProcessManagerTest;
 
   // Extra information we keep for each extension's background page.
   struct BackgroundPageData;
   typedef std::string ExtensionId;
   typedef std::map<ExtensionId, BackgroundPageData> BackgroundPageDataMap;
   typedef std::map<content::RenderViewHost*,
       extensions::ViewType> ExtensionRenderViews;
 
+  // Load all background pages once the profile data is ready and the pages
+  // should be loaded.
+  void CreateStartupBackgroundHosts();
+
   // Called just after |host| is created so it can be registered in our lists.
   void OnBackgroundHostCreated(ExtensionHost* host);
 
   // Close the given |host| iff it's a background page.
   void CloseBackgroundHost(ExtensionHost* host);
 
   // Internal implementation of DecrementLazyKeepaliveCount with an
   // |extension_id| known to have a lazy background page.
   void DecrementLazyKeepaliveCount(const std::string& extension_id);
 
@@ skipping 14 matching lines @@
   // with an extension).
   bool RegisterRenderViewHost(content::RenderViewHost* render_view_host);
 
   // Unregister RenderViewHosts and clear background page data for an extension
   // which has been unloaded.
   void UnregisterExtension(const std::string& extension_id);
 
   // Clears background page data for this extension.
   void ClearBackgroundPageData(const std::string& extension_id);
 
-  // Returns true if loading background pages should be deferred.
-  bool DeferLoadingBackgroundHosts() const;
-
   void OnDevToolsStateChanged(content::DevToolsAgentHost*, bool attached);
 
   // Contains all active extension-related RenderViewHost instances for all
   // extensions. We also keep a cache of the host's view type, because that
   // information is not accessible at registration/deregistration time.
   ExtensionRenderViews all_extension_views_;
 
   BackgroundPageDataMap background_page_data_;
 
   // The time to delay between an extension becoming idle and
@@ skipping 31 matching lines @@
 
   // Must be last member, see doc on WeakPtrFactory.
   base::WeakPtrFactory<ProcessManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_PROCESS_MANAGER_H_