Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/managed_mode/managed_mode_navigation_observer.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/managed_mode/managed_mode_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 120 matching lines @@
   return BUTTON_OK;
 }
 
 string16 ManagedModeWarningInfobarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   DCHECK_EQ(BUTTON_OK, button);
   return l10n_util::GetStringUTF16(IDS_MANAGED_MODE_GO_BACK_ACTION);
 }
 
 bool ManagedModeWarningInfobarDelegate::Accept() {
-  GoBackToSafety(owner()->GetWebContents());
+  GoBackToSafety(owner()->web_contents());
 
   return false;
 }
 
 bool ManagedModeWarningInfobarDelegate::Cancel() {
   NOTREACHED();
   return false;
 }
 
 bool ManagedModeWarningInfobarDelegate::ShouldExpire(
     const content::LoadCommittedDetails& details) const {
   // ManagedModeNavigationObserver removes us below.
   return false;
 }
 
 void ManagedModeWarningInfobarDelegate::InfoBarDismissed() {
   ManagedModeNavigationObserver* observer =
-      ManagedModeNavigationObserver::FromWebContents(owner()->GetWebContents());
+      ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
   observer->WarnInfobarDismissed();
 }
 
 class ManagedModePreviewInfobarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates a managed mode preview delegate and adds it to |infobar_service|.
   // Returns the delegate if it was successfully added.
   static InfoBarDelegate* Create(InfoBarService* infobar_service);
 
  private:
@@ skipping 39 matching lines @@
 
 string16 ManagedModePreviewInfobarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16(
       (button == BUTTON_OK) ? IDS_MANAGED_MODE_PREVIEW_ACCEPT
                             : IDS_MANAGED_MODE_GO_BACK_ACTION);
 }
 
 bool ManagedModePreviewInfobarDelegate::Accept() {
   ManagedModeNavigationObserver* observer =
-      ManagedModeNavigationObserver::FromWebContents(
-          owner()->GetWebContents());
+      ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
   UMA_HISTOGRAM_ENUMERATION("ManagedMode.PreviewInfobarCommand",
                             INFOBAR_ACCEPT,
                             INFOBAR_HISTOGRAM_BOUNDING_VALUE);
   observer->AddSavedURLsToWhitelistAndClearState();
   return true;
 }
 
 bool ManagedModePreviewInfobarDelegate::Cancel() {
   ManagedModeNavigationObserver* observer =
-      ManagedModeNavigationObserver::FromWebContents(
-          owner()->GetWebContents());
+      ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
   UMA_HISTOGRAM_ENUMERATION("ManagedMode.PreviewInfobarCommand",
                             INFOBAR_CANCEL,
                             INFOBAR_HISTOGRAM_BOUNDING_VALUE);
-  GoBackToSafety(owner()->GetWebContents());
+  GoBackToSafety(owner()->web_contents());
   observer->ClearObserverState();
   return false;
 }
 
 bool ManagedModePreviewInfobarDelegate::ShouldExpire(
     const content::LoadCommittedDetails& details) const {
   // ManagedModeNavigationObserver removes us below.
   return false;
 }
 
 void ManagedModePreviewInfobarDelegate::InfoBarDismissed() {
   ManagedModeNavigationObserver* observer =
-      ManagedModeNavigationObserver::FromWebContents(
-          owner()->GetWebContents());
+      ManagedModeNavigationObserver::FromWebContents(owner()->web_contents());
   observer->PreviewInfobarDismissed();
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ManagedModeNavigationObserver);
 
 ManagedModeNavigationObserver::~ManagedModeNavigationObserver() {
   RemoveTemporaryException();
 }
@@ skipping 266 matching lines @@
 
   if (behavior == ManagedModeURLFilter::BLOCK) {
     DCHECK_EQ(RECORDING_URLS_AFTER_PREVIEW, state_);
     // Add the infobar.
     if (!preview_infobar_delegate_) {
       preview_infobar_delegate_ = ManagedModePreviewInfobarDelegate::Create(
           InfoBarService::FromWebContents(web_contents()));
     }
   }
 }