Add abstractions that let embedders drive tests of WebContents.

chrome/browser/ui/prefs/prefs_tab_helper_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/common/pref_names.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
-#include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/test/test_browser_thread.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
 class TestPrefsTabHelper : public PrefsTabHelper {
  public:
   explicit TestPrefsTabHelper(WebContents* web_contents)
       : PrefsTabHelper(web_contents),
         was_update_web_preferences_called_(false) {
@@ skipping 29 matching lines @@
     return contents_wrapper2_.get();
   }
 
   TestPrefsTabHelper* CreateTestPrefsTabHelper() {
     TestPrefsTabHelper* test_prefs_helper =
         new TestPrefsTabHelper(contents_wrapper()->web_contents());
     contents_wrapper()->prefs_tab_helper_.reset(test_prefs_helper);
     return test_prefs_helper;
   }
 
-  void SetContents2(TestTabContents* contents) {
+  void SetContents2(WebContents* contents) {
     contents_wrapper2_.reset(
         contents ? new TabContentsWrapper(contents) : NULL);
   }
 
   void TestBooleanPreference(const char* key) {
     PrefService* prefs1 =
         contents_wrapper()->prefs_tab_helper()->per_tab_prefs();
     PrefService* prefs2 =
         contents_wrapper2()->prefs_tab_helper()->per_tab_prefs();
     const bool initial_value = prefs1->GetBoolean(key);
@@ skipping 64 matching lines @@
     EXPECT_EQ(modified_value, prefs2->GetString(key));
 
     prefs1->SetString(key, modified_value);
     EXPECT_EQ(modified_value, prefs1->GetString(key));
     EXPECT_EQ(modified_value, prefs2->GetString(key));
   }
 
  protected:
   virtual void SetUp() OVERRIDE {
     TabContentsWrapperTestHarness::SetUp();
-    SetContents2(CreateTestTabContents());
+    SetContents2(CreateTestWebContents());
   }
 
   virtual void TearDown() OVERRIDE {
     contents_wrapper2_.reset();
     TabContentsWrapperTestHarness::TearDown();
   }
 
  private:
   content::TestBrowserThread ui_thread_;
   scoped_ptr<TabContentsWrapper> contents_wrapper2_;
@@ skipping 70 matching lines @@
 TEST_F(PrefsTabHelperTest, PerTabFantasyFontFamily) {
   TestStringPreference(prefs::kWebKitFantasyFontFamily);
 }
 
 TEST_F(PrefsTabHelperTest, OverridePrefsOnViewCreation) {
   TestPrefsTabHelper* test_prefs_helper = CreateTestPrefsTabHelper();
   EXPECT_FALSE(test_prefs_helper->was_update_web_preferences_called());
   test_prefs_helper->NotifyRenderViewCreated();
   EXPECT_TRUE(test_prefs_helper->was_update_web_preferences_called());
 }