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

chrome/browser/extensions/extension_crash_recovery_browsertest.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/process_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 454 matching lines @@
   // Tab should still be open, and extension should be crashed.
   EXPECT_EQ(tabs_before, tab_strip->count());
   EXPECT_EQ(size_before, GetExtensionService()->extensions()->size());
   EXPECT_EQ(crash_size_before + 1,
             GetExtensionService()->terminated_extensions()->size());
 
   {
     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();
   }
   // Extension should now be loaded.
   SCOPED_TRACE("after reloading the tab");
   CheckExtensionConsistency(first_extension_id_);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   ASSERT_EQ(0U, CountBalloons());
 }