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

chrome/browser/prerender/prerender_manager.cc

Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 43e69afee24548e33164575f963bfa417f08090a..134a51bb5e16267be1d429e242825502dfa3b3dc 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -609,7 +609,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(TabContents* tab_contents,
   // If the session storage namespaces don't match, cancel the prerender.
   RenderViewHost* old_render_view_host = tab_contents->render_view_host();
   RenderViewHost* new_render_view_host =
-      prerender_contents->prerender_contents()->render_view_host();
+      prerender_contents->prerender_contents()->tab_contents()->
+          render_view_host();
   DCHECK(old_render_view_host);
   DCHECK(new_render_view_host);
   if (old_render_view_host->session_storage_namespace() !=
@@ -662,8 +663,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(TabContents* tab_contents,
   MarkTabContentsAsPrerendered(new_tab_contents->tab_contents());
 
   // Merge the browsing history.
-  new_tab_contents->controller().CopyStateFromAndPrune(
-      &old_tab_contents->controller());
+  new_tab_contents->tab_contents()->controller().CopyStateFromAndPrune(
+      &old_tab_contents->tab_contents()->controller());
   old_tab_contents->core_tab_helper()->delegate()->
       SwapTabContents(old_tab_contents, new_tab_contents);
   prerender_contents->CommitHistory(new_tab_contents);
@@ -693,7 +694,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(TabContents* tab_contents,
     // Schedule the delete to occur after the tab has run its unload handlers.
     on_close_tab_contents_deleters_.push_back(
         new OnCloseTabContentsDeleter(this, old_tab_contents));
-    old_tab_contents->render_view_host()->FirePageBeforeUnload(false);
+    old_tab_contents->tab_contents()->render_view_host()->
+        FirePageBeforeUnload(false);
   } else {
     // No unload handler to run, so delete asap.
     ScheduleDeleteOldTabContents(old_tab_contents, NULL);