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

chrome/browser/tabs/tab_strip_model_order_controller.cc

Index: chrome/browser/tabs/tab_strip_model_order_controller.cc
diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.cc b/chrome/browser/tabs/tab_strip_model_order_controller.cc
index 76854a4acfc4831cb37c07f39387f6168904d5f1..5917dfa39245c8f203da316a579113799e99a355 100644
--- a/chrome/browser/tabs/tab_strip_model_order_controller.cc
+++ b/chrome/browser/tabs/tab_strip_model_order_controller.cc
@@ -5,6 +5,7 @@
 #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:
@@ -39,7 +40,7 @@ int TabStripModelOrderController::DetermineInsertionIndex(
       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;
@@ -74,7 +75,8 @@ int TabStripModelOrderController::DetermineNewSelectedIndex(
   // 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,
@@ -129,9 +131,9 @@ void TabStripModelOrderController::ActiveTabChanged(
 
   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();
   }
 }