Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / omnibox / omnibox_field_trial.h

diff --git a/src/chrome/browser/omnibox/omnibox_field_trial.h b/src/chrome/browser/omnibox/omnibox_field_trial.h
index e677fae..1b0a1c7 100644 (file)
--- a/src/chrome/browser/omnibox/omnibox_field_trial.h
+++ b/src/chrome/browser/omnibox/omnibox_field_trial.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_OMNIBOX_OMNIBOX_FIELD_TRIAL_H_
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 
@@ -91,9 +90,6 @@ class OmniboxFieldTrial {
   // given number.  Omitted types are assumed to have multipliers of 1.0.
   typedef std::map<AutocompleteMatchType::Type, float> DemotionMultipliers;
 
-  // A set of types that should not be demoted when they are the top match.
-  typedef std::set<AutocompleteMatchType::Type> UndemotableTopMatchTypes;
-
   // Creates the static field trial groups.
   // *** MUST NOT BE CALLED MORE THAN ONCE. ***
   static void ActivateStaticTrials();
@@ -226,24 +222,6 @@ class OmniboxFieldTrial {
       AutocompleteInput::PageClassification current_page_classification,
       DemotionMultipliers* demotions_by_type);
 
-  // Get the set of types that should not be demoted if they are the top
-  // match.
-  static UndemotableTopMatchTypes GetUndemotableTopTypes(
-      AutocompleteInput::PageClassification current_page_classification);
-
-  // ---------------------------------------------------------
-  // For the ReorderForLegalDefaultMatch experiment that's part of the
-  // bundled omnibox field trial.
-
-  // Returns true if the omnibox will reorder matches, in the provided
-  // |current_page_classification| context so that a match that's allowed to
-  // be the default match will appear first.  This means AutocompleteProviders
-  // can score matches however they desire without regard to making sure the
-  // top match when all the matches from all providers are merged is a legal
-  // default match.
-  static bool ReorderForLegalDefaultMatch(
-      AutocompleteInput::PageClassification current_page_classification);
-
   // ---------------------------------------------------------
   // For the HistoryURL provider new scoring experiment that is part of the
   // bundled omnibox field trial.
@@ -263,16 +241,6 @@ class OmniboxFieldTrial {
   static int HQPBookmarkValue();
 
   // ---------------------------------------------------------
-  // For the HQPDiscountFrecencyWhenFewVisits experiment that's part of
-  // the bundled omnibox field trial.
-
-  // Returns whether to discount the frecency score estimates when a
-  // URL has fewer than ScoredHistoryMatch::kMaxVisitsToScore visits.
-  // See comments in scored_history_match.h for details.  Returns false
-  // if the discount frecency experiment isn't active.
-  static bool HQPDiscountFrecencyWhenFewVisits();
-
-  // ---------------------------------------------------------
   // For the HQPAllowMatchInTLD experiment that's part of the
   // bundled omnibox field trial.
 
@@ -291,22 +259,30 @@ class OmniboxFieldTrial {
   static bool HQPAllowMatchInSchemeValue();
 
   // ---------------------------------------------------------
+  // For the BookmarksIndexURLs experiment that's part of the
+  // bundled omnibox field trial.
+
+  // Returns true if BookmarkIndex should index the URL of bookmarks
+  // (not only the titles) and search for / mark matches in the URLs,
+  // and BookmarkProvider should score bookmarks based on both the
+  // matches in bookmark title and URL.  Returns false if the bookmarks
+  // index URLs experiment isn't active.
+  static bool BookmarksIndexURLsValue();
+
+  // ---------------------------------------------------------
   // Exposed publicly for the sake of unittests.
   static const char kBundledExperimentFieldTrialName[];
   // Rule names used by the bundled experiment.
   static const char kShortcutsScoringMaxRelevanceRule[];
   static const char kSearchHistoryRule[];
   static const char kDemoteByTypeRule[];
-  static const char kUndemotableTopTypeRule[];
-  static const char kReorderForLegalDefaultMatchRule[];
   static const char kHQPBookmarkValueRule[];
   static const char kHQPDiscountFrecencyWhenFewVisitsRule[];
   static const char kHQPAllowMatchInTLDRule[];
   static const char kHQPAllowMatchInSchemeRule[];
   static const char kZeroSuggestRule[];
   static const char kZeroSuggestVariantRule[];
-  // Rule values.
-  static const char kReorderForLegalDefaultMatchRuleDisabled[];
+  static const char kBookmarksIndexURLsRule[];
 
   // Parameter names used by the HUP new scoring experiments.
   static const char kHUPNewScoringEnabledParam[];