Omnibox: Allow Bundled Omnibox Field Trial to Examine Instant Extended

chrome/browser/omnibox/omnibox_field_trial.h

 // 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.
 
 #ifndef CHROME_BROWSER_OMNIBOX_OMNIBOX_FIELD_TRIAL_H_
 #define CHROME_BROWSER_OMNIBOX_OMNIBOX_FIELD_TRIAL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 120 matching lines @@
 
   // If the user is in an experiment group that, in the provided
   // |current_page_classification| context, demotes the relevance scores
   // of certain types of matches, populates the |demotions_by_type| map
   // appropriately.  Otherwise, clears |demotions_by_type|.
   static void GetDemotionsByType(
       AutocompleteInput::PageClassification current_page_classification,
       DemotionMultipliers* demotions_by_type);
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(OmniboxFieldTrialTest, GetValueForRuleInContext);
+  friend class OmniboxFieldTrialTest;
 
   // The bundled omnibox experiment comes with a set of parameters
   // (key-value pairs).  Each key indicates a certain rule that applies in
   // a certain context.  The value indicates what the consequences of
   // applying the rule are.  For example, the value of a SearchHistory rule
   // in the context of a search results page might indicate that we should
   // prevent search history matches from inlining.
   //
   // This function returns the value associated with the |rule| that applies
-  // in the current context (which currently only consists of
-  // |page_classification| but will soon contain other features, some not
-  // passed in as parameters, such as whether Instant Extended is enabled).
-  // If no such rule exists in the current context, looks for that rule in
-  // the global context and return its value if found.  If the rule remains
-  // unfound in the global context, returns the empty string.  For more
-  // details, see the implementation.  How to interpret the value is left
-  // to the caller; this is rule-dependent.
+  // in the current context (which currently consists of |page_classification|
+  // and whether Instant Extended is enabled).  If no such rule exists in the
+  // current context, fall back to the rule in various wildcard contexts and
+  // return its value if found.  If the rule remains unfound in the global
+  // context, returns the empty string.  For more details, including how we
+  // prioritize different wildcard contexts, see the implementation.  How to
+  // interpret the value is left to the caller; this is rule-dependent.
   static std::string GetValueForRuleInContext(
       const std::string& rule,
       AutocompleteInput::PageClassification page_classification);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxFieldTrial);
 };
 
 #endif  // CHROME_BROWSER_OMNIBOX_OMNIBOX_FIELD_TRIAL_H_