Remove Infobars notifications from GoogleURLTrackerMapEntry

chrome/browser/google/google_url_tracker_map_entry.h

Index: chrome/browser/google/google_url_tracker_map_entry.h
diff --git a/chrome/browser/google/google_url_tracker_map_entry.h b/chrome/browser/google/google_url_tracker_map_entry.h
index 2e035a7a67c56ef495a3df8df75f7c3617314739..026b7e7ec4be98c388fe3dfdccb40efabe5ecf50 100644
--- a/chrome/browser/google/google_url_tracker_map_entry.h
+++ b/chrome/browser/google/google_url_tracker_map_entry.h
@@ -1,12 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_MAP_ENTRY_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_MAP_ENTRY_H_
 
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "components/infobars/core/infobar_manager.h"
 
 class GoogleURLTracker;
 class GoogleURLTrackerInfoBarDelegate;
@@ -16,7 +15,7 @@ namespace content {
 class NavigationController;
 }
 
-class GoogleURLTrackerMapEntry : public content::NotificationObserver {
+class GoogleURLTrackerMapEntry : public infobars::InfoBarManager::Observer {
  public:
   GoogleURLTrackerMapEntry(
       GoogleURLTracker* google_url_tracker,
@@ -39,16 +38,17 @@ class GoogleURLTrackerMapEntry : public content::NotificationObserver {
  private:
   friend class GoogleURLTrackerTest;
 
-  // content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // infobars::InfoBarManager::Observer implementation.

[Peter Kasting, 2014/05/28 22:27:19]

Nit: Preserve the ":" (instead of " implementation.") end-of-comment from the
previous code.

+  virtual void OnInfoBarRemoved(infobars::InfoBar* infobar,
+                                bool animate) OVERRIDE;
+  virtual void OnManagerShuttingDown(
+      infobars::InfoBarManager* manager) OVERRIDE;
 
-  content::NotificationRegistrar registrar_;
   GoogleURLTracker* const google_url_tracker_;
-  const InfoBarService* const infobar_service_;
+  InfoBarService* const infobar_service_;
   GoogleURLTrackerInfoBarDelegate* infobar_delegate_;
   const content::NavigationController* const navigation_controller_;
+  bool observing_;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleURLTrackerMapEntry);
 };