<webview>: Make contentWindow available prior to attachment (on display:none).

content/browser/browser_plugin/browser_plugin_guest.h

Index: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index eb0a173622fb0ee0869400cdb0bd174399dffbc8..c81841b0c2f0559c9ee8e31b30db5068b0d7f31a 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -28,6 +28,7 @@
 #include "content/common/edit_command.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
+#include "content/public/browser/guest_proxy_host.h"
 #include "content/public/browser/readback_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/platform/WebFocusType.h"
@@ -39,8 +40,6 @@
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/geometry/rect.h"
 
-class GuestSizer;
-class SkBitmap;
 struct BrowserPluginHostMsg_Attach_Params;
 struct FrameHostMsg_CompositorFrameSwappedACK_Params;
 struct FrameHostMsg_ReclaimCompositorResources_Params;
@@ -77,7 +76,7 @@ struct DropData;
 // A BrowserPluginGuest can also create a new unattached guest via
 // CreateNewWindow. The newly created guest will live in the same partition,
 // which means it can share storage and can script this guest.
-class CONTENT_EXPORT BrowserPluginGuest : public GuestSizer,
+class CONTENT_EXPORT BrowserPluginGuest : public GuestProxyHost,
                                           public WebContentsObserver {
  public:
   ~BrowserPluginGuest() override;
@@ -166,8 +165,11 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestSizer,
   bool OnMessageReceived(const IPC::Message& message,
                          RenderFrameHost* render_frame_host) override;
 
-  // GuestSizer implementation.
+  // GuestProxyHost implementation.
+  int GetGuestProxyRoutingID() const override;
+  int GetOrCreateGuestProxyInOwnerProcess() override;
   void SizeContents(const gfx::Size& new_size) override;
+  void WillDestroy() override;
 
   // Exposes the protected web_contents() from WebContentsObserver.
   WebContentsImpl* GetWebContents() const;
@@ -229,8 +231,6 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestSizer,
                      WebContentsImpl* web_contents,
                      BrowserPluginGuestDelegate* delegate);
 
-  void WillDestroy();
-
   void InitInternal(const BrowserPluginHostMsg_Attach_Params& params,
                     WebContentsImpl* owner_web_contents);