Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/extensions/extension_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/extensions/extension_infobar_delegate.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/infobars/infobar.h"
@@ skipping 29 matching lines @@
     const GURL& url,
     int height)
         : InfoBarDelegate(infobar_service),
           browser_(browser),
           observer_(NULL),
           extension_(extension),
           closing_(false) {
   ExtensionProcessManager* manager =
       extensions::ExtensionSystem::Get(browser->profile())->process_manager();
   extension_host_.reset(manager->CreateInfobarHost(url, browser));
-  extension_host_->SetAssociatedWebContents(infobar_service->GetWebContents());
+  extension_host_->SetAssociatedWebContents(infobar_service->web_contents());
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(browser->profile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(browser->profile()));
 
 #if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK)
   int default_height = InfoBar::kDefaultBarTargetHeight;
 #elif defined(OS_MACOSX)
   // TODO(pkasting): Once Infobars have been ported to Mac, we can remove the
@@ skipping 49 matching lines @@
       RemoveSelf();
   } else {
     DCHECK(type == chrome::NOTIFICATION_EXTENSION_UNLOADED);
     if (extension_ ==
         content::Details<extensions::UnloadedExtensionInfo>(
             details)->extension) {
       RemoveSelf();
     }
   }
 }