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

chrome/browser/extensions/extension_browsertests_misc.cc

Index: chrome/browser/extensions/extension_browsertests_misc.cc
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 5585ec1c08055e03bf99978e061b84b08c4039f2..8f3a461de9015cfa4384697e732fcbb447b45499 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -805,7 +805,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
     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();
   }
@@ -831,7 +832,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
     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();
   }