From c06c8442b07e98c2fa3d074e2ba6f4ee05c60d1e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 28 Jan 2022 21:41:10 +0000 Subject: [PATCH] Simplify flags_ui::FeatureEntry() code. Avoid using base::ASCIIToUTF16(base::StringPiece(str)). Use base::StrCat() in one case, and simply remove the base::StringPiece() in another. Make a constant truly const along the way. Change-Id: I8545879ba575b3a93b53bfdaa6e7102aee8b6748 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3420961 Reviewed-by: Kyle Horimoto Commit-Queue: Lei Zhang Cr-Commit-Position: refs/heads/main@{#964791} --- components/flags_ui/feature_entry.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/flags_ui/feature_entry.cc b/components/flags_ui/feature_entry.cc index df4a553f6c61fb..882dc41b533e75 100644 --- a/components/flags_ui/feature_entry.cc +++ b/components/flags_ui/feature_entry.cc @@ -7,6 +7,7 @@ #include "base/check_op.h" #include "base/logging.h" #include "base/notreached.h" +#include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -87,8 +88,9 @@ std::u16string FeatureEntry::DescriptionForOption(int index) const { const char* description = nullptr; if (type == FeatureEntry::ENABLE_DISABLE_VALUE || type == FeatureEntry::FEATURE_VALUE) { - const char* kEnableDisableDescriptions[] = { - kGenericExperimentChoiceDefault, kGenericExperimentChoiceEnabled, + const char* const kEnableDisableDescriptions[] = { + kGenericExperimentChoiceDefault, + kGenericExperimentChoiceEnabled, kGenericExperimentChoiceDisabled, }; description = kEnableDisableDescriptions[index]; @@ -100,11 +102,9 @@ std::u16string FeatureEntry::DescriptionForOption(int index) const { } else if (index < NumOptions() - 1) { // First two options do not have variations params. int variation_index = index - 2; - return base::ASCIIToUTF16( - base::StringPiece(kGenericExperimentChoiceEnabled)) + - u" " + - base::ASCIIToUTF16( - feature.feature_variations[variation_index].description_text); + return base::ASCIIToUTF16(base::StrCat( + {kGenericExperimentChoiceEnabled, " ", + feature.feature_variations[variation_index].description_text})); } else { DCHECK_EQ(NumOptions() - 1, index); description = kGenericExperimentChoiceDisabled; @@ -112,7 +112,7 @@ std::u16string FeatureEntry::DescriptionForOption(int index) const { } else { description = choices[index].description; } - return base::ASCIIToUTF16(base::StringPiece(description)); + return base::ASCIIToUTF16(description); } const FeatureEntry::Choice& FeatureEntry::ChoiceForOption(int index) const {