[AiS] Command-line flag and field trial changes.

chrome/browser/omnibox/omnibox_field_trial.cc

Index: chrome/browser/omnibox/omnibox_field_trial.cc
diff --git a/chrome/browser/omnibox/omnibox_field_trial.cc b/chrome/browser/omnibox/omnibox_field_trial.cc
index ecffd9f0fd1e12c9f5d1b4121b05f00196ebc0e4..94e73c1c978153d7f6a23d69effb6edd0edb78a8 100644
--- a/chrome/browser/omnibox/omnibox_field_trial.cc
+++ b/chrome/browser/omnibox/omnibox_field_trial.cc
@@ -431,6 +431,12 @@ bool OmniboxFieldTrial::DisableInlining() {
       kDisableInliningRule) == "true";
 }
 
+bool OmniboxFieldTrial::EnableAnswersInSuggest() {
+  return chrome_variations::GetVariationParamValue(
+      kBundledExperimentFieldTrialName,
+      kAnswersInSuggestRule) == "true";
+}
+
 const char OmniboxFieldTrial::kBundledExperimentFieldTrialName[] =
     "OmniboxBundledExperimentV1";
 const char OmniboxFieldTrial::kShortcutsScoringMaxRelevanceRule[] =
@@ -446,6 +452,7 @@ const char OmniboxFieldTrial::kZeroSuggestRule[] = "ZeroSuggest";
 const char OmniboxFieldTrial::kZeroSuggestVariantRule[] = "ZeroSuggestVariant";
 const char OmniboxFieldTrial::kBookmarksIndexURLsRule[] = "BookmarksIndexURLs";
 const char OmniboxFieldTrial::kDisableInliningRule[] = "DisableInlining";
+const char OmniboxFieldTrial::kAnswersInSuggestRule[] = "AnswersInSuggest";

[Mark P, 2014/06/19 23:50:21]

I admit the above list in the .h / .cc has no sense of order.  (I think its
partially alphabetic, partially people append when they add.)  Regardless,
please keep the order of the .h and the .cc consistent.

[Justin Donnelly, 2014/06/20 00:39:20]

Oops, sorry about that.  I thought I had this right.  Fixed now.

 
 const char OmniboxFieldTrial::kHUPNewScoringEnabledParam[] =
     "HUPExperimentalScoringEnabled";