Componentize GoogleURLTracker(InfoBarDelegate,MapEntry,NavHelper)

chrome/browser/google/chrome_google_url_tracker_client.cc

Index: chrome/browser/google/chrome_google_url_tracker_client.cc
diff --git a/chrome/browser/google/chrome_google_url_tracker_client.cc b/chrome/browser/google/chrome_google_url_tracker_client.cc
index 85278ab7f5acdfaf24cc2c363cfd11947f1c1f09..5f48e00b02813f778c328602679a11fff9fdee38 100644
--- a/chrome/browser/google/chrome_google_url_tracker_client.cc
+++ b/chrome/browser/google/chrome_google_url_tracker_client.cc
@@ -6,11 +6,12 @@
 
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_url_tracker_navigation_helper_impl.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
+#include "components/google/core/browser/google_url_tracker.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
@@ -58,6 +59,17 @@ ChromeGoogleURLTrackerClient::GetRequestContext() {
   return profile_->GetRequestContext();
 }
 
+bool ChromeGoogleURLTrackerClient::IsGoogleDomainURL(const GURL& url) {
+  return google_util::IsGoogleDomainUrl(
+      url,
+      google_util::DISALLOW_SUBDOMAIN,
+      google_util::DISALLOW_NON_STANDARD_PORTS);
+}
+
+GURL ChromeGoogleURLTrackerClient::AppendGoogleLocaleParam(const GURL& url) {
+  return google_util::AppendGoogleLocaleParam(url);
+}
+
 void ChromeGoogleURLTrackerClient::Observe(
     int type,
     const content::NotificationSource& source,