| Index: chrome/browser/omnibox/omnibox_field_trial.cc
|
| ===================================================================
|
| --- chrome/browser/omnibox/omnibox_field_trial.cc (revision 285608)
|
| +++ chrome/browser/omnibox/omnibox_field_trial.cc (working copy)
|
| @@ -254,10 +254,10 @@
|
| }
|
|
|
| bool OmniboxFieldTrial::InZeroSuggestFieldTrial() {
|
| - if (chrome_variations::GetVariationParamValue(
|
| + if (variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName, kZeroSuggestRule) == "true")
|
| return true;
|
| - if (chrome_variations::GetVariationParamValue(
|
| + if (variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName, kZeroSuggestRule) == "false")
|
| return false;
|
| #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
|
| @@ -269,19 +269,19 @@
|
| }
|
|
|
| bool OmniboxFieldTrial::InZeroSuggestMostVisitedFieldTrial() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kZeroSuggestVariantRule) == "MostVisited";
|
| }
|
|
|
| bool OmniboxFieldTrial::InZeroSuggestAfterTypingFieldTrial() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kZeroSuggestVariantRule) == "AfterTyping";
|
| }
|
|
|
| bool OmniboxFieldTrial::InZeroSuggestPersonalizedFieldTrial() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kZeroSuggestVariantRule) == "Personalized";
|
| }
|
| @@ -353,8 +353,8 @@
|
| scoring_params->experimental_scoring_enabled = false;
|
|
|
| VariationParams params;
|
| - if (!chrome_variations::GetVariationParams(kBundledExperimentFieldTrialName,
|
| - ¶ms))
|
| + if (!variations::GetVariationParams(kBundledExperimentFieldTrialName,
|
| + ¶ms))
|
| return;
|
|
|
| VariationParams::const_iterator it = params.find(kHUPNewScoringEnabledParam);
|
| @@ -375,9 +375,9 @@
|
| }
|
|
|
| int OmniboxFieldTrial::HQPBookmarkValue() {
|
| - std::string bookmark_value_str = chrome_variations::
|
| - GetVariationParamValue(kBundledExperimentFieldTrialName,
|
| - kHQPBookmarkValueRule);
|
| + std::string bookmark_value_str =
|
| + variations::GetVariationParamValue(kBundledExperimentFieldTrialName,
|
| + kHQPBookmarkValueRule);
|
| if (bookmark_value_str.empty())
|
| return 10;
|
| // This is a best-effort conversion; we trust the hand-crafted parameters
|
| @@ -389,25 +389,25 @@
|
| }
|
|
|
| bool OmniboxFieldTrial::HQPAllowMatchInTLDValue() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kHQPAllowMatchInTLDRule) == "true";
|
| }
|
|
|
| bool OmniboxFieldTrial::HQPAllowMatchInSchemeValue() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kHQPAllowMatchInSchemeRule) == "true";
|
| }
|
|
|
| bool OmniboxFieldTrial::BookmarksIndexURLsValue() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kBookmarksIndexURLsRule) == "true";
|
| }
|
|
|
| bool OmniboxFieldTrial::DisableInlining() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kDisableInliningRule) == "true";
|
| }
|
| @@ -419,19 +419,19 @@
|
| if (cl->HasSwitch(switches::kEnableAnswersInSuggest))
|
| return true;
|
|
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kAnswersInSuggestRule) == "true";
|
| }
|
|
|
| bool OmniboxFieldTrial::AddUWYTMatchEvenIfPromotedURLs() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kAddUWYTMatchEvenIfPromotedURLsRule) == "true";
|
| }
|
|
|
| bool OmniboxFieldTrial::DisplayHintTextWhenPossible() {
|
| - return chrome_variations::GetVariationParamValue(
|
| + return variations::GetVariationParamValue(
|
| kBundledExperimentFieldTrialName,
|
| kDisplayHintTextWhenPossibleRule) == "true";
|
| }
|
| @@ -509,8 +509,8 @@
|
| const std::string& rule,
|
| OmniboxEventProto::PageClassification page_classification) {
|
| VariationParams params;
|
| - if (!chrome_variations::GetVariationParams(kBundledExperimentFieldTrialName,
|
| - ¶ms)) {
|
| + if (!variations::GetVariationParams(kBundledExperimentFieldTrialName,
|
| + ¶ms)) {
|
| return std::string();
|
| }
|
| const std::string page_classification_str =
|
|
|