Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/omnibox/omnibox_field_trial.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 
 #include <string>
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/metrics/metrics_util.h"
 #include "chrome/common/metrics/variations/variation_ids.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 
 namespace {
 
 // Field trial names.
 const char kHUPCullRedirectsFieldTrialName[] = "OmniboxHUPCullRedirects";
 const char kHUPCreateShorterMatchFieldTrialName[] =
     "OmniboxHUPCreateShorterMatch";
 const char kStopTimerFieldTrialName[] = "OmniboxStopTimer";
 const char kShortcutsScoringFieldTrialName[] = "OmniboxShortcutsScoring";
-const char kBundledExperimentFieldTrialName[] = "OmniboxBundledExperimentV1";
-
-// Rule names used by the bundled experiment.
-const char kSearchHistoryRule[] = "SearchHistory";
 
 // The autocomplete dynamic field trial name prefix.  Each field trial is
 // configured dynamically and is retrieved automatically by Chrome during
 // the startup.
 const char kAutocompleteDynamicFieldTrialPrefix[] = "AutocompleteDynamicTrial_";
 // The maximum number of the autocomplete dynamic field trials (aka layers).
 const int kMaxAutocompleteDynamicFieldTrials = 5;
 
 // Field trial experiment probabilities.
 
@@ skipping 187 matching lines @@
   return OmniboxFieldTrial::GetValueForRuleInContext(
       kSearchHistoryRule, current_page_classification) == "PreventInlining";
 }
 
 bool OmniboxFieldTrial::SearchHistoryDisable(
     AutocompleteInput::PageClassification current_page_classification) {
   return OmniboxFieldTrial::GetValueForRuleInContext(
       kSearchHistoryRule, current_page_classification) == "Disable";
 }
 
+bool OmniboxFieldTrial::ReorderForLegalDefaultMatch(
+    AutocompleteInput::PageClassification current_page_classification) {
+  return OmniboxFieldTrial::GetValueForRuleInContext(
+      kReorderForLegalDefaultMatchRule, current_page_classification) ==
+      kReorderForLegalDefaultMatchRuleEnabled;
+}
+
+// static (just like everything else in this file)

[Peter Kasting, 2013/08/09 21:59:34]

Nit: I wouldn't just write this here, since no one else does.  If you want to
put it on everything in the file, or (less good) on top of the file, fine,
otherwise I'd just leave it off entirely.

[Mark P, 2013/08/09 22:24:11]

Okay, dropped.

+const char OmniboxFieldTrial::kBundledExperimentFieldTrialName[] =
+    "OmniboxBundledExperimentV1";
+const char OmniboxFieldTrial::kSearchHistoryRule[] = "SearchHistory";
+const char OmniboxFieldTrial::kReorderForLegalDefaultMatchRule[] =
+    "ReorderForLegalDefaultMatch";
+const char OmniboxFieldTrial::kReorderForLegalDefaultMatchRuleEnabled[] =
+    "ReorderForLegalDefaultMatch";
+
 // Background and implementation details:
 //
 // Each experiment group in any field trial can come with an optional set of
 // 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)>
 //   value=<arbitrary string>
 // The AutocompleteInput::PageClassification can also be "*", which means
 // this rule applies in all page classification contexts.
@@ skipping 18 matching lines @@
   // 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)));
   if (it != params.end())
     return it->second;
   // Look up rule in the global context.
   it = params.find(rule + ":*");
   return (it != params.end()) ? it->second : std::string();
 }