1 files changed, 10 insertions, 11 deletions

diff --git a/chrome/browser/api/infobars/infobar_delegate.h b/chrome/browser/api/infobars/infobar_delegate.h
index 26b2438..cc092a0 100644
--- a/chrome/browser/api/infobars/infobar_delegate.h
+++ b/chrome/browser/api/infobars/infobar_delegate.h
@@ -13,7 +13,7 @@ class AutoLoginInfoBarDelegate;
 class ConfirmInfoBarDelegate;
 class ExtensionInfoBarDelegate;
 class InfoBar;
-class InfoBarTabHelper;
+class InfoBarTabService;
 class InsecureContentInfoBarDelegate;
 class LinkInfoBarDelegate;
 class MediaStreamInfoBarDelegate;
@@ -58,19 +58,18 @@ class InfoBarDelegate {
 
   // Called to create the InfoBar. Implementation of this method is
   // platform-specific.
-  virtual InfoBar* CreateInfoBar(InfoBarTabHelper* owner) = 0;
-
-  // Called by the InfoBarTabHelper when it removes us.
-  void clear_owner() { owner_ = NULL; }
+  virtual InfoBar* CreateInfoBar(InfoBarTabService* owner) = 0;
 
   // TODO(pkasting): Move to InfoBar once InfoBars own their delegates.
-  InfoBarTabHelper* owner() { return owner_; }
+  InfoBarTabService* owner() { return owner_; }
+
+  void clear_owner() { owner_ = NULL; }
 
   // Returns true if the supplied |delegate| is equal to this one. Equality is
   // left to the implementation to define. This function is called by the
-  // InfoBarTabHelper when determining whether or not a delegate should be
+  // InfoBarTabService when determining whether or not a delegate should be
   // added because a matching one already exists. If this function returns true,
-  // the InfoBarTabHelper will not add the new delegate because it considers
+  // the InfoBarTabService will not add the new delegate because it considers
   // one to already be present.
   virtual bool EqualsDelegate(InfoBarDelegate* delegate) const;
 
@@ -111,12 +110,12 @@ class InfoBarDelegate {
  protected:
   // If |contents| is non-NULL, its active entry's unique ID will be stored
   // using StoreActiveEntryUniqueID automatically.
-  explicit InfoBarDelegate(InfoBarTabHelper* infobar_helper);
+  explicit InfoBarDelegate(InfoBarTabService* infobar_service);
 
   // Store the unique id for the active entry in the specified WebContents, to
   // be used later upon navigation to determine if this InfoBarDelegate should
   // be expired from |contents_|.
-  void StoreActiveEntryUniqueID(InfoBarTabHelper* infobar_helper);
+  void StoreActiveEntryUniqueID(InfoBarTabService* infobar_service);
 
   // Direct accessors for subclasses that need to do something special.
   int contents_unique_id() const { return contents_unique_id_; }
@@ -138,7 +137,7 @@ class InfoBarDelegate {
   int contents_unique_id_;
 
   // TODO(pkasting): Remove.
-  InfoBarTabHelper* owner_;
+  InfoBarTabService* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate);
 };