Turn GoogleURLTrackerNavigationHelper(Impl) into a per-tab object.

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>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/google/google_url_tracker_map_entry.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class GoogleURLTrackerClient;
 class GoogleURLTrackerNavigationHelper;
 class PrefService;
 class Profile;
 
-namespace content {
-class NavigationController;
-}
-
 namespace infobars {
 class InfoBar;
 }
 
 // This object is responsible for checking the Google URL once per network
 // change, and if necessary prompting the user to see if they want to change to
 // using it.  The current and last prompted values are saved to prefs.
 //
 // Most consumers should only call GoogleURL(), which is guaranteed to
 // synchronously return a value at all times (even during startup or in unittest
@@ skipping 16 matching lines @@
   enum Mode {
     NORMAL_MODE,
     UNIT_TEST_MODE,
   };
 
   // Only the GoogleURLTrackerFactory and tests should call this.  No code other
   // than the GoogleURLTracker itself should actually use
   // GoogleURLTrackerFactory::GetForProfile().
   GoogleURLTracker(Profile* profile,
                    scoped_ptr<GoogleURLTrackerClient> client,
-                   scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper,
                    Mode mode);
 
   virtual ~GoogleURLTracker();
 
   // Returns the current Google URL.  This will return a valid URL even if
   // |profile| is NULL or a testing profile.
   //
   // This is the only function most code should ever call.
   static GURL GoogleURL(Profile* profile);
 
@@ skipping 20 matching lines @@
   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);
 
   // Called by the client after SearchCommitted() registers listeners, to
   // indicate that we've received the "load now pending" notification.
-  // |navigation_controller| is the NavigationController for this load;
+  // |nav_helper| is the GoogleURLTrackerNavigationHelper for this load;
   // |infobar_service| is the InfoBarService 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(
-      content::NavigationController* navigation_controller,
-      InfoBarService* infobar_service,
-      int pending_id);
+  virtual void OnNavigationPending(GoogleURLTrackerNavigationHelper* nav_helper,
+                                   InfoBarService* infobar_service,
+                                   int pending_id);
 
   // Called by the navigation observer once a load we're watching commits.
   // |infobar_service| is the same as for OnNavigationPending();
   // |search_url| is guaranteed to be valid.
   virtual void OnNavigationCommitted(InfoBarService* infobar_service,
                                      const GURL& search_url);
 
   // Called by the navigation observer when a tab closes.
-  virtual void OnTabClosed(
-      content::NavigationController* navigation_controller);
+  virtual void OnTabClosed(GoogleURLTrackerNavigationHelper* nav_helper);
 
   static const char kDefaultGoogleHomepage[];
   static const char kSearchDomainCheckURL[];
 
  private:
   friend class GoogleURLTrackerTest;
 
   typedef std::map<const InfoBarService*, GoogleURLTrackerMapEntry*> EntryMap;
 
   // net::URLFetcherDelegate:
@@ skipping 28 matching lines @@
   // Google TLD.
   void CloseAllEntries(bool redo_searches);
 
   // Unregisters any listeners for the navigation controller in |map_entry|.
   // This sanity-DCHECKs that these are registered (or not) in the specific
   // cases we expect.  (|must_be_listening_for_commit| is used purely for this
   // sanity-checking.)  This also unregisters the global navigation pending
   // listener if there are no remaining listeners for navigation commits, as we
   // no longer need them until another search is committed.
   void UnregisterForEntrySpecificNotifications(
-      const GoogleURLTrackerMapEntry& map_entry,

[blundell, 2014/05/15 15:24:14]

The reason for the removal of const several places is that
GoogleURLTrackerMapEntry is now storing NavigationHelpers on which non-const
methods are being called, vs. NavigationControllers that were just being used as
pointer values.

[Peter Kasting, 2014/05/15 21:29:52]

OK, but then you need to pass these objects as pointers, not non-const refs.

[blundell, 2014/05/16 11:54:18]

Done.

+      GoogleURLTrackerMapEntry& map_entry,
       bool must_be_listening_for_commit);
 
   Profile* profile_;
 
   scoped_ptr<GoogleURLTrackerClient> client_;
 
-  scoped_ptr<GoogleURLTrackerNavigationHelper> nav_helper_;
-
   // 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_;
 
   GURL google_url_;
   GURL fetched_google_url_;
   scoped_ptr<net::URLFetcher> fetcher_;
@@ skipping 12 matching lines @@
                            // 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_