Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/ui/browser_list_unittest.cc

 // Copyright (c) 2011 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/printing/background_printing_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
+#include "content/browser/tab_contents/tab_contents.h"
 
 typedef BrowserWithTestWindowTest BrowserListTest;
 
 namespace {
 
 // Helper function to iterate and count all the tabs.
 size_t CountAllTabs() {
   size_t count = 0;
   for (TabContentsIterator iterator; !iterator.done(); ++iterator)
     ++count;
   return count;
 }
 
 // Helper function to navigate to the print preview page.
 void NavigateToPrintUrl(TabContentsWrapper* tab, int page_id) {
   static_cast<TestRenderViewHost*>(
-      tab->render_view_host())->SendNavigate(page_id,
-                                             GURL(chrome::kChromeUIPrintURL));
+      tab->tab_contents()->render_view_host())->SendNavigate(
+          page_id, GURL(chrome::kChromeUIPrintURL));
 }
 
 }  // namespace
 
 TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {
   // Make sure we have 1 window to start with.
   EXPECT_EQ(1U, BrowserList::size());
 
   EXPECT_EQ(0U, CountAllTabs());
 
@@ skipping 185 matching lines @@
 
   // Delete all tabs to clean up.
   for (std::vector<TabContentsWrapper*>::iterator it = owned_tabs.begin();
        it != owned_tabs.end(); ++it) {
     delete *it;
   }
 
   EXPECT_EQ(0U, CountAllTabs());
 }
 #endif