Stop passing raw pointers to DictionaryValue::Set, part 2

chrome/browser/chromeos/file_manager/url_util.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/chromeos/file_manager/url_util.h"
 
 #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"
 
 namespace file_manager {
 namespace util {
 namespace {
 
 const char kAllowedPaths[] = "allowedPaths";
 const char kNativePath[] = "nativePath";
@@ skipping 58 matching lines @@
     const base::FilePath::StringType& default_extension) {
   base::DictionaryValue arg_value;
   arg_value.SetString("type", GetDialogTypeAsString(type));
   arg_value.SetString("title", title);
   arg_value.SetString("currentDirectoryURL", current_directory_url.spec());
   arg_value.SetString("selectionURL", selection_url.spec());
   arg_value.SetString("targetName", target_name);
   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];
         dict->SetString("description", desc);
       }
 
       // file_type_index is 1-based. 0 means no selection at all.
       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);
   }
 
   // If the caller cannot handle Drive path, the file chooser dialog need to
   // return resolved local native paths to the selected files.
   if (file_types) {
     switch (file_types->allowed_paths) {
       case ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH:
         arg_value.SetString(kAllowedPaths, kNativePath);
@@ skipping 13 matching lines @@
   base::JSONWriter::Write(arg_value, &json_args);
 
   std::string url = GetFileManagerMainPageUrl().spec() + '?' +
       net::EscapeUrlEncodedData(json_args,
                                 false);  // Space to %20 instead of +.
   return GURL(url);
 }
 
 }  // namespace util
 }  // namespace file_manager