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

chrome/browser/debugger/devtools_sanity_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 "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
@@ skipping 484 matching lines @@
 #endif
 // Tests that inspector will reattach to inspected page when it is reloaded
 // after a crash. See http://crbug.com/101952
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestReattachAfterCrash) {
   OpenDevToolsWindow(kDebuggerTestPage);
 
   ui_test_utils::CrashTab(GetInspectedTab());
   ui_test_utils::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetSelectedTabContentsWrapper()->controller()));
+          &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
+              controller()));
   browser()->Reload(CURRENT_TAB);
   observer.Wait();
 
   RunTestFuntion(window_, "testReattachAfterCrash");
   CloseDevToolsWindow();
 }
 
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) {
   OpenDevToolsWindow("about:blank");
   std::string result;
@@ skipping 44 matching lines @@
 
     // Reload page to restart the worker.
     ui_test_utils::NavigateToURL(browser(), url);
 
     // Wait until worker script is paused on the debugger statement.
     RunTestFuntion(window_, "testPauseInSharedWorkerInitialization");
     CloseDevToolsWindow();
 }
 
 }  // namespace