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

chrome/browser/infobars/infobar_tab_helper.cc

Index: chrome/browser/infobars/infobar_tab_helper.cc
===================================================================
--- chrome/browser/infobars/infobar_tab_helper.cc	(revision 115228)
+++ chrome/browser/infobars/infobar_tab_helper.cc	(working copy)
@@ -55,7 +55,8 @@
   if (infobars_.size() == 1) {
     registrar_.Add(
         this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<NavigationController>(&tab_contents()->controller()));
+        content::Source<NavigationController>(
+            &tab_contents()->GetController()));
   }
 }
 
@@ -118,8 +119,10 @@
   infobars_.erase(infobars_.begin() + i);
   // Remove ourselves as an observer if we are tracking no more InfoBars.
   if (infobars_.empty()) {
-    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<NavigationController>(&tab_contents()->controller()));
+    registrar_.Remove(
+        this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        content::Source<NavigationController>(
+            &tab_contents()->GetController()));
   }
 }
 
@@ -176,7 +179,7 @@
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
-      DCHECK(&tab_contents()->controller() ==
+      DCHECK(&tab_contents()->GetController() ==
              content::Source<NavigationController>(source).ptr());
 
       content::LoadCommittedDetails& committed_details =