| 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 83b9143b73f6ac2e006944d6bfd49dc5a302a5c9..45da106f9498759bec3e4fec27b1e83fc4296538 100644
|
| --- a/chrome/browser/omnibox/omnibox_field_trial.cc
|
| +++ b/chrome/browser/omnibox/omnibox_field_trial.cc
|
| @@ -222,15 +222,15 @@ bool OmniboxFieldTrial::ShortcutsScoringMaxRelevance(int* max_relevance) {
|
| }
|
|
|
| bool OmniboxFieldTrial::SearchHistoryPreventInlining(
|
| - AutocompleteInput::PageClassification current_page_classification) {
|
| + AutocompleteInput::OmniboxContext omnibox_context) {
|
| return OmniboxFieldTrial::GetValueForRuleInContext(
|
| - kSearchHistoryRule, current_page_classification) == "PreventInlining";
|
| + kSearchHistoryRule, omnibox_context) == "PreventInlining";
|
| }
|
|
|
| bool OmniboxFieldTrial::SearchHistoryDisable(
|
| - AutocompleteInput::PageClassification current_page_classification) {
|
| + AutocompleteInput::OmniboxContext omnibox_context) {
|
| return OmniboxFieldTrial::GetValueForRuleInContext(
|
| - kSearchHistoryRule, current_page_classification) == "Disable";
|
| + kSearchHistoryRule, omnibox_context) == "Disable";
|
| }
|
|
|
| // Background and implementation details:
|
| @@ -239,9 +239,9 @@ bool OmniboxFieldTrial::SearchHistoryDisable(
|
| // parameters (key-value pairs). In the bundled omnibox experiment
|
| // (kBundledExperimentFieldTrialName), each experiment group comes with a
|
| // list of parameters in the form:
|
| -// key=<Rule>:<AutocompleteInput::PageClassification (as an int)>
|
| +// key=<Rule>:<AutocompleteInput::OmniboxContext (as an int)>
|
| // value=<arbitrary string>
|
| -// The AutocompleteInput::PageClassification can also be "*", which means
|
| +// The AutocompleteInput::OmniboxContext can also be "*", which means
|
| // this rule applies in all page classification contexts.
|
| // One example parameter is
|
| // key=SearchHistory:6
|
| @@ -251,11 +251,11 @@ bool OmniboxFieldTrial::SearchHistoryDisable(
|
| // PreventInlining.
|
| //
|
| // In short, this function tries to find the value associated with key
|
| -// |rule|:|page_classification|, failing that it looks up |rule|:*,
|
| +// |rule|:|omnibox_context|, failing that it looks up |rule|:*,
|
| // and failing that it returns the empty string.
|
| std::string OmniboxFieldTrial::GetValueForRuleInContext(
|
| const std::string& rule,
|
| - AutocompleteInput::PageClassification page_classification) {
|
| + AutocompleteInput::OmniboxContext omnibox_context) {
|
| std::map<std::string, std::string> params;
|
| if (!chrome_variations::GetVariationParams(kBundledExperimentFieldTrialName,
|
| ¶ms)) {
|
| @@ -264,7 +264,7 @@ std::string OmniboxFieldTrial::GetValueForRuleInContext(
|
| // Look up rule in this exact context.
|
| std::map<std::string, std::string>::iterator it =
|
| params.find(rule + ":" + base::IntToString(
|
| - static_cast<int>(page_classification)));
|
| + static_cast<int>(omnibox_context)));
|
| if (it != params.end())
|
| return it->second;
|
| // Look up rule in the global context.
|
|
|