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

chrome/browser/errorpage_browsertest.cc

Index: chrome/browser/errorpage_browsertest.cc
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
index b2829beb7952e3c9a86229d4f1cfda4e47076664..0e1a67039837d8007f340ae1cee68c3c5554b178 100644
--- a/chrome/browser/errorpage_browsertest.cc
+++ b/chrome/browser/errorpage_browsertest.cc
@@ -12,6 +12,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/net/url_request_failed_dns_job.h"
 #include "content/browser/net/url_request_mock_http_job.h"
+#include "content/browser/tab_contents/tab_contents.h"
 
 using content::BrowserThread;
 
@@ -81,7 +82,8 @@ class ErrorPageTest : public InProcessBrowserTest {
 
     TestNavigationObserver test_navigation_observer(
         content::Source<NavigationController>(
-            &browser()->GetSelectedTabContentsWrapper()->controller()),
+            &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
+                controller()),
         NULL,
         num_navigations);
     if (direction == HISTORY_NAVIGATE_BACK) {