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

chrome/test/base/browser_with_test_window_test.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/test/base/browser_with_test_window_test.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 46 matching lines @@
     TabContents* tab_contents) {
   return static_cast<TestRenderViewHost*>(
       tab_contents->render_view_host());
 }
 
 void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) {
   browser::NavigateParams params(browser, url, content::PAGE_TRANSITION_TYPED);
   params.tabstrip_index = 0;
   params.disposition = NEW_FOREGROUND_TAB;
   browser::Navigate(&params);
-  CommitPendingLoad(&params.target_contents->controller());
+  CommitPendingLoad(&params.target_contents->tab_contents()->controller());
 }
 
 void BrowserWithTestWindowTest::CommitPendingLoad(
     NavigationController* controller) {
   if (!controller->pending_entry())
     return;  // Nothing to commit.
 
   TestRenderViewHost* old_rvh =
       TestRenderViewHostForTab(controller->tab_contents());
   MockRenderProcessHost* mock_rph = static_cast<MockRenderProcessHost*>(
@@ skipping 52 matching lines @@
   // Make sure we close all tabs, otherwise Browser isn't happy in its
   // destructor.
   browser()->CloseAllTabs();
   browser_.reset(NULL);
   window_.reset(NULL);
 }
 
 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
   return new TestingProfile();
 }