Eliminate dependence of GoogleURLTracker et al. on InfoBarService

chrome/browser/google/google_url_tracker.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 86 matching lines @@
   // When |profile| is NULL or a testing profile, this function does nothing.
   static void GoogleURLSearchCommitted(Profile* profile);
 
   // No one but GoogleURLTrackerInfoBarDelegate or test code should call these.
   void AcceptGoogleURL(bool redo_searches);
   void CancelGoogleURL();
   const GURL& google_url() const { return google_url_; }
   const GURL& fetched_google_url() const { return fetched_google_url_; }
 
   // No one but GoogleURLTrackerMapEntry should call this.
-  void DeleteMapEntryForService(const InfoBarService* infobar_service);
+  void DeleteMapEntryForManager(
+      const infobars::InfoBarManager* infobar_manager);
 
   // Called by the client after SearchCommitted() registers listeners, to
   // indicate that we've received the "load now pending" notification.
   // |nav_helper| is the GoogleURLTrackerNavigationHelper associated with this
-  // navigation; |infobar_service| is the InfoBarService of the associated tab;
+  // navigation; |infobar_manager| is the InfoBarManager of the associated tab;
   // and |pending_id| is the unique ID of the newly pending NavigationEntry.
   // If there is already a visible GoogleURLTracker infobar for this tab, this
   // function resets its associated pending entry ID to the new ID.  Otherwise
   // this function creates a map entry for the associated tab.
   virtual void OnNavigationPending(
       scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper,
-      InfoBarService* infobar_service,
+      infobars::InfoBarManager* infobar_manager,
       int pending_id);
 
   // Called by the navigation observer once a load we're watching commits.
-  // |infobar_service| is the same as for OnNavigationPending();
+  // |infobar_manager| is the same as for OnNavigationPending();
   // |search_url| is guaranteed to be valid.
-  virtual void OnNavigationCommitted(InfoBarService* infobar_service,
+  virtual void OnNavigationCommitted(infobars::InfoBarManager* infobar_manager,
                                      const GURL& search_url);
 
   // Called by the navigation observer when a tab closes.
   virtual void OnTabClosed(GoogleURLTrackerNavigationHelper* nav_helper);
 
   scoped_ptr<Subscription> RegisterCallback(
       const OnGoogleURLUpdatedCallback& cb);
 
  private:
   friend class GoogleURLTrackerTest;
 
-  typedef std::map<const InfoBarService*, GoogleURLTrackerMapEntry*> EntryMap;
+  typedef std::map<const infobars::InfoBarManager*, GoogleURLTrackerMapEntry*>
+      EntryMap;
 
   // net::URLFetcherDelegate:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // NetworkChangeNotifier::IPAddressObserver:
   virtual void OnIPAddressChanged() OVERRIDE;
 
   // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
@@ skipping 31 matching lines @@
       bool must_be_listening_for_commit);
 
   void NotifyGoogleURLUpdated(GURL old_url, GURL new_url);
 
   CallbackList callback_list_;
 
   Profile* profile_;
 
   scoped_ptr<GoogleURLTrackerClient> client_;
 
-  // Creates an infobar and adds it to the provided InfoBarService.  Returns the
-  // infobar on success or NULL on failure.  The caller does not own the
-  // returned object, the InfoBarService does.
-  base::Callback<
-      infobars::InfoBar*(InfoBarService*, GoogleURLTracker*, const GURL&)>
-      infobar_creator_;
+  // Creates an infobar and adds it to the provided InfoBarManager.  Returns
+  // the infobar on success or NULL on failure.  The caller does not own the
+  // returned object, the InfoBarManager does.
+  base::Callback<infobars::InfoBar*(infobars::InfoBarManager*,
+                                    GoogleURLTracker*,
+                                    const GURL&)> infobar_creator_;
 
   GURL google_url_;
   GURL fetched_google_url_;
   scoped_ptr<net::URLFetcher> fetcher_;
   int fetcher_id_;
   bool in_startup_sleep_;  // True if we're in the five-second "no fetching"
                            // period that begins at browser start.
   bool already_fetched_;   // True if we've already fetched a URL once this run;
                            // we won't fetch again until after a restart.
   bool need_to_fetch_;     // True if a consumer actually wants us to fetch an
                            // updated URL.  If this is never set, we won't
                            // bother to fetch anything.
                            // Consumers should register a callback via
                            // RegisterCallback().
   bool need_to_prompt_;    // True if the last fetched Google URL is not
                            // matched with current user's default Google URL
                            // nor the last prompted Google URL.
   bool search_committed_;  // True when we're expecting a notification of a new
                            // pending search navigation.
   EntryMap entry_map_;
   base::WeakPtrFactory<GoogleURLTracker> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleURLTracker);
 };
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_