Add abstractions that let embedders drive tests of WebContents.

chrome/browser/favicon/favicon_handler_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/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"
 
 class TestFaviconHandler;
 
 using content::NavigationEntry;
+using content::WebContents;
 
 namespace {
 
 // Fill the given bmp with valid png data.
 void FillDataToBitmap(int w, int h, SkBitmap* bmp) {
   bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
   bmp->allocPixels();
 
   unsigned char* src_data =
       reinterpret_cast<unsigned char*>(bmp->getAddr32(0, 0));
@@ skipping 97 matching lines @@
 }  // namespace
 
 
 // This class is used as a temporary hack to provide working implementations of
 // the various delegate methods.  Most of these methods are actually never
 // called.
 // TODO(rohitrao): Refactor the tests to override these delegate methods instead
 // of subclassing.
 class TestFaviconHandlerDelegate : public FaviconHandlerDelegate {
  public:
-  explicit TestFaviconHandlerDelegate(TabContents* tab_contents)
+  explicit TestFaviconHandlerDelegate(WebContents* tab_contents)
       : tab_contents_(tab_contents) {
   }
 
   virtual NavigationEntry* GetActiveEntry() {
     ADD_FAILURE() << "TestFaviconHandlerDelegate::GetActiveEntry() "
                   << "should never be called in tests.";
     return NULL;
   }
 
   virtual void StartDownload(int id, const GURL& url, int image_size) {
     ADD_FAILURE() << "TestFaviconHandlerDelegate::StartDownload() "
                   << "should never be called in tests.";
   }
 
   virtual void NotifyFaviconUpdated() {
     tab_contents_->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
   }
 
  private:
-  TabContents* tab_contents_;  // weak
+  WebContents* tab_contents_;  // weak
 };
 
 // This class is used to catch the FaviconHandler's download and history
 // request, and also provide the methods to access the FaviconHandler internal.
 class TestFaviconHandler : public FaviconHandler {
  public:
   TestFaviconHandler(const GURL& page_url,
                      Profile* profile,
                      FaviconHandlerDelegate* delegate,
                      Type type)
@@ skipping 651 matching lines @@
   FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
   handler->favicon_data_.image_data = data;
 
   handler->InvokeCallback();
 
   // No download request.
   EXPECT_FALSE(helper.download_handler());
 }
 
 }  // namespace.