Add ContextualSuggestionsService to Omnibox

components/omnibox/browser/omnibox_field_trial.h

Index: components/omnibox/browser/omnibox_field_trial.h
diff --git a/components/omnibox/browser/omnibox_field_trial.h b/components/omnibox/browser/omnibox_field_trial.h
index 43a8c60a70b54a6846f55bf2dba2cf5a37b8b973..6a420ed742f45d5b997ed040f38d0f8625d7cda0 100644
--- a/components/omnibox/browser/omnibox_field_trial.h
+++ b/components/omnibox/browser/omnibox_field_trial.h
@@ -425,26 +425,6 @@ class OmniboxFieldTrial {
   // the user has started typing in the omnibox.
   static int GetPhysicalWebAfterTypingBaseRelevance();
 
-  // ---------------------------------------------------------
-  // For experiment redirecting zero suggest requests to a service provided by

[Mark P, 2017/07/18 19:11:30]

It would be nice to keep all the omnibox field trial logic in one place, so we
can easily see what experiments exist and/or need to be retired.  Please use
these functions if possible.

-  // the Chrome team.
-
-  // Returns true whether the user is in the field trial which redirects zero
-  // suggest requests to the service provided by the Chrome team.
-  static bool InZeroSuggestRedirectToChromeFieldTrial();
-
-  // Returns a string representing the address of the server where the zero
-  // suggest requests are being redirected. The return value is a URL
-  // (https://example.com/test) and it doesn't include any query component
-  // (no "?").
-  static std::string ZeroSuggestRedirectToChromeServerAddress();
-
-  // Returns a string representing the parameters that are sent to the
-  // alternative service providing zero suggestions. The returned value is
-  // properly escaped. It can be appended to the string representaiton of a
-  // request URL.
-  static std::string ZeroSuggestRedirectToChromeAdditionalFields();
-
   // ---------------------------------------------------------
   // Clipboard URL suggestions:
 
@@ -514,11 +494,6 @@ class OmniboxFieldTrial {
   static const char kPhysicalWebZeroSuggestBaseRelevanceParam[];
   static const char kPhysicalWebAfterTypingBaseRelevanceParam[];
 
-  // Parameter names used by the experiment redirecting Zero Suggestion requests
-  // to a service provided by the Chrome team.
-  static const char kZeroSuggestRedirectToChromeServerAddressParam[];
-  static const char kZeroSuggestRedirectToChromeAdditionalFieldsParam[];
-
   // Parameter names used by UI experiments.
   static const char kUIMaxAutocompleteMatchesParam[];
   static const char kUIVerticalMarginParam[];