Omnibox: Convert Shortcuts Scoring Field Trial to Omnibox Bundled Field Trial

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_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "chrome/browser/autocomplete/autocomplete_input.h"

[Mark P, 2013/08/09 23:27:15]

This change doesn't need it, but this should've been here all along.

 #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 kShortcutsScoringMaxRelevanceRule[] = "ShortcutsScoringMaxRelevance";
 const char kSearchHistoryRule[] = "SearchHistory";
 const char kDemoteByTypeRule[] = "DemoteByType";
 
 // 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;
 
@@ skipping 160 matching lines @@
   for (int i = 0; i < kMaxAutocompleteDynamicFieldTrials; ++i) {
     const std::string& group_name = base::FieldTrialList::FindFullName(
         DynamicFieldTrialName(i));
     const char kEnableZeroSuggest[] = "EnableZeroSuggest";
     if (StartsWithASCII(group_name, kEnableZeroSuggest, true))
       return true;
   }
   return false;
 }
 
-// If the active group name starts with "MaxRelevance_", extract the
-// int that immediately following that, returning true on success.
-bool OmniboxFieldTrial::ShortcutsScoringMaxRelevance(int* max_relevance) {
-  std::string group_name =
-      base::FieldTrialList::FindFullName(kShortcutsScoringFieldTrialName);
-  const char kMaxRelevanceGroupPrefix[] = "MaxRelevance_";
-  if (!StartsWithASCII(group_name, kMaxRelevanceGroupPrefix, true))
+bool OmniboxFieldTrial::ShortcutsScoringMaxRelevance(
+    AutocompleteInput::PageClassification current_page_classification,
+    int* max_relevance) {
+  // The value of the rule is an integer displayed as a string that

[Peter Kasting, 2013/08/09 23:33:15]

Nit: "...is a string that encodes an integer containing the max relevance"?

[Mark P, 2013/08/10 00:11:56]

Okay.  That's less backwards than my sentence.  Done.

+  // contains the max relevance.
+  const std::string& max_relevance_str =
+      OmniboxFieldTrial::GetValueForRuleInContext(
+          kShortcutsScoringMaxRelevanceRule, current_page_classification);
+  if (max_relevance_str.empty())
     return false;
-  if (!base::StringToInt(base::StringPiece(
-          group_name.substr(strlen(kMaxRelevanceGroupPrefix))),
-                         max_relevance)) {
-    LOG(WARNING) << "Malformed MaxRelevance string: " << group_name;
+  if (!base::StringToInt(max_relevance_str, max_relevance)) {
+    LOG(WARNING) << "Malformed MaxRelevance string: " << max_relevance_str;

[Peter Kasting, 2013/08/09 23:33:15]

While here, consider removing this LOG unless you have plans for how you will
gather the logging data and make use of it.

[Mark P, 2013/08/10 00:11:56]

Good point.  This warning is not useful.  Removed.

Also removed two other similar LOG(WARNING)s elsewhere in this file while I was
at it.

     return false;
   }
   return true;
 }
 
 bool OmniboxFieldTrial::SearchHistoryPreventInlining(
     AutocompleteInput::PageClassification current_page_classification) {
   return OmniboxFieldTrial::GetValueForRuleInContext(
       kSearchHistoryRule, current_page_classification) == "PreventInlining";
 }
@@ skipping 64 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();
 }