Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/omnibox/omnibox_field_trial_unittest.cc

Index: chrome/browser/omnibox/omnibox_field_trial_unittest.cc
diff --git a/chrome/browser/omnibox/omnibox_field_trial_unittest.cc b/chrome/browser/omnibox/omnibox_field_trial_unittest.cc
index 9ccb00f2fd4c6f03dbff947e78e97d4133687fa2..6e4bdaa039ec81459b9c9cd0ca762f4ea37a7a5c 100644
--- a/chrome/browser/omnibox/omnibox_field_trial_unittest.cc
+++ b/chrome/browser/omnibox/omnibox_field_trial_unittest.cc
@@ -132,9 +132,6 @@ TEST_F(OmniboxFieldTrialTest, ZeroSuggestFieldTrial) {
 }
 
 TEST_F(OmniboxFieldTrialTest, GetValueForRuleInContext) {
-  // Must be the same as kBundledExperimentFieldTrialName
-  // defined in omnibox_field_trial.cc.
-  const std::string kTrialName = "OmniboxBundledExperimentV1";
   {
     std::map<std::string, std::string> params;
     // Rule 1 has some exact matches and a global fallback.
@@ -148,10 +145,11 @@ TEST_F(OmniboxFieldTrialTest, GetValueForRuleInContext) {
     // Add a malformed rule to make sure it doesn't screw things up.
     params["unrecognized"] = "unrecognized-value";
     ASSERT_TRUE(chrome_variations::AssociateVariationParams(
-        kTrialName, "A", params));
+        OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params));
   }
 
-  base::FieldTrialList::CreateFieldTrial(kTrialName, "A");
+  base::FieldTrialList::CreateFieldTrial(
+      OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");
 
   // Tests for rule 1.
   EXPECT_EQ(