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

Unified Diff: chrome/browser/chromeos/file_manager/url_util.cc

Issue 2765363004: Stop passing raw pointers to DictionaryValue::Set, part 2 (Closed)
Patch Set: Fix comments Created 3 years, 9 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: chrome/browser/chromeos/file_manager/url_util.cc
diff --git a/chrome/browser/chromeos/file_manager/url_util.cc b/chrome/browser/chromeos/file_manager/url_util.cc
index 035b46902f4dc15c245b304175f18694af71492b..8303a3228bbd247120869297b44c9316f40f571e 100644
--- a/chrome/browser/chromeos/file_manager/url_util.cc
+++ b/chrome/browser/chromeos/file_manager/url_util.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include "base/json/json_writer.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/chromeos/file_manager/app_id.h"
#include "net/base/escape.h"
@@ -85,15 +86,15 @@ GURL GetFileManagerMainPageUrlWithParams(
arg_value.SetString("defaultExtension", default_extension);
if (file_types) {
- base::ListValue* types_list = new base::ListValue();
+ auto types_list = base::MakeUnique<base::ListValue>();
for (size_t i = 0; i < file_types->extensions.size(); ++i) {
base::ListValue* extensions_list = new base::ListValue();
for (size_t j = 0; j < file_types->extensions[i].size(); ++j) {
extensions_list->AppendString(file_types->extensions[i][j]);
}
- base::DictionaryValue* dict = new base::DictionaryValue();
- dict->Set("extensions", extensions_list);
+ auto dict = base::MakeUnique<base::DictionaryValue>();
+ dict->Set("extensions", std::move(extensions_list));
if (i < file_types->extension_description_overrides.size()) {
base::string16 desc = file_types->extension_description_overrides[i];
@@ -104,9 +105,9 @@ GURL GetFileManagerMainPageUrlWithParams(
dict->SetBoolean("selected",
(static_cast<size_t>(file_type_index) == (i + 1)));
- types_list->Set(i, dict);
+ types_list->Set(i, std::move(dict));
}
- arg_value.Set("typeList", types_list);
+ arg_value.Set("typeList", std::move(types_list));
arg_value.SetBoolean("includeAllFiles", file_types->include_all_files);
}

Powered by Google App Engine
This is Rietveld 408576698