| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/omnibox/browser/omnibox_field_trial.h" | 5 #include "components/omnibox/browser/omnibox_field_trial.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 EXPECT_EQ(expected_from_last_keystroke, from_last_keystroke); | 132 EXPECT_EQ(expected_from_last_keystroke, from_last_keystroke); |
| 133 EXPECT_EQ(expected_delay_ms, delay_ms); | 133 EXPECT_EQ(expected_delay_ms, delay_ms); |
| 134 } | 134 } |
| 135 | 135 |
| 136 // Test if GetDisabledProviderTypes() properly parses various field trial | 136 // Test if GetDisabledProviderTypes() properly parses various field trial |
| 137 // group names. | 137 // group names. |
| 138 TEST_F(OmniboxFieldTrialTest, GetDisabledProviderTypes) { | 138 TEST_F(OmniboxFieldTrialTest, GetDisabledProviderTypes) { |
| 139 EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes()); | 139 EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes()); |
| 140 | 140 |
| 141 { | 141 { |
| 142 SCOPED_TRACE("Outside the bundled field trial."); | |
| 143 CreateTestTrial("AutocompleteDynamicTrial_0", "DisabledProviders_123"); | |
| 144 EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes()); | |
| 145 } | |
| 146 | |
| 147 { | |
| 148 SCOPED_TRACE("Valid field trial, missing param."); | 142 SCOPED_TRACE("Valid field trial, missing param."); |
| 149 ResetFieldTrialList(); | 143 ResetFieldTrialList(); |
| 150 std::map<std::string, std::string> params; | 144 std::map<std::string, std::string> params; |
| 151 ASSERT_TRUE(variations::AssociateVariationParams( | 145 ASSERT_TRUE(variations::AssociateVariationParams( |
| 152 OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params)); | 146 OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A", params)); |
| 153 base::FieldTrialList::CreateFieldTrial( | 147 base::FieldTrialList::CreateFieldTrial( |
| 154 OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A"); | 148 OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A"); |
| 155 EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes()); | 149 EXPECT_EQ(0, OmniboxFieldTrial::GetDisabledProviderTypes()); |
| 156 } | 150 } |
| 157 | 151 |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 NULL, NULL, false, | 509 NULL, NULL, false, |
| 516 OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs); | 510 OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs); |
| 517 | 511 |
| 518 // Valid params. | 512 // Valid params. |
| 519 VerifySuggestPollingStrategy("true", "50", true, 50); | 513 VerifySuggestPollingStrategy("true", "50", true, 50); |
| 520 VerifySuggestPollingStrategy(NULL, "35", false, 35); | 514 VerifySuggestPollingStrategy(NULL, "35", false, 35); |
| 521 VerifySuggestPollingStrategy( | 515 VerifySuggestPollingStrategy( |
| 522 "true", NULL, true, | 516 "true", NULL, true, |
| 523 OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs); | 517 OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs); |
| 524 } | 518 } |
| OLD | NEW |