GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/browser/guest_view/guest_view_manager.h

Index: extensions/browser/guest_view/guest_view_manager.h
diff --git a/extensions/browser/guest_view/guest_view_manager.h b/extensions/browser/guest_view/guest_view_manager.h
index 626b583860baabf452b1839ffd78d510ecebf66c..36bad21652c73a491fe7db9a656e1cb3e6384235 100644
--- a/extensions/browser/guest_view/guest_view_manager.h
+++ b/extensions/browser/guest_view/guest_view_manager.h
@@ -22,6 +22,10 @@ class BrowserContext;
 class WebContents;
 }  // namespace content
 
+namespace guestview {
+class GuestViewManagerDelegate;
+}  // namespace guestview
+
 namespace extensions{
 class GuestViewBase;
 class GuestViewManagerFactory;
@@ -29,17 +33,19 @@ class GuestViewManagerFactory;
 class GuestViewManager : public content::BrowserPluginGuestManager,
                          public base::SupportsUserData::Data {
  public:
-  explicit GuestViewManager(content::BrowserContext* context);
+  GuestViewManager(content::BrowserContext* context,
+                   scoped_ptr<guestview::GuestViewManagerDelegate> delegate);
   ~GuestViewManager() override;
 
   // Returns the GuestViewManager associated with |context|. If one isn't
   // available, then it is created and returned.
-  static GuestViewManager* FromBrowserContext(content::BrowserContext* context);
+  static GuestViewManager* CreateWithDelegate(
+      content::BrowserContext* context,
+      scoped_ptr<guestview::GuestViewManagerDelegate> delegate);
 
   // Returns the GuestViewManager associated with |context|. If one isn't
   // available, then nullptr is returned.
-  static GuestViewManager* FromBrowserContextIfAvailable(
-      content::BrowserContext* context);
+  static GuestViewManager* FromBrowserContext(content::BrowserContext* context);
 
   // Overrides factory for testing. Default (NULL) value indicates regular
   // (non-test) environment.
@@ -67,6 +73,10 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
   // ID if one exists.
   void DetachGuest(GuestViewBase* guest);
 
+  // Indicates whether the |guest| provided is owned by an extension or Chrome

[lazyboy, 2015/04/22 15:16:29]

nit: "provided" is redundant

[Fady Samuel, 2015/04/22 23:09:48]

Done.

+  // App.
+  bool IsOwnedByExtension(GuestViewBase* guest);
+
   int GetNextInstanceID();
   int GetGuestInstanceIDForElementID(
       int owner_process_id,
@@ -123,8 +133,7 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
 
   // Indicates whether the provided |guest| can be used in the context it has
   // been created.
-  bool IsGuestAvailableToContext(GuestViewBase* guest,
-                                 std::string* owner_extension_id);
+  bool IsGuestAvailableToContext(GuestViewBase* guest);
 
   content::WebContents* GetGuestByInstanceID(int guest_instance_id);
 
@@ -189,6 +198,8 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
 
   content::BrowserContext* context_;
 
+  scoped_ptr<guestview::GuestViewManagerDelegate> delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(GuestViewManager);
 };