Rename TabContents::controller() to GetController and put it into the WebContents interface.

chrome/browser/tabs/tab_strip_model_order_controller.cc

Index: chrome/browser/tabs/tab_strip_model_order_controller.cc
===================================================================
--- chrome/browser/tabs/tab_strip_model_order_controller.cc	(revision 115228)
+++ chrome/browser/tabs/tab_strip_model_order_controller.cc	(working copy)
@@ -40,7 +40,7 @@
       return tabstrip_->active_index() + delta;
     }
     NavigationController* opener =
-        &tabstrip_->GetActiveTabContents()->tab_contents()->controller();
+        &tabstrip_->GetActiveTabContents()->tab_contents()->GetController();
     // Get the index of the next item opened by this tab, and insert after
     // it...
     int index;
@@ -76,7 +76,7 @@
   // group of the removed tab.
   NavigationController* removed_controller =
       &tabstrip_->GetTabContentsAt(removing_index)->
-          tab_contents()->controller();
+          tab_contents()->GetController();
   // 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 @@
 
   if (user_gesture && new_opener != old_opener &&
       ((old_contents == NULL && new_opener == NULL) ||
-          new_opener != &old_contents->tab_contents()->controller()) &&
+          new_opener != &old_contents->tab_contents()->GetController()) &&
       ((new_contents == NULL && old_opener == NULL) ||
-          old_opener != &new_contents->tab_contents()->controller())) {
+          old_opener != &new_contents->tab_contents()->GetController())) {
     tabstrip_->ForgetAllOpeners();
   }
 }