Use UIThreadSearchTermsData to get the Google base URL.

chrome/browser/ui/app_list/start_page_service.cc

 // Copyright 2013 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/app_list/start_page_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/user_metrics.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/google/google_profile_helper.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
+#include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/browser/ui/app_list/speech_auth_helper.h"
 #include "chrome/browser/ui/app_list/speech_recognizer.h"
 #include "chrome/browser/ui/app_list/start_page_observer.h"
 #include "chrome/browser/ui/app_list/start_page_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "components/google/core/browser/google_util.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/speech_recognition_session_preamble.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ skipping 20 matching lines @@
 const char kDoodleJsonPath[] = "async/ddljson";
 
 // Delay between checking for a new doodle when no doodle is found.
 const int kDefaultDoodleRecheckDelayMinutes = 30;
 
 bool InSpeechRecognition(SpeechRecognitionState state) {
   return state == SPEECH_RECOGNITION_RECOGNIZING ||
       state == SPEECH_RECOGNITION_IN_SPEECH;
 }
 
-GURL GetGoogleBaseURL(Profile* profile) {
-  GURL base_url(google_util::CommandLineGoogleBaseURL());
-  if (!base_url.is_valid())
-    base_url = google_profile_helper::GetGoogleHomePageURL(profile);
-
-  return base_url;
-}
-
 }  // namespace
 
 class StartPageService::ProfileDestroyObserver
     : public content::NotificationObserver {
  public:
   explicit ProfileDestroyObserver(StartPageService* service)
       : service_(service) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_PROFILE_DESTROYED,
                    content::Source<Profile>(service_->profile()));
@@ skipping 431 matching lines @@
   webui_finished_loading_ = false;
 }
 
 void StartPageService::FetchDoodleJson() {
   // SetPathStr() requires its argument to stay in scope as long as
   // |replacements| is, so a std::string is needed, instead of a char*.
   std::string path = kDoodleJsonPath;
   GURL::Replacements replacements;
   replacements.SetPathStr(path);
 
-  GURL doodle_url = GetGoogleBaseURL(profile_).ReplaceComponents(replacements);
+  GURL google_base_url(UIThreadSearchTermsData(profile_).GoogleBaseURLValue());
+  GURL doodle_url = google_base_url.ReplaceComponents(replacements);
   doodle_fetcher_.reset(
       net::URLFetcher::Create(0, doodle_url, net::URLFetcher::GET, this));
   doodle_fetcher_->SetRequestContext(profile_->GetRequestContext());
   doodle_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   doodle_fetcher_->Start();
 }
 
 void StartPageService::OnURLFetchComplete(const net::URLFetcher* source) {
   std::string json_data;
   source->GetResponseAsString(&json_data);
@@ skipping 18 matching lines @@
     if (doodle_json->GetAsDictionary(&doodle_dictionary)) {
       int time_to_live = 0;
       if (doodle_dictionary->GetInteger("ddljson.time_to_live_ms",
                                         &time_to_live)) {
         recheck_delay = base::TimeDelta::FromMilliseconds(time_to_live);
       }
     }
 
     contents_->GetWebUI()->CallJavascriptFunction(
         "appList.startPage.onAppListDoodleUpdated", *doodle_json,
-        base::StringValue(GetGoogleBaseURL(profile_).spec()));
+        base::StringValue(
+            UIThreadSearchTermsData(profile_).GoogleBaseURLValue()));
   }
 
   // Check for a new doodle.
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartPageService::FetchDoodleJson,
                  weak_factory_.GetWeakPtr()),
       recheck_delay);
 }
 
 }  // namespace app_list