Registering field trial for a feature overridden in chrome://flags.

chrome/browser/about_flags.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_ABOUT_FLAGS_H_
 #define CHROME_BROWSER_ABOUT_FLAGS_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_base.h"
 #include "base/strings/string16.h"
 #include "components/flags_ui/feature_entry.h"
 #include "components/flags_ui/flags_state.h"
 
 namespace base {
 class ListValue;
+class FeatureList;

[Lei Zhang, 2016/07/13 17:49:02]

nit: alphabetical order please

[jkrcal, 2016/07/14 08:45:12]

Done.

 }
 
 namespace flags_ui {
 class FlagsStorage;
 }
 
 namespace about_flags {
 
 // Reads the state from |flags_storage| and adds the command line flags
 // belonging to the active feature entries to |command_line|.
 void ConvertFlagsToSwitches(flags_ui::FlagsStorage* flags_storage,
                             base::CommandLine* command_line,
                             flags_ui::SentinelsMode sentinels);
 
 // Registers variations parameter values stored in |flags_storage| (previously

[Lei Zhang, 2016/07/13 17:49:02]

Can you update the comment to mention |feature_list| ?

[jkrcal, 2016/07/14 08:45:12]

Done.

 // selected in about:flags).
 void RegisterAllFeatureVariationParameters(
-    flags_ui::FlagsStorage* flags_storage);
+    flags_ui::FlagsStorage* flags_storage,
+    base::FeatureList* feature_list);
 
 // Compares a set of switches of the two provided command line objects and
 // returns true if they are the same and false otherwise.
 // If |out_difference| is not NULL, it's filled with set_symmetric_difference
 // between sets.
 bool AreSwitchesIdenticalToCurrentCommandLine(
     const base::CommandLine& new_cmdline,
     const base::CommandLine& active_cmdline,
     std::set<base::CommandLine::StringType>* out_difference);
 
@@ skipping 43 matching lines @@
 
 // This value is reported as switch histogram ID if switch name has unknown
 // format.
 extern const base::HistogramBase::Sample kBadSwitchFormatHistogramId;
 
 }  // namespace testing
 
 }  // namespace about_flags
 
 #endif  // CHROME_BROWSER_ABOUT_FLAGS_H_