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

chrome/browser/prerender/prerender_manager.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 "chrome/browser/prerender/prerender_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 591 matching lines @@
   // don't swap it in because there isn't a good way to merge histories.
   if (prerender_contents->IsCrossSiteNavigationPending()) {
     prerender_contents.release()->Destroy(
         FINAL_STATUS_CROSS_SITE_NAVIGATION_PENDING);
     return false;
   }
 
   // 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() !=
       new_render_view_host->session_storage_namespace()) {
     prerender_contents.release()->Destroy(
         FINAL_STATUS_SESSION_STORAGE_NAMESPACE_MISMATCH);
     return false;
   }
 
   // If we don't want to use prerenders at all, we are done.
@@ skipping 32 matching lines @@
   TabContentsWrapper* new_tab_contents =
       prerender_contents->ReleasePrerenderContents();
   TabContentsWrapper* old_tab_contents =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
   DCHECK(new_tab_contents);
   DCHECK(old_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);
 
   GURL icon_url = prerender_contents->icon_url();
   if (!icon_url.is_empty()) {
     std::vector<FaviconURL> urls;
     urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON));
     new_tab_contents->favicon_tab_helper()->OnUpdateFaviconURL(
         prerender_contents->page_id(),
         urls);
   }
 
   // Update PPLT metrics:
   // If the tab has finished loading, record a PPLT of 0.
   // If the tab is still loading, reset its start time to the current time.
   PrerenderTabHelper* prerender_tab_helper =
       new_tab_contents->prerender_tab_helper();
   DCHECK(prerender_tab_helper != NULL);
   prerender_tab_helper->PrerenderSwappedIn();
 
   // Start pending prerender requests from the PrerenderContents, if there are
   // any.
   prerender_contents->StartPendingPrerenders();
 
   if (old_tab_contents->tab_contents()->NeedToFireBeforeUnload()) {
     // 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);
   }
 
   // TODO(cbentzel): Should prerender_contents move to the pending delete
   //                 list, instead of deleting directly here?
   AddToHistory(prerender_contents.get());
   return true;
 }
@@ skipping 439 matching lines @@
   if (!render_process_host || !render_process_host->GetBrowserContext())
     return NULL;
   Profile* profile = Profile::FromBrowserContext(
       render_process_host->GetBrowserContext());
   if (!profile)
     return NULL;
   return PrerenderManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 }  // namespace prerender