Componentize about_flags::FeatureEntry in flags_ui component.

chrome/browser/about_flags.h

Index: chrome/browser/about_flags.h
diff --git a/chrome/browser/about_flags.h b/chrome/browser/about_flags.h
index 70fd6427d9f5faaf3da3e1655fe587c9df8955e4..d16274c8c0dbd886fde0c1b3da5e6bf01ea05a65 100644
--- a/chrome/browser/about_flags.h
+++ b/chrome/browser/about_flags.h
@@ -14,11 +14,11 @@
 #include "base/command_line.h"
 #include "base/metrics/histogram_base.h"
 #include "base/strings/string16.h"
+#include "components/flags_ui/feature_entry.h"
 
 class PrefService;
 
 namespace base {
-struct Feature;
 class ListValue;
 }
 
@@ -28,102 +28,6 @@ class FlagsStorage;
 
 namespace about_flags {
 
-// FeatureEntry is used by about_flags to describe an experimental feature.
-//
-// Note that features should eventually be either turned on by default with no
-// about_flags entries or deleted. Most feature entries should only be around
-// for a few milestones, until their full launch.
-//
-// This is exposed only for testing.
-struct FeatureEntry {
-  enum Type {
-    // A feature with a single flag value. This is typically what you want.
-    SINGLE_VALUE,
-
-    // A default enabled feature with a single flag value to disable it. Please
-    // consider whether you really need a flag to disable the feature, and even
-    // if so remove the disable flag as soon as it is no longer needed.
-    SINGLE_DISABLE_VALUE,
-
-    // The feature has multiple values only one of which is ever enabled.
-    // The first of the values should correspond to a deactivated state for this
-    // feature (i.e. no command line option). For MULTI_VALUE entries, the
-    // command_line of the FeatureEntry is not used. If the experiment is
-    // enabled the command line of the selected Choice is enabled.
-    MULTI_VALUE,
-
-    // The feature has three possible values: Default, Enabled and Disabled.
-    // This should be used for features that may have their own logic to decide
-    // if the feature should be on when not explicitly specified via about
-    // flags - for example via FieldTrials.
-    ENABLE_DISABLE_VALUE,
-
-    // Corresponds to a base::Feature, per base/feature_list.h. The entry will
-    // have three states: Default, Enabled, Disabled. When not specified or set
-    // to Default, the normal default value of the feature is used.
-    FEATURE_VALUE,
-  };
-
-  // Used for MULTI_VALUE types to describe one of the possible values the user
-  // can select.
-  struct Choice {
-    // ID of the message containing the choice name.
-    int description_id;
-
-    // Command line switch and value to enabled for this choice.
-    const char* command_line_switch;
-    // Simple switches that have no value should use "" for command_line_value.
-    const char* command_line_value;
-  };
-
-  // The internal name of the feature entry. This is never shown to the user.
-  // It _is_ however stored in the prefs file, so you shouldn't change the
-  // name of existing flags.
-  const char* internal_name;
-
-  // String id of the message containing the feature's name.
-  int visible_name_id;
-
-  // String id of the message containing the feature's description.
-  int visible_description_id;
-
-  // The platforms the feature is available on.
-  // Needs to be more than a compile-time #ifdef because of profile sync.
-  unsigned supported_platforms;  // bitmask
-
-  // Type of entry.
-  Type type;
-
-  // The commandline switch and value that are added when this flag is active.
-  // This is different from |internal_name| so that the commandline flag can be
-  // renamed without breaking the prefs file.
-  // This is used if type is SINGLE_VALUE or ENABLE_DISABLE_VALUE.
-  const char* command_line_switch;
-  // Simple switches that have no value should use "" for command_line_value.
-  const char* command_line_value;
-
-  // For ENABLE_DISABLE_VALUE, the command line switch and value to explicitly
-  // disable the feature.
-  const char* disable_command_line_switch;
-  const char* disable_command_line_value;
-
-  // For FEATURE_VALUE, the base::Feature this entry corresponds to.
-  const base::Feature* feature;
-
-  // This is used if type is MULTI_VALUE.
-  const Choice* choices;
-
-  // Number of |choices|.
-  // This is used if type is MULTI_VALUE.
-  int num_choices;
-
-  // Returns the name used in prefs for the choice at the specified |index|.
-  std::string NameForChoice(int index) const;
-
-  // Returns the human readable description for the choice at |index|.
-  base::string16 DescriptionForChoice(int index) const;
-};
-
 // A flag controlling the behavior of the |ConvertFlagsToSwitches| function -
 // whether it should add the sentinel switches around flags.
 enum SentinelsMode { kNoSentinels, kAddSentinels };
@@ -200,14 +104,10 @@ void ClearState();
 
 // Sets the list of feature entries. Pass in null to use the default set. This
 // does NOT take ownership of the supplied |entries|.
-void SetFeatureEntries(const FeatureEntry* entries, size_t count);
+void SetFeatureEntries(const flags_ui::FeatureEntry* entries, size_t count);
 
 // Returns the current set of feature entries.
-const FeatureEntry* GetFeatureEntries(size_t* count);
-
-// Separator used for multi values. Multi values are represented in prefs as
-// name-of-experiment + kMultiSeparator + selected_index.
-extern const char kMultiSeparator[];
+const flags_ui::FeatureEntry* GetFeatureEntries(size_t* count);
 
 // This value is reported as switch histogram ID if switch name has unknown
 // format.