Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/infobars/infobar_delegate.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/infobars/infobar_delegate.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 81 matching lines @@
 }
 
 InfoBarDelegate::InfoBarDelegate(InfoBarService* infobar_service)
     : contents_unique_id_(0),
       owner_(infobar_service) {
   if (infobar_service)
     StoreActiveEntryUniqueID();
 }
 
 void InfoBarDelegate::StoreActiveEntryUniqueID() {
-  content::WebContents* web_contents = owner_->GetWebContents();
+  content::WebContents* web_contents = owner_->web_contents();
   DCHECK(web_contents);
   NavigationEntry* active_entry =
       web_contents->GetController().GetActiveEntry();
   contents_unique_id_ = active_entry ? active_entry->GetUniqueID() : 0;
 }
 
 bool InfoBarDelegate::ShouldExpireInternal(
     const content::LoadCommittedDetails& details) const {
   // NOTE: If you change this, be sure to check and adjust the behavior of
   // anyone who overrides this as necessary!
   return (contents_unique_id_ != details.entry->GetUniqueID()) ||
       (content::PageTransitionStripQualifier(
           details.entry->GetTransitionType()) ==
               content::PAGE_TRANSITION_RELOAD);
 }
 
 void InfoBarDelegate::RemoveSelf() {
   if (owner_)
     owner_->RemoveInfoBar(this);  // Clears |owner_|.
 }