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

chrome/browser/tabs/tab_strip_model_order_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/tabs/tab_strip_model_order_controller.h"
 
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "content/browser/tab_contents/tab_contents.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModelOrderController, public:
 
 TabStripModelOrderController::TabStripModelOrderController(
     TabStripModel* tabstrip)
     : tabstrip_(tabstrip),
       insertion_policy_(TabStripModel::INSERT_AFTER) {
   tabstrip_->AddObserver(this);
 }
@@ skipping 14 matching lines @@
   // so we don't have to check here too.
   if (transition == content::PAGE_TRANSITION_LINK &&
       tabstrip_->active_index() != -1) {
     int delta = (insertion_policy_ == TabStripModel::INSERT_AFTER) ? 1 : 0;
     if (foreground) {
       // If the page was opened in the foreground by a link click in another
       // tab, insert it adjacent to the tab that opened that link.
       return tabstrip_->active_index() + delta;
     }
     NavigationController* opener =
-        &tabstrip_->GetActiveTabContents()->controller();
+        &tabstrip_->GetActiveTabContents()->tab_contents()->controller();
     // Get the index of the next item opened by this tab, and insert after
     // it...
     int index;
     if (insertion_policy_ == TabStripModel::INSERT_AFTER) {
       index = tabstrip_->GetIndexOfLastTabContentsOpenedBy(
           opener, tabstrip_->active_index());
     } else {
       index = tabstrip_->GetIndexOfFirstTabContentsOpenedBy(
           opener, tabstrip_->active_index());
     }
@@ skipping 14 matching lines @@
 int TabStripModelOrderController::DetermineNewSelectedIndex(
     int removing_index) const {
   int tab_count = tabstrip_->count();
   DCHECK(removing_index >= 0 && removing_index < tab_count);
   NavigationController* parent_opener =
       tabstrip_->GetOpenerOfTabContentsAt(removing_index);
   // First see if the index being removed has any "child" tabs. If it does, we
   // want to select the first in that child group, not the next tab in the same
   // group of the removed tab.
   NavigationController* removed_controller =
-      &tabstrip_->GetTabContentsAt(removing_index)->controller();
+      &tabstrip_->GetTabContentsAt(removing_index)->
+          tab_contents()->controller();
   // The parent opener should never be the same as the controller being removed.
   DCHECK(parent_opener != removed_controller);
   int index = tabstrip_->GetIndexOfNextTabContentsOpenedBy(removed_controller,
                                                            removing_index,
                                                            false);
   if (index != TabStripModel::kNoTab)
     return GetValidIndex(index, removing_index);
 
   if (parent_opener) {
     // If the tab was in a group, shift selection to the next tab in the group.
@@ skipping 34 matching lines @@
       // selection changes (see comment in TabStripModel::AddTabContentsAt).
       if (tabstrip_->ShouldResetGroupOnSelect(old_contents))
         tabstrip_->ForgetGroup(old_contents);
     }
   }
   NavigationController* new_opener =
       tabstrip_->GetOpenerOfTabContentsAt(index);
 
   if (user_gesture && new_opener != old_opener &&
       ((old_contents == NULL && new_opener == NULL) ||
-          new_opener != &old_contents->controller()) &&
+          new_opener != &old_contents->tab_contents()->controller()) &&
       ((new_contents == NULL && old_opener == NULL) ||
-          old_opener != &new_contents->controller())) {
+          old_opener != &new_contents->tab_contents()->controller())) {
     tabstrip_->ForgetAllOpeners();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModelOrderController, private:
 
 int TabStripModelOrderController::GetValidIndex(
     int index, int removing_index) const {
   if (removing_index < index)
     index = std::max(0, index - 1);
   return index;
 }