Omnibox: Turn on Frecency Scoring in HQP By Default

Also, disable the field trial that was used to help test the
new scoring mode.

Revises tests so they apply to the new scoring code.

I left in the remnants of the HUP-like-scoring code
because I may re-enable that at some point.

BUG=175751
TBR=sky

Review URL: https://chromiumcodereview.appspot.com/16132011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205908 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 32 deletions

diff --git a/chrome/browser/omnibox/omnibox_field_trial.cc b/chrome/browser/omnibox/omnibox_field_trial.cc
index 4568264..4ec2c5c 100644
--- a/chrome/browser/omnibox/omnibox_field_trial.cc
+++ b/chrome/browser/omnibox/omnibox_field_trial.cc
@@ -18,8 +18,6 @@ namespace {
 
 // Field trial names.
 const char kDisallowInlineHQPFieldTrialName[] = "OmniboxDisallowInlineHQP";
-const char kHQPReplaceHUPAndNewScoringFieldTrialName[] =
-    "OmniboxReplaceHUPAndNewScoring";
 const char kHUPCullRedirectsFieldTrialName[] = "OmniboxHUPCullRedirects";
 const char kHUPCreateShorterMatchFieldTrialName[] =
     "OmniboxHUPCreateShorterMatch";
@@ -193,18 +191,6 @@ void OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes(
   }
 }
 
-bool OmniboxFieldTrial::InHQPNewScoringExperimentGroup() {
-  return base::FieldTrialList::FindFullName(
-              kHQPReplaceHUPAndNewScoringFieldTrialName).find(
-              "NewScoring") != std::string::npos;
-}
-
-bool OmniboxFieldTrial::InHQPReplaceHUPScoringExperimentGroup() {
-  return base::FieldTrialList::FindFullName(
-              kHQPReplaceHUPAndNewScoringFieldTrialName).find(
-              "HQPReplaceHUP") != std::string::npos;
-}
-
 bool OmniboxFieldTrial::InHUPCullRedirectsFieldTrial() {
   return base::FieldTrialList::TrialExists(kHUPCullRedirectsFieldTrialName);
 }
diff --git a/chrome/browser/omnibox/omnibox_field_trial.h b/chrome/browser/omnibox/omnibox_field_trial.h
index 6fe5149..e6f0345 100644
--- a/chrome/browser/omnibox/omnibox_field_trial.h
+++ b/chrome/browser/omnibox/omnibox_field_trial.h
@@ -55,24 +55,6 @@ class OmniboxFieldTrial {
       std::vector<uint32>* field_trial_hash);
 
   // ---------------------------------------------------------
-  // For the HistoryQuick provider field trial that combines replacing
-  // the HistoryURL provider and turning on "new scoring" in HistoryQuick
-  // provider.
-
-  // Returns whether the user should get "new scoring" in HistoryQuick
-  // provider or the default scoring.  "New scoring" is based on the
-  // frequency of recent visits to the URL, a.k.a. "frecency"
-  // scoring).
-  static bool InHQPNewScoringExperimentGroup();
-
-  // Returns whether the user experiment the replace HUP behavior or
-  // the default behavior.  The experiment group simultaneously
-  // disables HistoryURL provider from searching the URL database and
-  // directs HistoryQuick provider to calculate both HUP-style and
-  // HQP-style scores for matches, then return whichever is larger.
-  static bool InHQPReplaceHUPScoringExperimentGroup();
-
-  // ---------------------------------------------------------
   // For the HistoryURL provider disable culling redirects field trial.
 
   // Returns whether the user is in any group for this field trial.