Add abstractions that let embedders drive tests of WebContents.

chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/browser/tab_contents/test_tab_contents.h"
+#include "content/public/browser/web_contents.h"
+#include "content/test/web_contents_tester.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 
 using content::OpenURLParams;
 using content::Referrer;
+using content::WebContents;
+using content::WebContentsTester;
 
 namespace {
 
 class TestTabContentsDelegate : public HtmlDialogTabContentsDelegate {
  public:
   explicit TestTabContentsDelegate(Profile* profile)
     : HtmlDialogTabContentsDelegate(profile) {}
 
   virtual ~TestTabContentsDelegate() {
   }
@@ skipping 40 matching lines @@
 TEST_F(HtmlDialogTabContentsDelegateTest, OpenURLFromTabTest) {
   test_tab_contents_delegate_->OpenURLFromTab(
     NULL, OpenURLParams(GURL(chrome::kAboutBlankURL), Referrer(),
     NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
   // This should create a new foreground tab in the existing browser.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1U, BrowserList::size());
 }
 
 TEST_F(HtmlDialogTabContentsDelegateTest, AddNewContentsForegroundTabTest) {
-  TabContents* contents =
-      new TabContents(profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
+  WebContents* contents =
+      WebContentsTester::CreateTestWebContents(profile(), NULL);
   test_tab_contents_delegate_->AddNewContents(
       NULL, contents, NEW_FOREGROUND_TAB, gfx::Rect(), false);
   // This should create a new foreground tab in the existing browser.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1U, BrowserList::size());
 }
 
 TEST_F(HtmlDialogTabContentsDelegateTest, DetachTest) {
   EXPECT_EQ(profile(), test_tab_contents_delegate_->profile());
   test_tab_contents_delegate_->Detach();
   EXPECT_EQ(NULL, test_tab_contents_delegate_->profile());
   // Now, none of the following calls should do anything.
   test_tab_contents_delegate_->OpenURLFromTab(
       NULL, OpenURLParams(GURL(chrome::kAboutBlankURL), Referrer(),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
   test_tab_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB,
                                               gfx::Rect(), false);
   EXPECT_EQ(0, browser()->tab_count());
   EXPECT_EQ(1U, BrowserList::size());
 }
 
 }  // namespace