Remove search::ShouldUseAltInstantURL and ShouldUseSearchPathForInstant

chrome/browser/search/search.cc

Index: chrome/browser/search/search.cc
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index aeb5e1a728cab54b425bf4e31a8e3f0b94adb22b..6680dea1d781ab862df9444c7630617239413318 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -52,13 +52,6 @@ namespace search {
 
 namespace {
 
-// Controls whether to use the alternate Instant search base URL. This allows
-// experimentation of Instant search.
-const char kUseAltInstantURL[] = "use_alternate_instant_url";
-const char kUseSearchPathForInstant[] = "use_search_path_for_instant";
-const char kAltInstantURLPath[] = "search";
-const char kAltInstantURLQueryParams[] = "&qbp=1";
-
 // Status of the New Tab URL for the default Search provider. NOTE: Used in a
 // UMA histogram so values should only be added at the end and not reordered.
 enum NewTabURLState {
@@ -479,17 +472,6 @@ GURL GetInstantURL(Profile* profile, bool force_instant_results) {
   if (!IsURLAllowedForSupervisedUser(instant_url, profile))
     return GURL();
 
-  if (ShouldUseAltInstantURL()) {
-    GURL::Replacements replacements;
-      const std::string path(
-          ShouldUseSearchPathForInstant() ? kAltInstantURLPath : std::string());
-    if (!path.empty())
-      replacements.SetPathStr(path);
-    const std::string query(
-        instant_url.query() + std::string(kAltInstantURLQueryParams));
-    replacements.SetQueryStr(query);
-    instant_url = instant_url.ReplaceComponents(replacements);
-  }
   return instant_url;
 }
 
@@ -598,16 +580,4 @@ InstantSupportState GetInstantSupportStateFromNavigationEntry(
   return StringToInstantSupportState(value);
 }
 
-bool ShouldUseAltInstantURL() {
-  FieldTrialFlags flags;
-  return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
-      kUseAltInstantURL, false, flags);
-}
-
-bool ShouldUseSearchPathForInstant() {
-  FieldTrialFlags flags;
-  return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
-      kUseSearchPathForInstant, false, flags);
-}
-
 }  // namespace search