Remove BrowserPluginGuestManager

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 69b0145841004ed79f6fd38e242c0b361762a6be..e11e0091e7732c14c1d28ee570cae3321c8cf065 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -20,7 +20,6 @@
 #include "base/time/time.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
-#include "content/browser/browser_plugin/browser_plugin_guest_manager.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
@@ -58,6 +57,7 @@
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/public/browser/ax_event_notification_details.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/devtools_agent_host.h"
 #include "content/public/browser/download_manager.h"
@@ -1418,7 +1418,7 @@ void WebContentsImpl::CreateNewWindow(
     // This makes |new_contents| act as a guest.
     // For more info, see comment above class BrowserPluginGuest.
     int instance_id =
-        BrowserPluginGuestManager::FromBrowserContext(GetBrowserContext())->
+        GetBrowserContext()->GetGuestManagerDelegate()->
             GetNextInstanceID();

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

nit: fits in previous line.

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

Done.

     WebContentsImpl* new_contents_impl =
         static_cast<WebContentsImpl*>(new_contents);