Partially componentize //chrome/browser/search/search.{h,cc}

chrome/browser/search_engines/ui_thread_search_terms_data.cc

 // Copyright 2014 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/search_engines/ui_thread_search_terms_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 93 matching lines @@
 }
 #endif
 
 std::string UIThreadSearchTermsData::GetSuggestClient() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_ANDROID)
   return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE ?
       "chrome" : "chrome-omni";
 #else
-  return chrome::IsInstantExtendedAPIEnabled() ? "chrome-omni" : "chrome";
+  return search::IsInstantExtendedAPIEnabled() ? "chrome-omni" : "chrome";
 #endif
 }
 
 std::string UIThreadSearchTermsData::GetSuggestRequestIdentifier() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_ANDROID)
   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE)
     return "chrome-mobile-ext-ansg";
 #endif
   return "chrome-ext-ansg";
 }
 
 bool UIThreadSearchTermsData::IsShowingSearchTermsOnSearchResultsPages() const {
-  return chrome::IsInstantExtendedAPIEnabled() &&
-      chrome::IsQueryExtractionEnabled();
+  return search::IsInstantExtendedAPIEnabled() &&
+         search::IsQueryExtractionEnabled();
 }
 
 std::string UIThreadSearchTermsData::InstantExtendedEnabledParam(
     bool for_search) const {
-  return chrome::InstantExtendedEnabledParam(for_search);
+  return search::InstantExtendedEnabledParam(for_search);
 }
 
 std::string UIThreadSearchTermsData::ForceInstantResultsParam(
     bool for_prerender) const {
-  return chrome::ForceInstantResultsParam(for_prerender);
+  return search::ForceInstantResultsParam(for_prerender);
 }
 
 int UIThreadSearchTermsData::OmniboxStartMargin() const {
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile_);
   // Android and iOS have no InstantService.
-  return instant_service ?
-      instant_service->omnibox_start_margin() : chrome::kDisableStartMargin;
+  return instant_service ? instant_service->omnibox_start_margin()
+                         : search::kDisableStartMargin;
 }
 
 std::string UIThreadSearchTermsData::NTPIsThemedParam() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(ENABLE_THEMES)
-  if (!chrome::IsInstantExtendedAPIEnabled())
+  if (!search::IsInstantExtendedAPIEnabled())
     return std::string();
 
   // TODO(dhollowa): Determine fraction of custom themes that don't affect the
   // NTP background and/or color.
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);
   // NTP is considered themed if the theme is not default and not native (GTK+).
   if (theme_service && !theme_service->UsingDefaultTheme() &&
       !theme_service->UsingSystemTheme())
     return "es_th=1&";
 #endif  // defined(ENABLE_THEMES)
@@ skipping 19 matching lines @@
 std::string UIThreadSearchTermsData::GetAcceptLanguages() const {
   return profile_ ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)
                   : std::string();
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }