Invert description and URL for experimental zero suggest suggestions.

components/omnibox/browser/omnibox_field_trial.cc

 // Copyright 2014 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 "components/omnibox/browser/omnibox_field_trial.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 505 matching lines @@
   // This is a best-effort conversion; we trust the hand-crafted parameters
   // downloaded from the server to be perfect.  There's no need for handle
   // errors smartly.
   int value;
   base::StringToInt(value_str, &value);
   return value;
 }
 
 OmniboxFieldTrial::EmphasizeTitlesCondition
 OmniboxFieldTrial::GetEmphasizeTitlesConditionForInput(
-    metrics::OmniboxInputType::Type input_type) {
+    const AutocompleteInput& input) {
   // Look up the parameter named kEmphasizeTitlesRule + ":" + input_type,

[Mark P, 2017/02/28 22:24:28]

nit: This comment no longer applies to the code.  Move it to the code it's near
and add a new comment.

[gcomanici, 2017/03/01 02:56:28]

I added a comment for the condition I added, and kept the comment for the rest.

   // find its value, and return that value as an enum.  If the parameter
   // isn't redefined, fall back to the generic rule kEmphasizeTitlesRule + ":*"
+  metrics::OmniboxInputType::Type input_type = input.type();

[Mark P, 2017/02/28 22:24:28]

nit: it's alias isn't significantly shorter or more clear than what it's
aliasing.  Please remove.

[gcomanici, 2017/03/01 02:56:28]

Done.

+  if (input.from_omnibox_focus() &&
+      OmniboxFieldTrial::InZeroSuggestSwapTitleAndUrlFieldTrial()) {

[Mark P, 2017/02/28 22:24:28]

nit: just test directly to see if the feature is enabled.

(The function is necessary.)

[gcomanici, 2017/03/01 02:56:28]

Done.

+    return EMPHASIZE_WHEN_NONEMPTY;
+  }
   std::string value_str(variations::GetVariationParamValue(
       kBundledExperimentFieldTrialName,
       std::string(kEmphasizeTitlesRule) + "_" +
       base::IntToString(static_cast<int>(input_type))));
   if (value_str.empty()) {
     value_str = variations::GetVariationParamValue(
         kBundledExperimentFieldTrialName,
         std::string(kEmphasizeTitlesRule) + "_*");
   }
   if (value_str.empty())
@@ skipping 59 matching lines @@
       kZeroSuggestRedirectToChromeServerAddressParam);
 }
 
 // static
 std::string OmniboxFieldTrial::ZeroSuggestRedirectToChromeAdditionalFields() {
   return base::GetFieldTrialParamValueByFeature(
       features::kZeroSuggestRedirectToChrome,
       kZeroSuggestRedirectToChromeAdditionalFieldsParam);
 }
 
+// static
+bool OmniboxFieldTrial::InZeroSuggestSwapTitleAndUrlFieldTrial() {
+  return base::FeatureList::IsEnabled(features::kZeroSuggestSwapTitleAndUrl);
+}
+
 const char OmniboxFieldTrial::kBundledExperimentFieldTrialName[] =
     "OmniboxBundledExperimentV1";
 const char OmniboxFieldTrial::kDisableProvidersRule[] = "DisableProviders";
 const char OmniboxFieldTrial::kShortcutsScoringMaxRelevanceRule[] =
     "ShortcutsScoringMaxRelevance";
 const char OmniboxFieldTrial::kSearchHistoryRule[] = "SearchHistory";
 const char OmniboxFieldTrial::kDemoteByTypeRule[] = "DemoteByType";
 const char OmniboxFieldTrial::kHQPBookmarkValueRule[] =
     "HQPBookmarkValue";
 const char OmniboxFieldTrial::kHQPTypedValueRule[] = "HQPTypedValue";
@@ skipping 127 matching lines @@
   if (it != params.end())
     return it->second;
   // Fall back to the global instant extended context.
   it = params.find(rule + ":" + page_classification_str + ":*");
   if (it != params.end())
     return it->second;
   // Look up rule in the global context.
   it = params.find(rule + ":*:*");
   return (it != params.end()) ? it->second : std::string();
 }