Introduce InfoBarTabService API.

chrome/browser/api/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/api/infobars/infobar_delegate.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/browser/api/infobars/infobar_tab_service.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using content::NavigationEntry;
 
 // InfoBarDelegate ------------------------------------------------------------
 
 InfoBarDelegate::~InfoBarDelegate() {
@@ skipping 63 matching lines @@
 
 ThemeInstalledInfoBarDelegate*
     InfoBarDelegate::AsThemePreviewInfobarDelegate() {
   return NULL;
 }
 
 TranslateInfoBarDelegate* InfoBarDelegate::AsTranslateInfoBarDelegate() {
   return NULL;
 }
 
-InfoBarDelegate::InfoBarDelegate(InfoBarTabHelper* infobar_helper)
+InfoBarDelegate::InfoBarDelegate(InfoBarTabService* infobar_service)
     : contents_unique_id_(0),
-      owner_(infobar_helper) {
-  if (infobar_helper)
-    StoreActiveEntryUniqueID(infobar_helper);
+      owner_(infobar_service) {
+  if (infobar_service)
+    StoreActiveEntryUniqueID(infobar_service);
 }
 
 void InfoBarDelegate::StoreActiveEntryUniqueID(
-    InfoBarTabHelper* infobar_helper) {
+    InfoBarTabService* infobar_service) {
   NavigationEntry* active_entry =
-      infobar_helper->web_contents()->GetController().GetActiveEntry();
+      infobar_service->GetWebContents()->GetController().GetActiveEntry();
   contents_unique_id_ = active_entry ? active_entry->GetUniqueID() : 0;
 }
 
 bool InfoBarDelegate::ShouldExpireInternal(
     const content::LoadCommittedDetails& details) const {
   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_|.
 }