Towards moving guest management to chrome: Introduce GuestViewManager

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 3d117b2c183eebbfc8856d5f9cf8b7e8d0f6a317..1069f724fe77a94064af95ab1eac3f647804cd79 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -44,6 +44,7 @@
 #include "chrome/browser/guestview/adview/adview_guest.h"
 #include "chrome/browser/guestview/guestview.h"
 #include "chrome/browser/guestview/guestview_constants.h"
+#include "chrome/browser/guestview/guestview_manager.h"
 #include "chrome/browser/guestview/webview/webview_guest.h"
 #include "chrome/browser/media/cast_transport_host_filter.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ -815,6 +816,12 @@ content::WebContentsViewDelegate*
   return chrome::CreateWebContentsViewDelegate(web_contents);
 }
 
+content::BrowserPluginGuestManagerDelegate*
+    ChromeContentBrowserClient::GetGuestManagerDelegate(
+        content::BrowserContext* context) {
+  return GuestViewManager::FromBrowserContext(context);
+}
+
 void ChromeContentBrowserClient::GuestWebContentsCreated(
     SiteInstance* guest_site_instance,
     WebContents* guest_web_contents,
@@ -856,7 +863,8 @@ void ChromeContentBrowserClient::GuestWebContentsCreated(
     *guest_delegate =
         GuestView::Create(guest_web_contents,
                           extension_id,
-                          guest->GetViewType());
+                          guest->GetViewType(),
+                          guest->AsWeakPtr());
     return;
   }
 
@@ -873,7 +881,8 @@ void ChromeContentBrowserClient::GuestWebContentsCreated(
   *guest_delegate =
       GuestView::Create(guest_web_contents,
                         extension_id,
-                        GuestView::GetViewTypeFromString(api_type));
+                        GuestView::GetViewTypeFromString(api_type),
+                        base::WeakPtr<GuestView>());
 }
 
 void ChromeContentBrowserClient::GuestWebContentsAttached(