Moves some functions in search.h to components.

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 d473454fd0b7e1adbbf0fc12e4d97ddd9d19634c..2ec05372206852d2e3b13eb26fd17b3910af206a 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -28,6 +28,7 @@
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_entry.h"
@@ -46,24 +47,6 @@ namespace chrome {
 
 namespace {
 
-// Configuration options for Embedded Search.
-// EmbeddedSearch field trials are named in such a way that we can parse out
-// the experiment configuration from the trial's group name in order to give
-// us maximum flexability in running experiments.
-// Field trial groups should be named things like "Group7 espv:2 instant:1".
-// The first token is always GroupN for some integer N, followed by a
-// space-delimited list of key:value pairs which correspond to these flags:
-const char kEmbeddedPageVersionFlagName[] = "espv";
-#if defined(OS_IOS)
-const uint64 kEmbeddedPageVersionDefault = 1;
-#elif defined(OS_ANDROID)
-const uint64 kEmbeddedPageVersionDefault = 1;
-// Use this variant to enable EmbeddedSearch SearchBox API in the results page.
-const uint64 kEmbeddedSearchEnabledVersion = 2;
-#else
-const uint64 kEmbeddedPageVersionDefault = 2;
-#endif
-
 const char kHideVerbatimFlagName[] = "hide_verbatim";
 const char kPrefetchSearchResultsFlagName[] = "prefetch_results";
 const char kPrefetchSearchResultsOnSRP[] = "prefetch_results_srp";
@@ -88,20 +71,6 @@ const char kEnableQueryExtractionFlagName[] = "query_extraction";
 #endif
 const char kShouldShowGoogleLocalNTPFlagName[] = "google_local_ntp";
 
-// Constants for the field trial name and group prefix.
-// Note in M30 and below this field trial was named "InstantExtended" and in
-// M31 was renamed to EmbeddedSearch for clarity and cleanliness.  Since we
-// can't easilly sync up Finch configs with the pushing of this change to
-// Dev & Canary, for now the code accepts both names.
-// TODO(dcblack): Remove the InstantExtended name once M31 hits the Beta
-// channel.
-const char kInstantExtendedFieldTrialName[] = "InstantExtended";
-const char kEmbeddedSearchFieldTrialName[] = "EmbeddedSearch";
-
-// If the field trial's group name ends with this string its configuration will
-// be ignored and Instant Extended will not be enabled by default.
-const char kDisablingSuffix[] = "DISABLED";
-
 // 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 {
@@ -345,35 +314,6 @@ struct NewTabURLDetails {
 // Negative start-margin values prevent the "es_sm" parameter from being used.
 const int kDisableStartMargin = -1;
 
-bool IsInstantExtendedAPIEnabled() {
-#if defined(OS_IOS)
-  return false;
-#elif defined(OS_ANDROID)
-  return EmbeddedSearchPageVersion() == kEmbeddedSearchEnabledVersion;
-#else
-  return true;
-#endif  // defined(OS_IOS)
-}
-
-// Determine what embedded search page version to request from the user's
-// default search provider. If 0, the embedded search UI should not be enabled.
-uint64 EmbeddedSearchPageVersion() {
-#if defined(OS_ANDROID)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableEmbeddedSearchAPI)) {
-    return kEmbeddedSearchEnabledVersion;
-  }
-#endif
-
-  FieldTrialFlags flags;
-  if (GetFieldTrialInfo(&flags)) {
-    return GetUInt64ValueForFlagWithDefault(kEmbeddedPageVersionFlagName,
-                                            kEmbeddedPageVersionDefault,
-                                            flags);
-  }
-  return kEmbeddedPageVersionDefault;
-}
-
 std::string InstantExtendedEnabledParam(bool for_search) {
   if (for_search && !chrome::IsQueryExtractionEnabled())
     return std::string();
@@ -796,69 +736,6 @@ void EnableQueryExtractionForTesting() {
   cl->AppendSwitch(switches::kEnableQueryExtraction);
 }
 
-bool GetFieldTrialInfo(FieldTrialFlags* flags) {
-  // Get the group name.  If the EmbeddedSearch trial doesn't exist, look for
-  // the older InstantExtended name.
-  std::string group_name = base::FieldTrialList::FindFullName(
-      kEmbeddedSearchFieldTrialName);
-  if (group_name.empty()) {
-    group_name = base::FieldTrialList::FindFullName(
-        kInstantExtendedFieldTrialName);
-  }
-
-  if (EndsWith(group_name, kDisablingSuffix, true))
-    return false;
-
-  // We have a valid trial that isn't disabled. Extract the flags.
-  std::string group_prefix(group_name);
-  size_t first_space = group_name.find(" ");
-  if (first_space != std::string::npos) {
-    // There is a flags section of the group name. Split that out and parse it.
-    group_prefix = group_name.substr(0, first_space);
-    if (!base::SplitStringIntoKeyValuePairs(group_name.substr(first_space),
-                                            ':', ' ', flags)) {
-      // Failed to parse the flags section. Assume the whole group name is
-      // invalid.
-      return false;
-    }
-  }
-  return true;
-}
-
-// Given a FieldTrialFlags object, returns the string value of the provided
-// flag.
-std::string GetStringValueForFlagWithDefault(const std::string& flag,
-                                             const std::string& default_value,
-                                             const FieldTrialFlags& flags) {
-  FieldTrialFlags::const_iterator i;
-  for (i = flags.begin(); i != flags.end(); i++) {
-    if (i->first == flag)
-      return i->second;
-  }
-  return default_value;
-}
-
-// Given a FieldTrialFlags object, returns the uint64 value of the provided
-// flag.
-uint64 GetUInt64ValueForFlagWithDefault(const std::string& flag,
-                                        uint64 default_value,
-                                        const FieldTrialFlags& flags) {
-  uint64 value;
-  std::string str_value =
-      GetStringValueForFlagWithDefault(flag, std::string(), flags);
-  if (base::StringToUint64(str_value, &value))
-    return value;
-  return default_value;
-}
-
-// Given a FieldTrialFlags object, returns the boolean value of the provided
-// flag.
-bool GetBoolValueForFlagWithDefault(const std::string& flag,
-                                    bool default_value,
-                                    const FieldTrialFlags& flags) {
-  return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags);
-}
-
 bool ShouldUseAltInstantURL() {
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(