Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/three_d_api_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/three_d_api_observer.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ skipping 126 matching lines @@
                             THREE_D_INFOBAR_DISMISSAL_MAX);
   return true;
 }
 
 bool ThreeDAPIInfoBarDelegate::Cancel() {
   action_taken_ = true;
   UMA_HISTOGRAM_ENUMERATION("GPU.ThreeDAPIInfoBarDismissal",
                             THREE_D_INFOBAR_RELOADED,
                             THREE_D_INFOBAR_DISMISSAL_MAX);
   content::GpuDataManager::GetInstance()->UnblockDomainFrom3DAPIs(url_);
-  owner()->GetWebContents()->GetController().Reload(true);
+  owner()->web_contents()->GetController().Reload(true);
   return true;
 }
 
 string16 ThreeDAPIInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool ThreeDAPIInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
-  owner()->GetWebContents()->OpenURL(content::OpenURLParams(
+  owner()->web_contents()->OpenURL(content::OpenURLParams(
       GURL("https://support.google.com/chrome/?p=ib_webgl"),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK,
       false));
   return false;
 }
 
 
 // ThreeDAPIObserver ----------------------------------------------------
 
 ThreeDAPIObserver::ThreeDAPIObserver() {
   content::GpuDataManager::GetInstance()->AddObserver(this);
 }
 
 ThreeDAPIObserver::~ThreeDAPIObserver() {
   content::GpuDataManager::GetInstance()->RemoveObserver(this);
 }
 
 void ThreeDAPIObserver::DidBlock3DAPIs(const GURL& url,
                                        int render_process_id,
                                        int render_view_id,
                                        content::ThreeDAPIType requester) {
   content::WebContents* web_contents = tab_util::GetWebContentsByID(
       render_process_id, render_view_id);
   ThreeDAPIInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents), url, requester);
 }