Componentize GoogleURLTracker(InfoBarDelegate,MapEntry,NavHelper)

components/google/core/browser/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_
+#ifndef COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_URL_TRACKER_H_
+#define COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_URL_TRACKER_H_
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/callback_forward.h"
 #include "base/callback_list.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/google/core/browser/google_url_tracker_client.h"
+#include "components/google/core/browser/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;
 
 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.
@@ skipping 74 matching lines @@
   // |search_url| is guaranteed to be valid.
   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);
 
+  GoogleURLTrackerClient* client() { return client_.get(); }

[Peter Kasting, 2014/06/06 18:05:39]

Nit: I'd probably put this up by the fetched_google_url() accessor

[blundell, 2014/06/06 18:49:02]

Done.

+
  private:
   friend class GoogleURLTrackerTest;
   friend class SyncTest;
 
   typedef std::map<const infobars::InfoBarManager*, GoogleURLTrackerMapEntry*>
       EntryMap;
 
   static const char kSearchDomainCheckURL[];
 
   // net::URLFetcherDelegate:
@@ skipping 56 matching lines @@
                            // 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_
+#endif  // COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_URL_TRACKER_H_