GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/browser/guest_view/guest_view_manager.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 "extensions/browser/guest_view/guest_view_manager.h"
 
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_constants.h"
-#include "extensions/browser/guest_view/app_view/app_view_guest.h"
-#include "extensions/browser/guest_view/extension_options/extension_options_guest.h"
-#include "extensions/browser/guest_view/extension_view/extension_view_guest.h"
 #include "extensions/browser/guest_view/guest_view_base.h"
+#include "extensions/browser/guest_view/guest_view_manager_delegate.h"
 #include "extensions/browser/guest_view/guest_view_manager_factory.h"
-#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
-#include "extensions/browser/guest_view/surface_worker/surface_worker_guest.h"
-#include "extensions/browser/guest_view/web_view/web_view_guest.h"
-#include "extensions/browser/process_manager.h"
-#include "extensions/browser/process_map.h"
-#include "extensions/common/features/feature.h"
-#include "extensions/common/features/feature_provider.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
 #include "net/base/escape.h"
 #include "url/gurl.h"
 
 using content::BrowserContext;
 using content::SiteInstance;
 using content::WebContents;
+using guestview::GuestViewManagerDelegate;
 
 namespace extensions {
 
 // static
 GuestViewManagerFactory* GuestViewManager::factory_ = nullptr;
 
-GuestViewManager::GuestViewManager(content::BrowserContext* context)
-    : current_instance_id_(0), last_instance_id_removed_(0), context_(context) {
+GuestViewManager::GuestViewManager(
+    content::BrowserContext* context,
+    scoped_ptr<GuestViewManagerDelegate> delegate)
+    : current_instance_id_(0),
+      last_instance_id_removed_(0),
+      context_(context),
+      delegate_(delegate.Pass()) {
 }
 
 GuestViewManager::~GuestViewManager() {}
 
 // static
-GuestViewManager* GuestViewManager::FromBrowserContext(
-    BrowserContext* context) {
-  GuestViewManager* guest_manager =
-      static_cast<GuestViewManager*>(context->GetUserData(
-          guestview::kGuestViewManagerKeyName));
+GuestViewManager* GuestViewManager::CreateWithDelegate(
+    BrowserContext* context,
+    scoped_ptr<GuestViewManagerDelegate> delegate) {
+  GuestViewManager* guest_manager = FromBrowserContext(context);
   if (!guest_manager) {
     if (factory_) {
       guest_manager = factory_->CreateGuestViewManager(context);
     } else {
-      guest_manager = new GuestViewManager(context);
+      guest_manager = new GuestViewManager(context, delegate.Pass());
     }
     context->SetUserData(guestview::kGuestViewManagerKeyName, guest_manager);
   }
   return guest_manager;
 }
 
 // static
-GuestViewManager* GuestViewManager::FromBrowserContextIfAvailable(
+GuestViewManager* GuestViewManager::FromBrowserContext(
     BrowserContext* context) {
   return static_cast<GuestViewManager*>(context->GetUserData(
       guestview::kGuestViewManagerKeyName));
 }
 
 content::WebContents* GuestViewManager::GetGuestByInstanceIDSafely(
     int guest_instance_id,
     int embedder_render_process_id) {
   if (!CanEmbedderAccessInstanceIDMaybeKill(embedder_render_process_id,
                                             guest_instance_id)) {
@@ skipping 38 matching lines @@
 
   const ElementInstanceKey& key = reverse_it->second;
 
   auto it = instance_id_map_.find(key);
   DCHECK(it != instance_id_map_.end());
 
   reverse_instance_id_map_.erase(reverse_it);
   instance_id_map_.erase(it);
 }
 
+bool GuestViewManager::IsOwnedByExtension(GuestViewBase* guest) {
+  return delegate_->IsOwnedByExtension(guest);
+}
+
 int GuestViewManager::GetNextInstanceID() {
   return ++current_instance_id_;
 }
 
 void GuestViewManager::CreateGuest(const std::string& view_type,
                                    content::WebContents* owner_web_contents,
                                    const base::DictionaryValue& create_params,
                                    const WebContentsCreatedCallback& callback) {
   GuestViewBase* guest = CreateGuestInternal(owner_web_contents, view_type);
   if (!guest) {
@@ skipping 118 matching lines @@
 
   auto it = guest_view_registry_.find(view_type);
   if (it == guest_view_registry_.end()) {
     NOTREACHED();
     return nullptr;
   }
 
   return it->second.Run(owner_web_contents);
 }
 
 // static

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

not static

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

Done.

 void GuestViewManager::RegisterGuestViewTypes() {
-  RegisterGuestViewType<AppViewGuest>();
-  RegisterGuestViewType<ExtensionOptionsGuest>();
-  RegisterGuestViewType<ExtensionViewGuest>();
-  RegisterGuestViewType<MimeHandlerViewGuest>();
-  RegisterGuestViewType<SurfaceWorkerGuest>();
-  RegisterGuestViewType<WebViewGuest>();
+  delegate_->RegisterAdditionalGuestViewTypes();
 }
 
-bool GuestViewManager::IsGuestAvailableToContext(
-    GuestViewBase* guest,
-    std::string* owner_extension_id) {
-  const Feature* feature =
-      FeatureProvider::GetAPIFeature(guest->GetAPINamespace());
-  CHECK(feature);
-
-  ProcessMap* process_map = ProcessMap::Get(context_);
-  CHECK(process_map);
-
-  const Extension* owner_extension = ProcessManager::Get(context_)->
-      GetExtensionForWebContents(guest->owner_web_contents());
-  *owner_extension_id = owner_extension ? owner_extension->id() : std::string();
-
-  // Ok for |owner_extension| to be nullptr, the embedder might be WebUI.
-  Feature::Availability availability = feature->IsAvailableToContext(
-      owner_extension,
-      process_map->GetMostLikelyContextType(
-          owner_extension,
-          guest->owner_web_contents()->GetRenderProcessHost()->GetID()),
-      guest->GetOwnerSiteURL());
-
-  return availability.is_available();
+bool GuestViewManager::IsGuestAvailableToContext(GuestViewBase* guest) {
+  return delegate_->IsGuestAvailableToContext(guest);
 }
 
 content::WebContents* GuestViewManager::GetGuestByInstanceID(
     int guest_instance_id) {
   auto it = guest_web_contents_by_instance_id_.find(guest_instance_id);
   if (it == guest_web_contents_by_instance_id_.end())
     return nullptr;
   return it->second;
 }
 
@@ skipping 79 matching lines @@
   return element_instance_id < other.element_instance_id;
 }
 
 bool GuestViewManager::ElementInstanceKey::operator==(
     const GuestViewManager::ElementInstanceKey& other) const {
   return (embedder_process_id == other.embedder_process_id) &&
     (element_instance_id == other.element_instance_id);
 }
 
 }  // namespace extensions