Remove EPM:all_hosts_ and use all_extension_views_ instead.

chrome/browser/extensions/extension_process_manager.h

 // Copyright (c) 2012 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 CHROME_BROWSER_EXTENSIONS_EXTENSION_PROCESS_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PROCESS_MANAGER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/common/view_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Browser;
 class Extension;
 class ExtensionHost;
 class GURL;
 class Profile;
 
 namespace content {
 class RenderViewHost;
 class SiteInstance;
+class WebContents;

[Aaron Boodman, 2012/04/20 06:34:56]

You can remove this.

[benwells, 2012/04/23 05:00:26]

Done.

 };
 
 // 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 ExtensionProcessManager : public content::NotificationObserver {
  public:
+  typedef std::set<ExtensionHost*> ExtensionHostSet;
+  typedef ExtensionHostSet::const_iterator const_iterator;
+
   static ExtensionProcessManager* Create(Profile* profile);
   virtual ~ExtensionProcessManager();
 
+  const ExtensionHostSet& background_hosts() const {
+    return background_hosts_;
+  }
+
+  const ExtensionHostSet& platform_app_hosts() const {

[Aaron Boodman, 2012/04/20 06:34:56]

It seems like this is only needed for one test. Can we implement that test
differently? Like maybe by counting all the views that have a certain view type?

[benwells, 2012/04/23 05:00:26]

They can removed for all platform app tests, except the context menu tests. They
initialize a render view context menu using the WebContents from the
ExtensionHost.

I've been thinking with the split of PlatformShellHost out from ExtensionHost it
might be useful to have a list (for each profile, not static) of the
PlatformShellHost's or shell windows created. Perhaps it would be for each
profile and each app. It would be useful for tests and also platform app APIs
(like the new windows api).

Can I leave this list in until that refactor, during which it would be removed
from ExtensionProcessManager?

[Aaron Boodman, 2012/04/25 21:27:05]

I see. Since you know the view type, perhaps you could downcast from
RVH->delegate() to WebContents in that test.
Yeah, like you mentioned before, I think that if there is going to be any
registering-in-big-lists like all_views_ it should be the top-level classes that
do it.

The way things get registered implicitly when WebContents is created seems
destined to lead to pain.
OK.

+    return platform_app_hosts_;
+  }
+
+  typedef std::set<content::RenderViewHost*> ViewSet;
+  const ViewSet GetAllViews() const;
+
   // Creates a new ExtensionHost with its associated view, grouping it in the
   // appropriate SiteInstance (and therefore process) based on the URL and
   // profile.
   virtual ExtensionHost* CreateViewHost(const Extension* extension,
                                         const GURL& url,
                                         Browser* browser,
                                         content::ViewType view_type);
   ExtensionHost* CreateViewHost(const GURL& url,
                                 Browser* browser,
                                 content::ViewType view_type);
@@ skipping 31 matching lines @@
                               const Extension* extension);
 
   // Unregisters a RenderViewHost as hosting any extension.
   void UnregisterRenderViewHost(content::RenderViewHost* render_view_host);
 
   // Returns all RenderViewHosts that are registered for the specified
   // extension.
   std::set<content::RenderViewHost*> GetRenderViewHostsForExtension(
       const std::string& extension_id);
 
-  // Returns true if |host| is managed by this process manager.
-  bool HasExtensionHost(ExtensionHost* host) const;
+  // Returns the extension associated with the specified RenderViewHost, or
+  // NULL.
+  const Extension* GetExtensionForRenderViewHost(
+      content::RenderViewHost* render_view_host);
 
   // Returns true if the (lazy) background host for the given extension has
   // already been sent the unload event and is shutting down.
   bool IsBackgroundHostClosing(const std::string& extension_id);
 
   // Getter and setter for the lazy background page's keepalive count. This is
   // the count of how many outstanding "things" are keeping the page alive.
   // When this reaches 0, we will begin the process of shutting down the page.
   // "Things" include pending events, resource loads, and API calls.
   int GetLazyKeepaliveCount(const Extension* extension);
   int IncrementLazyKeepaliveCount(const Extension* extension);
   int DecrementLazyKeepaliveCount(const Extension* extension);
 
   // Handles a response to the ShouldUnload message, used for lazy background
   // pages.
   void OnShouldUnloadAck(const std::string& extension_id, int sequence_id);
 
   // Same as above, for the Unload message.
   void OnUnloadAck(const std::string& extension_id);
 
   // Tracks network requests for a given RenderViewHost, used to know
   // when network activity is idle for lazy background pages.
   void OnNetworkRequestStarted(content::RenderViewHost* render_view_host);
   void OnNetworkRequestDone(content::RenderViewHost* render_view_host);
 
-  typedef std::set<ExtensionHost*> ExtensionHostSet;
-  typedef ExtensionHostSet::const_iterator const_iterator;
-  const_iterator begin() const { return all_hosts_.begin(); }
-  const_iterator end() const { return all_hosts_.end(); }
-
  protected:
   explicit ExtensionProcessManager(Profile* profile);
 
   // Called just after |host| is created so it can be registered in our lists.
   void OnExtensionHostCreated(ExtensionHost* host, bool is_background);
 
   // 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;
 
   // Gets the profile associated with site_instance_ and all other
   // related SiteInstances.
   Profile* GetProfile() const;
 
   content::NotificationRegistrar registrar_;
 
-  // The set of all ExtensionHosts managed by this process manager.
-  ExtensionHostSet all_hosts_;
+  // The set of ExtensionHosts running viewless background extensions.
+  ExtensionHostSet background_hosts_;
 
-  // The set of running viewless background extensions.
-  ExtensionHostSet background_hosts_;
+  // The set of ExtensionHosts running platform apps.
+  ExtensionHostSet platform_app_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_;
 
  private:
   // Extra information we keep for each extension's background page.
   struct BackgroundPageData;
   typedef std::string ExtensionId;
@@ skipping 22 matching lines @@
   // associated with a WebContents. This allows us to gather information that
   // was not available when the host was first registered.
   void UpdateRegisteredRenderView(content::RenderViewHost* render_view_host);
 
   BackgroundPageDataMap background_page_data_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionProcessManager);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PROCESS_MANAGER_H_