Show PhysicalWebProvider suggestions with omnibox input

components/omnibox/browser/omnibox_field_trial.cc

Index: components/omnibox/browser/omnibox_field_trial.cc
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
index 3aeff578b5fe746dad903206034bf87080b47522..e3b2d642598738648a5e777040d075fa07f8a883 100644
--- a/components/omnibox/browser/omnibox_field_trial.cc
+++ b/components/omnibox/browser/omnibox_field_trial.cc
@@ -531,6 +531,53 @@ OmniboxFieldTrial::GetEmphasizeTitlesConditionForInput(
   return static_cast<EmphasizeTitlesCondition>(value);
 }
 
+// static
+bool OmniboxFieldTrial::InPhysicalWebZeroSuggestFieldTrial() {
+  return variations::GetVariationParamValue(
+      kBundledExperimentFieldTrialName,
+      kPhysicalWebZeroSuggestRule) == "true";
+}
+
+// static
+bool OmniboxFieldTrial::InPhysicalWebAfterTypingFieldTrial() {
+  return variations::GetVariationParamValue(
+      kBundledExperimentFieldTrialName,
+      kPhysicalWebAfterTypingRule) == "true";
+}
+
+// static
+void OmniboxFieldTrial::GetExperimentalPhysicalWebScoringParams(

[Mark P, 2016/12/21 23:21:41]

minor comment: I think I find these three separate find calls harder to read
then three separate GetVariationParamValue() call.

[mattreynolds, 2016/12/22 00:23:40]

I switched the base relevance calls to use GetVariationParamValue as well.

+    PhysicalWebScoringParams* scoring_params) {
+  scoring_params->experimental_scoring_enabled = false;
+
+  VariationParams params;
+  if (!variations::GetVariationParams(kBundledExperimentFieldTrialName,
+                                      &params))
+    return;
+
+  VariationParams::const_iterator it =
+      params.find(kPhysicalWebExperimentalScoringParam);
+  if (it != params.end()) {
+    int enabled = 0;
+    if (base::StringToInt(it->second, &enabled))

[Mark P, 2016/12/21 23:21:41]

Enabling is an int parameter?

[mattreynolds, 2016/12/22 00:23:40]

Removed

+      scoring_params->experimental_scoring_enabled = (enabled != 0);
+  }
+
+  it = params.find(kPhysicalWebZeroSuggestBaseRelevanceParam);
+  if (it != params.end()) {
+    int base_relevance = 0;
+    if (base::StringToInt(it->second, &base_relevance))
+      scoring_params->zero_suggest_base_relevance = base_relevance;
+  }
+
+  it = params.find(kPhysicalWebAfterTypingBaseRelevanceParam);
+  if (it != params.end()) {
+    int base_relevance = 0;
+    if (base::StringToInt(it->second, &base_relevance))
+      scoring_params->after_typing_base_relevance = base_relevance;
+  }
+}
+
 const char OmniboxFieldTrial::kBundledExperimentFieldTrialName[] =
     "OmniboxBundledExperimentV1";
 const char OmniboxFieldTrial::kDisableProvidersRule[] = "DisableProviders";
@@ -572,6 +619,10 @@ const char OmniboxFieldTrial::kKeywordRequiresPrefixMatchRule[] =
 const char OmniboxFieldTrial::kKeywordScoreForSufficientlyCompleteMatchRule[] =
     "KeywordScoreForSufficientlyCompleteMatch";
 const char OmniboxFieldTrial::kEmphasizeTitlesRule[] = "EmphasizeTitles";
+const char OmniboxFieldTrial::kPhysicalWebZeroSuggestRule[] =
+    "PhysicalWebZeroSuggest";
+const char OmniboxFieldTrial::kPhysicalWebAfterTypingRule[] =
+    "PhysicalWebAfterTyping";
 
 const char OmniboxFieldTrial::kHUPNewScoringEnabledParam[] =
     "HUPExperimentalScoringEnabled";
@@ -598,6 +649,13 @@ const char
     OmniboxFieldTrial::kHQPExperimentalScoringTopicalityThresholdParam[] =
       "HQPExperimentalScoringTopicalityThreshold";
 
+const char OmniboxFieldTrial::kPhysicalWebExperimentalScoringParam[] =
+    "PhysicalWebExperimentalScoring";
+const char OmniboxFieldTrial::kPhysicalWebZeroSuggestBaseRelevanceParam[] =
+    "PhysicalWebZeroSuggestBaseRelevance";
+const char OmniboxFieldTrial::kPhysicalWebAfterTypingBaseRelevanceParam[] =
+    "PhysicalWebAfterTypingBaseRelevanceParam";
+
 // static
 int OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs = 100;