Refactor ExtensionOptionsGuestDelegate to have an ExtensionOptionsGuest

chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc

Index: chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc
diff --git a/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc b/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc
index 177b9a78af6e901058898aff6b43b5ed281ef80c..8753c0d9667f9c49deda12b29cce897edc779b74 100644
--- a/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc
+++ b/chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc
@@ -9,39 +9,39 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "components/renderer_context_menu/context_menu_delegate.h"
+#include "extensions/browser/guest_view/extension_options/extension_options_guest.h"
 
 namespace extensions {
 
-ChromeExtensionOptionsGuestDelegate::ChromeExtensionOptionsGuestDelegate() {
+ChromeExtensionOptionsGuestDelegate::ChromeExtensionOptionsGuestDelegate(
+    ExtensionOptionsGuest* guest)
+    : ExtensionOptionsGuestDelegate(guest) {
 }
 
 ChromeExtensionOptionsGuestDelegate::~ChromeExtensionOptionsGuestDelegate() {
 }
 
-void
-ChromeExtensionOptionsGuestDelegate::CreateChromeExtensionWebContentsObserver(
-    content::WebContents* web_contents) {
+void ChromeExtensionOptionsGuestDelegate::DidInitialize() {
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
-      web_contents);
+      extension_options_guest()->web_contents());
 }
 
 bool ChromeExtensionOptionsGuestDelegate::HandleContextMenu(
-    content::WebContents* web_contents,
     const content::ContextMenuParams& params) {
-  ContextMenuDelegate* menu_delegate =
-      ContextMenuDelegate::FromWebContents(web_contents);
+  ContextMenuDelegate* menu_delegate = ContextMenuDelegate::FromWebContents(
+      extension_options_guest()->web_contents());
   DCHECK(menu_delegate);
 
-  scoped_ptr<RenderViewContextMenu> menu =
-      menu_delegate->BuildMenu(web_contents, params);
+  scoped_ptr<RenderViewContextMenu> menu = menu_delegate->BuildMenu(
+      extension_options_guest()->web_contents(), params);
   menu_delegate->ShowMenu(menu.Pass());
   return true;
 }
 
 content::WebContents* ChromeExtensionOptionsGuestDelegate::OpenURLInNewTab(
-    content::WebContents* embedder_web_contents,
     const content::OpenURLParams& params) {
-  Browser* browser = chrome::FindBrowserWithWebContents(embedder_web_contents);
+  Browser* browser = chrome::FindBrowserWithWebContents(
+      extension_options_guest()->embedder_web_contents());
   return browser->OpenURL(params);
 }