Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

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 cf3d7a6adea29b87aac26f9667e803f5b4b6ca18..5917dfa39245c8f203da316a579113799e99a355 100644
--- a/chrome/browser/tabs/tab_strip_model_order_controller.cc
+++ b/chrome/browser/tabs/tab_strip_model_order_controller.cc
@@ -40,7 +40,7 @@ int TabStripModelOrderController::DetermineInsertionIndex(
       return tabstrip_->active_index() + delta;
     }
     NavigationController* opener =
-        &tabstrip_->GetActiveTabContents()->tab_contents()->GetController();
+        &tabstrip_->GetActiveTabContents()->tab_contents()->controller();
     // Get the index of the next item opened by this tab, and insert after
     // it...
     int index;
@@ -76,7 +76,7 @@ int TabStripModelOrderController::DetermineNewSelectedIndex(
   // group of the removed tab.
   NavigationController* removed_controller =
       &tabstrip_->GetTabContentsAt(removing_index)->
-          tab_contents()->GetController();
+          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,
@@ -131,9 +131,9 @@ void TabStripModelOrderController::ActiveTabChanged(
 
   if (user_gesture && new_opener != old_opener &&
       ((old_contents == NULL && new_opener == NULL) ||
-          new_opener != &old_contents->tab_contents()->GetController()) &&
+          new_opener != &old_contents->tab_contents()->controller()) &&
       ((new_contents == NULL && old_opener == NULL) ||
-          old_opener != &new_contents->tab_contents()->GetController())) {
+          old_opener != &new_contents->tab_contents()->controller())) {
     tabstrip_->ForgetAllOpeners();
   }
 }