Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/omnibox/omnibox_field_trial_unittest.cc

 // Copyright (c) 2013 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 "chrome/browser/omnibox/omnibox_field_trial.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 141 matching lines @@
     CreateTestTrial("AutocompleteDynamicTrial_2", "EnableZeroSuggest_Queries");
     EXPECT_TRUE(OmniboxFieldTrial::InZeroSuggestFieldTrial());
 
     ResetFieldTrialList();
     CreateTestTrial("AutocompleteDynamicTrial_3", "EnableZeroSuggest_URLs");
     EXPECT_TRUE(OmniboxFieldTrial::InZeroSuggestFieldTrial());
   }
 }
 
 TEST_F(OmniboxFieldTrialTest, GetDemotionsByTypeWithFallback) {
-  // Must be the same as kBundledExperimentFieldTrialName
-  // defined in omnibox_field_trial.cc.
-  const std::string kTrialName = "OmniboxBundledExperimentV1";
-  // Must be the same as kDemoteByTypeRule defined in
-  // omnibox_field_trial.cc.
-  const std::string kRuleName = "DemoteByType";
   {
     std::map<std::string, std::string> params;
-    params[kRuleName + ":1:*"] = "1:50,2:0";
-    params[kRuleName + ":3:*"] = "5:100";
-    params[kRuleName + ":*:*"] = "1:25";
+    params[std::string(OmniboxFieldTrial::kDemoteByTypeRule) + ":1:*"] =
+        "1:50,2:0";
+    params[std::string(OmniboxFieldTrial::kDemoteByTypeRule) + ":3:*"] =
+        "5:100";
+    params[std::string(OmniboxFieldTrial::kDemoteByTypeRule) + ":*:*"] = "1:25";
     ASSERT_TRUE(chrome_variations::AssociateVariationParams(
-        kTrialName, "A", params));
+        OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params));
   }
-  base::FieldTrialList::CreateFieldTrial(kTrialName, "A");
+  base::FieldTrialList::CreateFieldTrial(
+      OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");
   OmniboxFieldTrial::DemotionMultipliers demotions_by_type;
   OmniboxFieldTrial::GetDemotionsByType(
       AutocompleteInput::NEW_TAB_PAGE, &demotions_by_type);
   ASSERT_EQ(2u, demotions_by_type.size());
   VerifyDemotion(demotions_by_type, AutocompleteMatchType::HISTORY_URL, 0.5);
   VerifyDemotion(demotions_by_type, AutocompleteMatchType::HISTORY_TITLE, 0.0);
   OmniboxFieldTrial::GetDemotionsByType(
       AutocompleteInput::HOMEPAGE, &demotions_by_type);
   ASSERT_EQ(1u, demotions_by_type.size());
   VerifyDemotion(demotions_by_type, AutocompleteMatchType::NAVSUGGEST, 1.0);
   OmniboxFieldTrial::GetDemotionsByType(
       AutocompleteInput::BLANK, &demotions_by_type);
   ASSERT_EQ(1u, demotions_by_type.size());
   VerifyDemotion(demotions_by_type, AutocompleteMatchType::HISTORY_URL, 0.25);
 }
 
 TEST_F(OmniboxFieldTrialTest, GetValueForRuleInContext) {
   // This test starts with Instant Extended off (the default state), then
   // enables Instant Extended and tests again on the same rules.
 
-  // 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 fallbacks at every level.
     params["rule1:1:0"] = "rule1-1-0-value";  // NEW_TAB_PAGE
     params["rule1:3:0"] = "rule1-3-0-value";  // HOMEPAGE
     params["rule1:4:1"] = "rule1-4-1-value";  // OTHER
     params["rule1:4:*"] = "rule1-4-*-value";  // OTHER
     params["rule1:*:1"] = "rule1-*-1-value";  // global
     params["rule1:*:*"] = "rule1-*-*-value";  // global
     // Rule 2 has no exact matches but has fallbacks.
     params["rule2:*:0"] = "rule2-*-0-value";  // global
     params["rule2:1:*"] = "rule2-1-*-value";  // NEW_TAB_PAGE
     params["rule2:*:*"] = "rule2-*-*-value";  // global
     // Rule 3 has only a global fallback.
     params["rule3:*:*"] = "rule3-*-*-value";  // global
     // Rule 4 has an exact match but no fallbacks.
     params["rule4:4:0"] = "rule4-4-0-value";  // OTHER
     // 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 with Instant Extended disabled.
   // Tests for rule 1.
   ExpectRuleValue("rule1-1-0-value",
                   "rule1", AutocompleteInput::NEW_TAB_PAGE);  // exact match
   ExpectRuleValue("rule1-1-0-value",
                   "rule1", AutocompleteInput::NEW_TAB_PAGE);  // exact match
   ExpectRuleValue("rule1-*-*-value",
                   "rule1", AutocompleteInput::BLANK);     // fallback to global
   ExpectRuleValue("rule1-3-0-value",
@@ skipping 62 matching lines @@
   ExpectRuleValue("",
                   "rule4", AutocompleteInput::BLANK);     // no global fallback
   ExpectRuleValue("",
                   "rule4", AutocompleteInput::HOMEPAGE);  // no global fallback
 
   // Tests for rule 5 (a missing rule).
   ExpectRuleValue("",
                   "rule5", AutocompleteInput::OTHER);     // no rule at all
 #endif  // !defined(OS_IOS) && !defined(OS_ANDROID)
 }