GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/browser/guest_view/guest_view_manager.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 
 class GURL;
 
 namespace content {
 class BrowserContext;
 class WebContents;
 }  // namespace content
 
+namespace guestview {
+class GuestViewManagerDelegate;
+}  // namespace guestview
+
 namespace extensions{
 class GuestViewBase;
 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.
   static void set_factory_for_testing(GuestViewManagerFactory* factory) {
     GuestViewManager::factory_ = factory;
   }
   // Returns the guest WebContents associated with the given |guest_instance_id|
   // if the provided |embedder_render_process_id| is allowed to access it.
   // If the embedder is not allowed access, the embedder will be killed, and
   // this method will return NULL. If no WebContents exists with the given
   // instance ID, then NULL will also be returned.
   content::WebContents* GetGuestByInstanceIDSafely(
       int guest_instance_id,
       int embedder_render_process_id);
 
   // Associates the Browser Plugin with |element_instance_id| to a
   // guest that has ID of |guest_instance_id| and sets initialization
   // parameters, |params| for it.
   void AttachGuest(int embedder_process_id,
                    int element_instance_id,
                    int guest_instance_id,
                    const base::DictionaryValue& attach_params);
 
   // Removes the association between |element_instance_id| and a guest instance
   // 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,
       int element_instance_id);
 
   template <typename T>
   void RegisterGuestViewType() {
     auto it = guest_view_registry_.find(T::Type);
     DCHECK(it == guest_view_registry_.end());
     guest_view_registry_[T::Type] = base::Bind(&T::Create);
@@ skipping 36 matching lines @@
 
   // Creates a guest of the provided |view_type|.
   GuestViewBase* CreateGuestInternal(content::WebContents* owner_web_contents,
                                      const std::string& view_type);
 
   // Adds GuestView types to the GuestView registry.
   void RegisterGuestViewTypes();
 
   // 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);
 
   bool CanEmbedderAccessInstanceIDMaybeKill(
       int embedder_render_process_id,
       int guest_instance_id);
 
   bool CanEmbedderAccessInstanceID(int embedder_render_process_id,
                                    int guest_instance_id);
 
@@ skipping 44 matching lines @@
   // RemoveGuest.
   // This is used so that we don't have store all removed instance IDs in
   // |removed_instance_ids_|.
   int last_instance_id_removed_;
   // The remaining instance IDs that are greater than
   // |last_instance_id_removed_| are kept here.
   std::set<int> removed_instance_ids_;
 
   content::BrowserContext* context_;
 
+  scoped_ptr<guestview::GuestViewManagerDelegate> delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(GuestViewManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_