[omnibox] Rename ZeroSuggestRedirectToChrome

This CL is nearly a pure rename.

It renames the ZeroSuggestRedirectToChrome flags and parameters to
OnFocusSuggestionsCustomEndpoint.

I think the new name is more descriptive, as the old name implied to me
that the request was redirected locally to Chrome, when it was actually
redirected to a Chrome-team maintained custom endpoint.

Going forward, we may be using an endpoint that is NOT maintained by
Chrome-team, so this will become particularly inaccurate if we don't do
the rename.

This feature that's being renamed is currently enabled via field trial
for versions up to 76. This CL renames that feature, but the feature is
still enabled by default in the binary, so it should continue with the
server-side specified behavior.

In other words, only 76 binaries without this feature enabled by
default need the server-side config.

That being said, for good measure it may be good to land this in 77.

Bug: 966462
Change-Id: I4c9f1c1ae285f7d1be1a806b2f4c3b6bd8cd47ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1633229
Commit-Queue: Tommy Li <tommycli@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665327}

components/omnibox/browser/contextual_suggestions_service.cc

@@ -89,7 +89,7 @@ std::string FormatRequestBodyExperimentalService(const std::string& current_url,
   // stream_type = 1 corresponds to zero suggest suggestions.
   request->SetInteger("stream_type", 1);
   const int experiment_id =
-      OmniboxFieldTrial::GetZeroSuggestRedirectToChromeExperimentId();
+      OmniboxFieldTrial::GetOnFocusSuggestionsCustomEndpointExperimentId();
   if (experiment_id >= 0)
     request->SetInteger("experiment_id", experiment_id);
   std::string result;
@@ -176,7 +176,8 @@ GURL ContextualSuggestionsService::ExperimentalContextualSuggestionsUrl(
     return GURL();
   }
 
-  if (!base::FeatureList::IsEnabled(omnibox::kZeroSuggestRedirectToChrome)) {
+  if (!base::FeatureList::IsEnabled(
+          omnibox::kOnFocusSuggestionsCustomEndpoint)) {
     return GURL();
   }
 
@@ -191,16 +192,16 @@ GURL ContextualSuggestionsService::ExperimentalContextualSuggestionsUrl(
   }
 
   const std::string server_address_param =
-      OmniboxFieldTrial::GetZeroSuggestRedirectToChromeServerAddress();
+      OmniboxFieldTrial::GetOnFocusSuggestionsCustomEndpointURL();
   GURL suggest_url(server_address_param.empty()
                        ? kDefaultExperimentalServerAddress
                        : server_address_param);
-  // Check that the suggest URL for redirect to chrome field trial is valid.
+  // Check that the custom endpoint URL is valid.
   if (!suggest_url.is_valid()) {
     return GURL();
   }
 
-  // Check that the suggest URL for redirect to chrome is HTTPS.
+  // Check that the custom endpoint URL is HTTPS.
   if (!suggest_url.SchemeIsCryptographic()) {
     return GURL();
   }

components/omnibox/browser/contextual_suggestions_service.h

@@ -31,7 +31,16 @@ class SharedURLLoaderFactory;
 class SimpleURLLoader;
 }  // namespace network
 
-// A service to fetch suggestions from a remote endpoint given a URL.
+// A service to fetch suggestions from a remote endpoint. Usually, the remote
+// endpoint is the default search provider's suggest service. However, the
+// endpoint URL can be customized by field trial.
+//
+// This service is always sent the user's authentication state, so the
+// suggestions always can be personalized. This service is also sometimes sent
+// the user's current URL, so the suggestions are sometimes also contextual.
+//
+// TODO(tommycli): Probably we should just rename this RemoteSuggestionsService,
+// as the suggestions are not always contextual.
 class ContextualSuggestionsService : public KeyedService {
  public:
   // |identity_manager| may be null but only unauthenticated requests will

components/omnibox/browser/contextual_suggestions_service_unittest.cc

@@ -49,7 +49,7 @@ class ContextualSuggestionsServiceTest : public testing::Test {
 TEST_F(ContextualSuggestionsServiceTest, EnsureAttachCookies) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndDisableFeature(
-      omnibox::kZeroSuggestRedirectToChrome);
+      omnibox::kOnFocusSuggestionsCustomEndpoint);
 
   network::ResourceRequest resource_request;
   test_url_loader_factory_.SetInterceptor(

components/omnibox/browser/omnibox_field_trial.cc

@@ -258,18 +258,18 @@ bool OmniboxFieldTrial::InZeroSuggestPersonalizedFieldTrial(
 }
 
 // static
-int OmniboxFieldTrial::GetZeroSuggestRedirectToChromeExperimentId() {
+int OmniboxFieldTrial::GetOnFocusSuggestionsCustomEndpointExperimentId() {
   return base::GetFieldTrialParamByFeatureAsInt(
-      omnibox::kZeroSuggestRedirectToChrome,
-      kZeroSuggestRedirectToChromeExperimentIdParam,
+      omnibox::kOnFocusSuggestionsCustomEndpoint,
+      kOnFocusSuggestionsEndpointExperimentIdParam,
       /*default_value=*/-1);
 }
 
 // static
-std::string OmniboxFieldTrial::GetZeroSuggestRedirectToChromeServerAddress() {
+std::string OmniboxFieldTrial::GetOnFocusSuggestionsCustomEndpointURL() {
   return base::GetFieldTrialParamValueByFeature(
-      omnibox::kZeroSuggestRedirectToChrome,
-      kZeroSuggestRedirectToChromeServerAddressParam);
+      omnibox::kOnFocusSuggestionsCustomEndpoint,
+      kOnFocusSuggestionsEndpointURLParam);
 }
 
 bool OmniboxFieldTrial::ShortcutsScoringMaxRelevance(
@@ -806,10 +806,10 @@ const char OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterBothToLock[] =
 const char OmniboxFieldTrial::kSimplifyHttpsIndicatorParameterKeepSecureChip[] =
     "keep-secure-chip";
 
-const char OmniboxFieldTrial::kZeroSuggestRedirectToChromeExperimentIdParam[] =
-    "ZeroSuggestRedirectToChromeExperimentID";
-const char OmniboxFieldTrial::kZeroSuggestRedirectToChromeServerAddressParam[] =
-    "ZeroSuggestRedirectToChromeServerAddress";
+const char OmniboxFieldTrial::kOnFocusSuggestionsEndpointExperimentIdParam[] =
+    "CustomEndpointExperimentID";
+const char OmniboxFieldTrial::kOnFocusSuggestionsEndpointURLParam[] =
+    "CustomEndpointURL";
 
 // static
 int OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs = 100;

components/omnibox/browser/omnibox_field_trial.h

@@ -177,14 +177,14 @@ bool InZeroSuggestPersonalizedFieldTrial(
     metrics::OmniboxEventProto::PageClassification page_classification);
 
 // ---------------------------------------------------------
-// For the Zero Suggest Redirect to Chrome field trial.
+// For the On Focus Suggestions Custom Endpoint field trial.
 
 // Returns the server-side experiment ID to use for contextual suggestions.
 // Returns -1 if there is no associated experiment ID.
-int GetZeroSuggestRedirectToChromeExperimentId();
+int GetOnFocusSuggestionsCustomEndpointExperimentId();
 
 // Returns the server address associated with the current field trial.
-std::string GetZeroSuggestRedirectToChromeServerAddress();
+std::string GetOnFocusSuggestionsCustomEndpointURL();
 
 // ---------------------------------------------------------
 // For the ShortcutsScoringMaxRelevance experiment that's part of the
@@ -512,9 +512,9 @@ extern const char kSimplifyHttpsIndicatorParameterSecureToLock[];
 extern const char kSimplifyHttpsIndicatorParameterBothToLock[];
 extern const char kSimplifyHttpsIndicatorParameterKeepSecureChip[];
 
-// Parameter names used by Zero Suggest Redirect to Chrome.
-extern const char kZeroSuggestRedirectToChromeExperimentIdParam[];
-extern const char kZeroSuggestRedirectToChromeServerAddressParam[];
+// Parameter names used by On Focus Suggestions Custom Endpoint.
+extern const char kOnFocusSuggestionsEndpointExperimentIdParam[];
+extern const char kOnFocusSuggestionsEndpointURLParam[];
 
 // The amount of time to wait before sending a new suggest request after the
 // previous one unless overridden by a field trial parameter.

components/omnibox/browser/zero_suggest_provider_unittest.cc

@@ -468,7 +468,7 @@ TEST_F(ZeroSuggestProviderTest, TestPsuggestZeroSuggestReceivedEmptyResults) {
             prefs->GetString(omnibox::kZeroSuggestCachedResults));
 }
 
-TEST_F(ZeroSuggestProviderTest, RedirectToChrome) {
+TEST_F(ZeroSuggestProviderTest, CustomEndpoint) {
   CreateContextualSuggestFieldTrial();
   // Coverage for the URL-specific page. (Regression test for a DCHECK).
   // This is exercising ContextualSuggestionsService::CreateExperimentalRequest,
@@ -478,11 +478,10 @@ TEST_F(ZeroSuggestProviderTest, RedirectToChrome) {
   // redirect to chrome mode on.
   base::test::ScopedFeatureList features;
   std::map<std::string, std::string> params;
-  params[std::string(
-      OmniboxFieldTrial::kZeroSuggestRedirectToChromeServerAddressParam)] =
+  params[std::string(OmniboxFieldTrial::kOnFocusSuggestionsEndpointURLParam)] =
       "https://cuscochromeextension-pa.googleapis.com/v1/omniboxsuggestions";
   features.InitAndEnableFeatureWithParameters(
-      omnibox::kZeroSuggestRedirectToChrome, params);
+      omnibox::kOnFocusSuggestionsCustomEndpoint, params);
 
   EXPECT_CALL(*client_, IsAuthenticated())
       .WillRepeatedly(testing::Return(true));

components/omnibox/common/omnibox_features.cc

@@ -285,7 +285,8 @@ const base::Feature kOmniboxMaterialDesignWeatherIcons{
 const base::Feature kOnFocusSuggestions{"OmniboxOnFocusSuggestions",
                                         base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Feature used for the Zero Suggest Redirect to Chrome Field Trial.
+// Feature used to specify a custom endpoint URL for on-focus suggestions that
+// are sourced via RPC.
 //
 // This feature is *enabled* in order to *disable* all forms of suggestions
 // based on the URL on-focus (whether from "redirect to Chrome" or the
@@ -296,8 +297,9 @@ const base::Feature kOnFocusSuggestions{"OmniboxOnFocusSuggestions",
 // If this feature were not enabled, Chrome would use the default suggest
 // server for suggestions based on the current URL on focus.  There is no
 // code in Chrome to disable that, so that why we took this route.
-const base::Feature kZeroSuggestRedirectToChrome{
-    "ZeroSuggestRedirectToChrome", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kOnFocusSuggestionsCustomEndpoint{
+    "OmniboxOnFocusSuggestionsCustomEndpoint",
+    base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Allow suggestions to be shown to the user on the New Tab Page upon focusing
 // URL bar (the omnibox).

components/omnibox/common/omnibox_features.h

@@ -51,7 +51,7 @@ extern const base::Feature kOmniboxMaterialDesignWeatherIcons;
 
 // On-Focus Suggestions a.k.a. ZeroSuggest.
 extern const base::Feature kOnFocusSuggestions;
-extern const base::Feature kZeroSuggestRedirectToChrome;
+extern const base::Feature kOnFocusSuggestionsCustomEndpoint;
 extern const base::Feature kZeroSuggestionsOnNTP;
 
 }  // namespace omnibox