Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm

 // Copyright (c) 2011 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 "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 126 matching lines @@
 }
 
 - (void)changeWebContents:(content::WebContents*)contents {
   registrar_.RemoveAll();
   [self removeAllInfoBars];
 
   currentWebContents_ = contents;
   if (currentWebContents_) {
     InfoBarService* infobarService =
         InfoBarService::FromWebContents(currentWebContents_);
-    for (size_t i = 0; i < infobarService->GetInfoBarCount(); ++i) {
-      InfoBar* infobar = infobarService->
-          GetInfoBarDelegateAt(i)->CreateInfoBar(infobarService);
+    for (size_t i = 0; i < infobarService->infobar_count(); ++i) {
+      InfoBar* infobar =
+          infobarService->infobar_at(i)->CreateInfoBar(infobarService);
       [self addInfoBar:infobar animate:NO];
     }
 
     content::Source<InfoBarService> source(infobarService);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, source);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, source);
     registrar_.Add(infoBarObserver_.get(),
                    chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED, source);
@@ skipping 109 matching lines @@
     frame.size.width = NSWidth(containerBounds);
     [view setFrame:frame];
 
     minY += NSHeight(frame) - infobars::kTipHeight;
   }
 
   [resizeDelegate_ resizeView:[self view] newHeight:[self desiredHeight]];
 }
 
 @end