Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

chrome/browser/infobars/infobar_tab_helper.cc

Index: chrome/browser/infobars/infobar_tab_helper.cc
diff --git a/chrome/browser/infobars/infobar_tab_helper.cc b/chrome/browser/infobars/infobar_tab_helper.cc
index d3baf4ae21cf015969fa9931724d1413d507d6e5..000bfb45a9e26d47a89fc0fc923007a3c59f14e2 100644
--- a/chrome/browser/infobars/infobar_tab_helper.cc
+++ b/chrome/browser/infobars/infobar_tab_helper.cc
@@ -55,8 +55,7 @@ void InfoBarTabHelper::AddInfoBar(InfoBarDelegate* delegate) {
   if (infobars_.size() == 1) {
     registrar_.Add(
         this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<NavigationController>(
-            &tab_contents()->GetController()));
+        content::Source<NavigationController>(&tab_contents()->controller()));
   }
 }
 
@@ -119,10 +118,8 @@ void InfoBarTabHelper::RemoveInfoBarInternal(InfoBarDelegate* delegate,
   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()->GetController()));
+    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        content::Source<NavigationController>(&tab_contents()->controller()));
   }
 }
 
@@ -179,7 +176,7 @@ void InfoBarTabHelper::Observe(int type,
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
-      DCHECK(&tab_contents()->GetController() ==
+      DCHECK(&tab_contents()->controller() ==
              content::Source<NavigationController>(source).ptr());
 
       content::LoadCommittedDetails& committed_details =