Remove TabContents from constrained windows.

chrome/browser/ui/constrained_window_tab_helper_unittest.cc

Index: chrome/browser/ui/constrained_window_tab_helper_unittest.cc
diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
index 81ce4314dfada265a74f2dae85aa61689539706b..03fcc706a14a8b0fd78e2d2d0127e6ed836b1589 100644
--- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
+++ b/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
@@ -4,28 +4,32 @@
 
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
-#include "chrome/browser/ui/tab_contents/test_tab_contents.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
-class ConstrainedWindowTabHelperUnit : public TabContentsTestHarness {
+class ConstrainedWindowTabHelperTest : public ChromeRenderViewHostTestHarness {
  public:
-  ConstrainedWindowTabHelperUnit()
-      : TabContentsTestHarness(),
+  ConstrainedWindowTabHelperTest()
+      : ChromeRenderViewHostTestHarness(),
         ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
+  virtual void SetUp() {
+    ChromeRenderViewHostTestHarness::SetUp();
+    ConstrainedWindowTabHelper::CreateForWebContents(web_contents());
+  }
+
  private:
   content::TestBrowserThread ui_thread_;
 };
 
 class ConstrainedWindowCloseTest : public ConstrainedWindow {
  public:
-  explicit ConstrainedWindowCloseTest(TabContents* tab_contents)
-      : tab_contents_(tab_contents) {
+  explicit ConstrainedWindowCloseTest(content::WebContents* web_contents)
+      : web_contents_(web_contents) {
   }
 
   virtual void ShowConstrainedWindow() {}
@@ -34,18 +38,17 @@ class ConstrainedWindowCloseTest : public ConstrainedWindow {
 
   virtual void CloseConstrainedWindow() {
     ConstrainedWindowTabHelper* constrained_window_tab_helper =
-        ConstrainedWindowTabHelper::FromWebContents(
-            tab_contents_->web_contents());
+        ConstrainedWindowTabHelper::FromWebContents(web_contents_);
     constrained_window_tab_helper->WillClose(this);
     close_count++;
   }
 
   int close_count;
-  TabContents* tab_contents_;
+  content::WebContents* web_contents_;
 };
 
-TEST_F(ConstrainedWindowTabHelperUnit, ConstrainedWindows) {
-  ConstrainedWindowCloseTest window(tab_contents());
+TEST_F(ConstrainedWindowTabHelperTest, ConstrainedWindows) {
+  ConstrainedWindowCloseTest window(web_contents());
   window.close_count = 0;
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents());