Remove BrowserPluginGuestManager

content/browser/browser_plugin/browser_plugin_guest.cc

 // 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.
 
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
-#include "content/browser/browser_plugin/browser_plugin_guest_manager.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view_guest.h"
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/drag_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_plugin_guest_manager_delegate.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/drop_data.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_constants.h"
@@ skipping 61 matching lines @@
             embedder_render_process_id,
             base::Bind(&BrowserPluginGuest::NewWindowRequest::RespondInternal,
                        base::Unretained(this),
                        should_allow));
   }
 
  private:
   virtual ~NewWindowRequest() {}
 
   void RespondInternal(bool should_allow,
-                       BrowserPluginGuest* guest) {
-    if (!guest) {
+                       WebContents* guest_web_contents) {
+    if (!guest_web_contents) {
       VLOG(0) << "Guest not found. Instance ID: " << instance_id_;
       return;
     }
 
+    BrowserPluginGuest* guest =
+        static_cast<WebContentsImpl*>(guest_web_contents)->
+            GetBrowserPluginGuest();

[lazyboy, 2014/05/05 21:40:54]

DCHECK(guest)?

[Fady Samuel, 2014/05/07 17:32:59]

Done.

     // If we do not destroy the guest then we allow the new window.
     if (!should_allow)
       guest->Destroy();
   }
 
   int instance_id_;
 };
 
 namespace {
 std::string WindowOpenDispositionToString(
@@ skipping 169 matching lines @@
   BrowserPluginGuestDelegate::PermissionResponseCallback callback =
       base::Bind(&BrowserPluginGuest::RespondToPermissionRequest,
                   AsWeakPtr(),
                   request_id);
   delegate_->RequestPermission(
       permission_type, request_info, callback, request->AllowedByDefault());
 }
 
 BrowserPluginGuest* BrowserPluginGuest::CreateNewGuestWindow(
     const OpenURLParams& params) {
-  BrowserPluginGuestManager* guest_manager = GetBrowserPluginGuestManager();
+  BrowserPluginGuestManagerDelegate* guest_manager =
+      GetBrowserPluginGuestManager();
 
   // Allocate a new instance ID for the new guest.
   int instance_id = guest_manager->GetNextInstanceID();
 
   // Set the attach params to use the same partition as the opener.
   // We pull the partition information from the site's URL, which is of the form
   // guest://site/{persist}?{partition_name}.
   const GURL& site_url = GetWebContents()->GetSiteInstance()->GetSiteURL();
 
   // The new guest gets a copy of this guest's extra params so that the content
   // embedder exposes the same API for this guest as its opener.
   scoped_ptr<base::DictionaryValue> extra_params(
       extra_attach_params_->DeepCopy());
   StorageInfo storage_info;
   storage_info.partition_id = site_url.query();
   storage_info.persist =
       site_url.path().find("persist") != std::string::npos;
-  BrowserPluginGuest* new_guest =
+  WebContents* new_guest_web_contents =
       guest_manager->CreateGuest(GetWebContents()->GetSiteInstance(),
                                  instance_id,
                                  storage_info,
                                  extra_params.Pass());
+  BrowserPluginGuest* new_guest =
+      static_cast<WebContentsImpl*>(new_guest_web_contents)->
+          GetBrowserPluginGuest();
   if (new_guest->delegate_)
     new_guest->delegate_->SetOpener(GetWebContents());
 
   // Take ownership of |new_guest|.
   pending_new_windows_.insert(
       std::make_pair(new_guest, NewWindowInfo(params.url, std::string())));
 
   // Request permission to show the new window.
   RequestNewWindowPermission(params.disposition, gfx::Rect(),
                              params.user_gesture, new_guest->GetWebContents());
@@ skipping 225 matching lines @@
 void BrowserPluginGuest::CopyFromCompositingSurface(
       gfx::Rect src_subrect,
       gfx::Size dst_size,
       const base::Callback<void(bool, const SkBitmap&)>& callback) {
   copy_request_callbacks_.insert(std::make_pair(++copy_request_id_, callback));
   SendMessageToEmbedder(
       new BrowserPluginMsg_CopyFromCompositingSurface(instance_id(),
           copy_request_id_, src_subrect, dst_size));
 }
 
-BrowserPluginGuestManager*
+BrowserPluginGuestManagerDelegate*
 BrowserPluginGuest::GetBrowserPluginGuestManager() const {
-  return BrowserPluginGuestManager::FromBrowserContext(
-      GetWebContents()->GetBrowserContext());
+  return GetWebContents()->GetBrowserContext()->GetGuestManagerDelegate();
 }
 
 // screen.
 gfx::Rect BrowserPluginGuest::ToGuestRect(const gfx::Rect& bounds) {
   gfx::Rect guest_rect(bounds);
   guest_rect.Offset(guest_window_rect_.OffsetFromOrigin());
   return guest_rect;
 }
 
 void BrowserPluginGuest::EmbedderVisibilityChanged(bool visible) {
@@ skipping 964 matching lines @@
     const GURL& url) {
   if (!url.is_valid()) {
     callback.Run(false);
     return;
   }
 
   delegate_->CanDownload(request_method, url, callback);
 }
 
 }  // namespace content