Componentize GoogleURLTracker(InfoBarDelegate,MapEntry,NavHelper)

components/google/core/browser/google_url_tracker.h

Index: components/google/core/browser/google_url_tracker.h
diff --git a/chrome/browser/google/google_url_tracker.h b/components/google/core/browser/google_url_tracker.h
similarity index 95%
rename from chrome/browser/google/google_url_tracker.h
rename to components/google/core/browser/google_url_tracker.h
index c87a83ff9bcbc628b887916acfbcfc56195dab2d..65e18eafc63d8e6163821a3397d307e517f0433b 100644
--- a/chrome/browser/google/google_url_tracker.h
+++ b/components/google/core/browser/google_url_tracker.h
@@ -2,8 +2,8 @@
 // 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>
@@ -14,14 +14,14 @@
 #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;
 
@@ -116,6 +116,8 @@ class GoogleURLTracker : public net::URLFetcherDelegate,
   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;
@@ -192,4 +194,4 @@ class GoogleURLTracker : public net::URLFetcherDelegate,
   DISALLOW_COPY_AND_ASSIGN(GoogleURLTracker);
 };
 
-#endif  // CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
+#endif  // COMPONENTS_GOOGLE_CORE_BROWSER_GOOGLE_URL_TRACKER_H_