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

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 251 matching lines @@
   string16 suggested_text;
   UpdateLoader(template_url, last_url_, last_transition_type_, last_user_text_,
                true, &suggested_text);
   return true;
 }
 
 TabContentsWrapper* InstantController::CommitCurrentPreview(
     InstantCommitType type) {
   DCHECK(loader_.get());
   TabContentsWrapper* tab = ReleasePreviewContents(type);
-  tab->controller().CopyStateFromAndPrune(&tab_contents_->controller());
+  tab->tab_contents()->controller().CopyStateFromAndPrune(
+      &tab_contents_->tab_contents()->controller());
   delegate_->CommitInstant(tab);
   CompleteRelease(tab);
   return tab;
 }
 
 void InstantController::SetCommitOnMouseUp() {
   commit_on_mouse_up_ = true;
 }
 
 bool InstantController::IsMouseDownFromActivate() {
@@ skipping 271 matching lines @@
   if (!weak_factory_.HasWeakPtrs()) {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&InstantController::DestroyLoaders,
                               weak_factory_.GetWeakPtr()));
   }
 }
 
 void InstantController::DestroyLoaders() {
   loaders_to_destroy_.reset();
 }