Parametrize Suggest polling strategy and delay. Also add a parameter

components/omnibox/omnibox_field_trial_unittest.cc

Index: components/omnibox/omnibox_field_trial_unittest.cc
diff --git a/components/omnibox/omnibox_field_trial_unittest.cc b/components/omnibox/omnibox_field_trial_unittest.cc
index 9a78a67b014ad17703968931a7edc7e658a9f7b0..a5429c074c5ad78188c3a07780c6f33988225130 100644
--- a/components/omnibox/omnibox_field_trial_unittest.cc
+++ b/components/omnibox/omnibox_field_trial_unittest.cc
@@ -65,6 +65,17 @@ class OmniboxFieldTrialTest : public testing::Test {
       const std::string& rule,
       OmniboxEventProto::PageClassification page_classification);
 
+  // EXPECTS that OmniboxFieldTrial::GetSuggestPollingStrategy returns

[H Fung, 2014/10/23 17:58:56]

EXPECT()s instead of EXPECTS similar to above?

[Bart N., 2014/10/23 19:19:58]

It was a copy from VerifyDemotion above, which I also fixed.

+  // |expected_from_last_keystroke| and |expected_delay_ms| for the given
+  // experiment params. If one the rule values is NULL, the corresponding
+  // variation parameter won't be set thus allowing to test the default
+  // behavior.
+  void VerifySuggestPollingStrategy(
+      const char* from_last_keystroke_rule_value,
+      const char* polling_delay_ms_rule_value,
+      bool expected_from_last_keystroke,
+      int expected_delay_ms);
+
  private:
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 
@@ -92,6 +103,35 @@ void OmniboxFieldTrialTest::ExpectRuleValue(
                 rule, page_classification));
 }
 
+void OmniboxFieldTrialTest::VerifySuggestPollingStrategy(
+    const char* from_last_keystroke_rule_value,
+    const char* polling_delay_ms_rule_value,
+    bool expected_from_last_keystroke,
+    int expected_delay_ms) {
+  ResetFieldTrialList();
+  std::map<std::string, std::string> params;
+  if (from_last_keystroke_rule_value != NULL) {
+    params[std::string(
+        OmniboxFieldTrial::kMeasureSuggestPollingDelayFromLastKeystrokeRule)] =
+        from_last_keystroke_rule_value;
+  }
+  if (polling_delay_ms_rule_value != NULL) {
+    params[std::string(
+        OmniboxFieldTrial::kSuggestPollingDelayMsRule)] =
+        polling_delay_ms_rule_value;
+  }
+  ASSERT_TRUE(variations::AssociateVariationParams(
+      OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params));
+  base::FieldTrialList::CreateFieldTrial(
+      OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");
+
+  bool from_last_keystroke;
+  int delay_ms;
+  OmniboxFieldTrial::GetSuggestPollingStrategy(&from_last_keystroke, &delay_ms);
+  EXPECT_EQ(expected_from_last_keystroke, from_last_keystroke);
+  EXPECT_EQ(expected_delay_ms, delay_ms);
+}
+
 // Test if GetDisabledProviderTypes() properly parses various field trial
 // group names.
 TEST_F(OmniboxFieldTrialTest, GetDisabledProviderTypes) {
@@ -378,3 +418,43 @@ TEST_F(OmniboxFieldTrialTest, HalfLifeTimeDecay) {
   EXPECT_EQ(1.0, buckets.HalfLifeTimeDecay(base::TimeDelta::FromDays(0)));
   EXPECT_EQ(1.0, buckets.HalfLifeTimeDecay(base::TimeDelta::FromDays(-1)));
 }
+
+TEST_F(OmniboxFieldTrialTest, DisableResultsCaching) {
+  EXPECT_FALSE(OmniboxFieldTrial::DisableResultsCaching());
+
+  {
+    std::map<std::string, std::string> params;
+    params[std::string(OmniboxFieldTrial::kDisableResultsCachingRule)] = "true";
+    ASSERT_TRUE(variations::AssociateVariationParams(
+        OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params));
+    base::FieldTrialList::CreateFieldTrial(
+        OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");
+
+    EXPECT_TRUE(OmniboxFieldTrial::DisableResultsCaching());
+  }
+}
+
+TEST_F(OmniboxFieldTrialTest, GetSuggestPollingStrategy) {
+  // Invalid params.
+  VerifySuggestPollingStrategy(
+      "", "", false,
+      OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs);
+  VerifySuggestPollingStrategy(
+      "foo", "-1", false,
+      OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs);
+  VerifySuggestPollingStrategy(
+      "TRUE", "xyz", false,
+      OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs);
+
+  // Default values.
+  VerifySuggestPollingStrategy(
+      NULL, NULL, false,
+      OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs);
+
+  // Valid params.
+  VerifySuggestPollingStrategy("true", "50", true, 50);
+  VerifySuggestPollingStrategy(NULL, "35", false, 35);
+  VerifySuggestPollingStrategy(
+      "true", NULL, true,
+      OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs);
+}