Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/tabs/tab_strip_model_order_controller.cc

 // Copyright (c) 2012 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/ui/tabs/tab_strip_model_order_controller.h"
 
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 
 using content::NavigationController;
@@ skipping 80 matching lines @@
     // If the tab was in a group, shift selection to the next tab in the group.
     int index = tabstrip_->GetIndexOfNextTabContentsOpenedBy(parent_opener,
                                                              removing_index,
                                                              false);
     if (index != TabStripModel::kNoTab)
       return GetValidIndex(index, removing_index);
 
     // If we can't find a subsequent group member, just fall back to the
     // parent_opener itself. Note that we use "group" here since opener is
     // reset by select operations..
-    index = tabstrip_->GetIndexOfController(parent_opener);
+    index = tabstrip_->GetIndexOfWebContents(parent_opener->GetWebContents());
     if (index != TabStripModel::kNoTab)
       return GetValidIndex(index, removing_index);
   }
 
   // No opener set, fall through to the default handler...
   int selected_index = tabstrip_->active_index();
   if (selected_index >= (tab_count - 1))
     return selected_index - 1;
 
   return selected_index;
@@ skipping 29 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModelOrderController, private:
 
 int TabStripModelOrderController::GetValidIndex(
     int index, int removing_index) const {
   if (removing_index < index)
     index = std::max(0, index - 1);
   return index;
 }