Revert 110262 - Have ExtensionHost use TabContents instead of RenderViewHost. Try #2.

chrome/browser/ui/gtk/extensions/extension_view_gtk.cc

Index: chrome/browser/ui/gtk/extensions/extension_view_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/extensions/extension_view_gtk.cc	(revision 110269)
+++ chrome/browser/ui/gtk/extensions/extension_view_gtk.cc	(working copy)
@@ -7,14 +7,13 @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/renderer_host/render_widget_host_view.h"
-#include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/tab_contents/tab_contents_view.h"
+#include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 
 ExtensionViewGtk::ExtensionViewGtk(ExtensionHost* extension_host,
                                    Browser* browser)
     : browser_(browser),
       extension_host_(extension_host),
+      render_widget_host_view_(NULL),
       container_(NULL) {
 }
 
@@ -23,7 +22,7 @@
 }
 
 gfx::NativeView ExtensionViewGtk::native_view() {
-  return extension_host_->host_contents()->view()->GetNativeView();
+  return render_widget_host_view_->native_view();
 }
 
 RenderViewHost* ExtensionViewGtk::render_view_host() const {
@@ -31,8 +30,8 @@
 }
 
 void ExtensionViewGtk::SetBackground(const SkBitmap& background) {
-  if (render_view_host()->IsRenderViewLive() && render_view_host()->view()) {
-    render_view_host()->view()->SetBackground(background);
+  if (render_view_host()->IsRenderViewLive()) {
+    render_widget_host_view_->SetBackground(background);
   } else {
     pending_background_ = background;
   }
@@ -44,12 +43,16 @@
 }
 
 void ExtensionViewGtk::CreateWidgetHostView() {
-  extension_host_->CreateRenderViewSoon();
+  DCHECK(!render_widget_host_view_);
+  render_widget_host_view_ = new RenderWidgetHostViewGtk(render_view_host());
+  render_widget_host_view_->InitAsChild();
+
+  extension_host_->CreateRenderViewSoon(render_widget_host_view_);
 }
 
 void ExtensionViewGtk::RenderViewCreated() {
   if (!pending_background_.empty() && render_view_host()->view()) {
-    render_view_host()->view()->SetBackground(pending_background_);
+    render_widget_host_view_->SetBackground(pending_background_);
     pending_background_.reset();
   }