Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/translate/options_menu_model.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/translate/options_menu_model.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 15 matching lines @@
     TranslateInfoBarDelegate* translate_delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       translate_infobar_delegate_(translate_delegate) {
   string16 original_language = translate_delegate->language_name_at(
       translate_delegate->original_language_index());
   string16 target_language = translate_delegate->language_name_at(
       translate_delegate->target_language_index());
 
   // Populate the menu.
   // Incognito mode does not get any preferences related items.
-  if (!translate_delegate->owner()->GetWebContents()->
-      GetBrowserContext()->IsOffTheRecord()) {
+  if (!translate_delegate->owner()->web_contents()->GetBrowserContext()->
+      IsOffTheRecord()) {
     AddCheckItem(IDC_TRANSLATE_OPTIONS_ALWAYS,
         l10n_util::GetStringFUTF16(IDS_TRANSLATE_INFOBAR_OPTIONS_ALWAYS,
             original_language, target_language));
     AddCheckItem(IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_LANG,
         l10n_util::GetStringFUTF16(
             IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_LANG,
             original_language));
     AddCheckItem(IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_SITE,
         l10n_util::GetStringUTF16(
             IDS_TRANSLATE_INFOBAR_OPTIONS_NEVER_TRANSLATE_SITE));
@@ skipping 64 matching lines @@
       UMA_HISTOGRAM_COUNTS("Translate.AlwaysTranslateLang", 1);
       translate_infobar_delegate_->ToggleAlwaysTranslate();
       break;
 
     case IDC_TRANSLATE_REPORT_BAD_LANGUAGE_DETECTION:
       translate_infobar_delegate_->ReportLanguageDetectionError();
       break;
 
     case IDC_TRANSLATE_OPTIONS_ABOUT: {
       WebContents* web_contents =
-          translate_infobar_delegate_->owner()->GetWebContents();
+          translate_infobar_delegate_->owner()->web_contents();
       if (web_contents) {
         OpenURLParams params(
             GURL(chrome::kAboutGoogleTranslateURL), Referrer(),
             NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false);
         web_contents->OpenURL(params);
       }
       break;
     }
 
     default:
       NOTREACHED() << "Invalid command id from menu.";
       break;
   }
 }