Abstract GoogleURLTracker & google_util Profile dependencies

chrome/browser/ui/navigation_correction_tab_observer.cc

 // 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.
 
 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/google/google_profile_helper.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/google_api_keys.h"
@@ skipping 65 matching lines @@
 }
 
 void NavigationCorrectionTabObserver::OnEnabledChanged() {
   UpdateNavigationCorrectionInfo(web_contents()->GetRenderViewHost());
 }
 
 void NavigationCorrectionTabObserver::UpdateNavigationCorrectionInfo(
     RenderViewHost* rvh) {
   RenderFrameHost* rfh = rvh->GetMainFrame();
   rfh->Send(new ChromeViewMsg_SetNavigationCorrectionInfo(
-      rfh->GetRoutingID(), GetNavigationCorrectionURL(),
+      rfh->GetRoutingID(),
+      GetNavigationCorrectionURL(),
       google_util::GetGoogleLocale(),
-      google_util::GetGoogleCountryCode(profile_), google_apis::GetAPIKey(),
-      google_util::GetGoogleSearchURL(profile_)));
+      google_profile_helper::GetGoogleCountryCode(profile_),
+      google_apis::GetAPIKey(),
+      google_profile_helper::GetGoogleSearchURL(profile_)));
 }