Componentize about_flags::FeatureEntry in flags_ui component.

chrome/browser/about_flags.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/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 13 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/google_chrome_strings.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/browser_sync/common/browser_sync_switches.h"
 #include "components/cloud_devices/common/cloud_devices_switches.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_switches.h"
+#include "components/flags_ui/feature_entry_macros.h"
 #include "components/flags_ui/flags_storage.h"
 #include "components/metrics/metrics_hashes.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/offline_pages/offline_page_switches.h"
 #include "components/omnibox/browser/omnibox_switches.h"
 #include "components/password_manager/core/common/password_manager_switches.h"
 #include "components/plugins/common/plugins_switches.h"
 #include "components/proximity_auth/switches.h"
 #include "components/search/search_switches.h"
 #include "components/signin/core/common/signin_switches.h"
 #include "components/sync_driver/sync_driver_switches.h"
 #include "components/tracing/tracing_switches.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
+#include "grit/components_strings.h"
 #include "media/base/media_switches.h"
 #include "media/midi/midi_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display_switches.h"
 #include "ui/events/event_switches.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
@@ skipping 17 matching lines @@
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/switches.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_switches.h"
 #endif
 
+using flags_ui::FeatureEntry;
+
 namespace about_flags {
 
-// Macros to simplify specifying the type. Please refer to the comments on
-// FeatureEntry::Type in the header file, which explain the different entry
-// types and when they should be used.
-#define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value)    \
-  FeatureEntry::SINGLE_VALUE, command_line_switch, switch_value, nullptr, \
-      nullptr, nullptr, nullptr, 0
-#define SINGLE_VALUE_TYPE(command_line_switch) \
-    SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, "")
-#define SINGLE_DISABLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \
-  FeatureEntry::SINGLE_DISABLE_VALUE, command_line_switch, switch_value,       \
-      nullptr, nullptr, nullptr, nullptr, 0
-#define SINGLE_DISABLE_VALUE_TYPE(command_line_switch) \
-    SINGLE_DISABLE_VALUE_TYPE_AND_VALUE(command_line_switch, "")
-#define ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(enable_switch, enable_value,   \
-                                            disable_switch, disable_value) \
-  FeatureEntry::ENABLE_DISABLE_VALUE, enable_switch, enable_value,         \
-      disable_switch, disable_value, nullptr, nullptr, 3
-#define ENABLE_DISABLE_VALUE_TYPE(enable_switch, disable_switch) \
-    ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(enable_switch, "", disable_switch, "")
-#define MULTI_VALUE_TYPE(choices)                                         \
-  FeatureEntry::MULTI_VALUE, nullptr, nullptr, nullptr, nullptr, nullptr, \
-      choices, arraysize(choices)
-#define FEATURE_VALUE_TYPE(feature)                                \
-  FeatureEntry::FEATURE_VALUE, nullptr, nullptr, nullptr, nullptr, \
-      feature.name, nullptr, 3
-
 namespace {
 
 // Enumeration of OSs.
 enum {
   kOsMac = 1 << 0,
   kOsWin = 1 << 1,
   kOsLinux = 1 << 2,
   kOsCrOS = 1 << 3,
   kOsAndroid = 1 << 4,
   kOsCrOSOwnerOnly = 1 << 5
@@ skipping 2324 matching lines @@
     value->SetString("internal_name", name);
     value->SetString("description", entry.DescriptionForChoice(i));
     value->SetBoolean("selected", enabled_entries.count(name) > 0);
     result->Append(value);
   }
   return result;
 }
 
 }  // namespace
 
-std::string FeatureEntry::NameForChoice(int index) const {
-  DCHECK(type == FeatureEntry::MULTI_VALUE ||
-         type == FeatureEntry::ENABLE_DISABLE_VALUE ||
-         type == FeatureEntry::FEATURE_VALUE);
-  DCHECK_LT(index, num_choices);
-  return std::string(internal_name) + testing::kMultiSeparator +
-         base::IntToString(index);
-}
-
-base::string16 FeatureEntry::DescriptionForChoice(int index) const {
-  DCHECK(type == FeatureEntry::MULTI_VALUE ||
-         type == FeatureEntry::ENABLE_DISABLE_VALUE ||
-         type == FeatureEntry::FEATURE_VALUE);
-  DCHECK_LT(index, num_choices);
-  int description_id;
-  if (type == FeatureEntry::ENABLE_DISABLE_VALUE ||
-      type == FeatureEntry::FEATURE_VALUE) {
-    const int kEnableDisableDescriptionIds[] = {
-      IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT,
-      IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-      IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    };
-    description_id = kEnableDisableDescriptionIds[index];
-  } else {
-    description_id = choices[index].description_id;
-  }
-  return l10n_util::GetStringUTF16(description_id);
-}
-
 void ConvertFlagsToSwitches(flags_ui::FlagsStorage* flags_storage,
                             base::CommandLine* command_line,
                             SentinelsMode sentinels) {
   FlagsState::GetInstance()->ConvertFlagsToSwitches(flags_storage,
                                                     command_line,
                                                     sentinels);
 }
 
 bool AreSwitchesIdenticalToCurrentCommandLine(
     const base::CommandLine& new_cmdline,
@@ skipping 229 matching lines @@
                            command_line);
 }
 
 bool FlagsState::IsRestartNeededToCommitChanges() {
   return needs_restart_;
 }
 
 void FlagsState::SetFeatureEntryEnabled(flags_ui::FlagsStorage* flags_storage,
                                         const std::string& internal_name,
                                         bool enable) {
-  size_t at_index = internal_name.find(testing::kMultiSeparator);
+  size_t at_index = internal_name.find(flags_ui::testing::kMultiSeparator);
   if (at_index != std::string::npos) {
     DCHECK(enable);
     // We're being asked to enable a multi-choice entry. Disable the
     // currently selected choice.
     DCHECK_NE(at_index, 0u);
     const std::string entry_name = internal_name.substr(0, at_index);
     SetFeatureEntryEnabled(flags_storage, entry_name, false);
 
     // And enable the new choice, if it is not the default first choice.
     if (internal_name != entry_name + "@0") {
@@ skipping 206 matching lines @@
   // switch to the end but doesn't remove previous ones).
   std::string switch_value = base::JoinString(features, ",");
   if (switch_value != original_switch_value)
     command_line->AppendSwitchASCII(switch_name, switch_value);
 }
 
 }  // namespace
 
 namespace testing {
 
-// WARNING: '@' is also used in the html file. If you update this constant you
-// also need to update the html file.
-const char kMultiSeparator[] = "@";
-
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 void ClearState() {
   FlagsState::GetInstance()->Reset();
 }
 
 void SetFeatureEntries(const FeatureEntry* entries, size_t count) {
   if (!entries) {
     entries = kFeatureEntries;
     count = arraysize(kFeatureEntries);
   }
   FlagsState::GetInstance()->SetFeatureEntries(entries, count);
 }
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   return FlagsState::GetInstance()->GetFeatureEntries(count);
 }
 
 }  // namespace testing
 
 }  // namespace about_flags