Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: components/flags_ui/flags_state.cc

Issue 2889163002: Remove raw DictionaryValue::Set in //components (Closed)
Patch Set: Nits Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/flags_ui/flags_state.cc
diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_state.cc
index d89c3629c352f633e5bc6def025d38f6d5acf74c..c08d3983e754ac44a504dd5f07032509bd7d249d 100644
--- a/components/flags_ui/flags_state.cc
+++ b/components/flags_ui/flags_state.cc
@@ -11,6 +11,7 @@
#include "base/feature_list.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
@@ -175,22 +176,23 @@ bool IsDefaultValue(const FeatureEntry& entry,
}
// Returns the Value representing the choice data in the specified entry.
-base::Value* CreateOptionsData(const FeatureEntry& entry,
- const std::set<std::string>& enabled_entries) {
+std::unique_ptr<base::Value> CreateOptionsData(
+ const FeatureEntry& entry,
+ const std::set<std::string>& enabled_entries) {
DCHECK(entry.type == FeatureEntry::MULTI_VALUE ||
entry.type == FeatureEntry::ENABLE_DISABLE_VALUE ||
entry.type == FeatureEntry::FEATURE_VALUE ||
entry.type == FeatureEntry::FEATURE_WITH_PARAMS_VALUE);
- base::ListValue* result = new base::ListValue;
+ auto result = base::MakeUnique<base::ListValue>();
for (int i = 0; i < entry.num_options; ++i) {
- std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue);
+ auto value = base::MakeUnique<base::DictionaryValue>();
const std::string name = entry.NameForOption(i);
value->SetString("internal_name", name);
value->SetString("description", entry.DescriptionForOption(i));
value->SetBoolean("selected", enabled_entries.count(name) > 0);
result->Append(std::move(value));
}
- return result;
+ return std::move(result);
}
// Registers variation parameters specified by |feature_variation_params| for
@@ -515,9 +517,9 @@ void FlagsState::GetFlagFeatureEntries(
data->SetString("description",
base::StringPiece(entry.visible_description));
- base::ListValue* supported_platforms = new base::ListValue();
- AddOsStrings(entry.supported_platforms, supported_platforms);
- data->Set("supported_platforms", supported_platforms);
+ auto supported_platforms = base::MakeUnique<base::ListValue>();
+ AddOsStrings(entry.supported_platforms, supported_platforms.get());
+ data->Set("supported_platforms", std::move(supported_platforms));
// True if the switch is not currently passed.
bool is_default_value = IsDefaultValue(entry, enabled_entries);
data->SetBoolean("is_default", is_default_value);
« no previous file with comments | « components/error_page/renderer/net_error_helper_core_unittest.cc ('k') | components/gcm_driver/gcm_internals_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698