Add abstractions that let embedders drive tests of WebContents.

chrome/browser/favicon/favicon_handler_unittest.cc

Index: chrome/browser/favicon/favicon_handler_unittest.cc
diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc
index 16952d14efa520ee0b4a20cbd7c76563e82ba37d..296ebea82e1e8f7eaec3418512bda404f2198ad4 100644
--- a/chrome/browser/favicon/favicon_handler_unittest.cc
+++ b/chrome/browser/favicon/favicon_handler_unittest.cc
@@ -1,14 +1,14 @@
-// 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/favicon/favicon_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/favicon_status.h"
+#include "content/public/browser/web_contents.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
@@ -16,6 +16,7 @@
 class TestFaviconHandler;
 
 using content::NavigationEntry;
+using content::WebContents;
 
 namespace {
 
@@ -133,7 +134,7 @@ class HistoryRequestHandler {
 // of subclassing.
 class TestFaviconHandlerDelegate : public FaviconHandlerDelegate {
  public:
-  explicit TestFaviconHandlerDelegate(TabContents* tab_contents)
+  explicit TestFaviconHandlerDelegate(WebContents* tab_contents)
       : tab_contents_(tab_contents) {
   }
 
@@ -153,7 +154,7 @@ class TestFaviconHandlerDelegate : public FaviconHandlerDelegate {
   }
 
  private:
-  TabContents* tab_contents_;  // weak
+  WebContents* tab_contents_;  // weak
 };
 
 // This class is used to catch the FaviconHandler's download and history