Remove search::ShouldUseAltInstantURL and ShouldUseSearchPathForInstant

chrome/browser/search/search.cc

 // Copyright 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/search/search.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 34 matching lines @@
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h"
 #endif  // defined(OS_CHROMEOS)
 
 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 {
   // Valid URL that should be used.
   NEW_TAB_URL_VALID = 0,
 
   // Corrupt state (e.g. no profile or template url).
   NEW_TAB_URL_BAD = 1,
 
   // URL should not be used because in incognito window.
@@ skipping 400 matching lines @@
   if (!instant_url.SchemeIsCryptographic() &&
       !google_util::StartsWithCommandLineGoogleBaseURL(instant_url)) {
     GURL::Replacements replacements;
     replacements.SetSchemeStr(url::kHttpsScheme);
     instant_url = instant_url.ReplaceComponents(replacements);
   }
 
   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;
 }
 
 // Returns URLs associated with the default search engine for |profile|.
 std::vector<GURL> GetSearchURLs(Profile* profile) {
   std::vector<GURL> result;
   TemplateURL* template_url = GetDefaultSearchProviderTemplateURL(profile);
   if (!template_url)
     return result;
   for (const TemplateURLRef& ref : template_url->url_refs()) {
@@ skipping 88 matching lines @@
 
 InstantSupportState GetInstantSupportStateFromNavigationEntry(
     const content::NavigationEntry& entry) {
   base::string16 value;
   if (!entry.GetExtraData(kInstantSupportStateKey, &value))
     return INSTANT_SUPPORT_UNKNOWN;
 
   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