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

chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc

 // Copyright 2013 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/extensions/file_manager/private_api_drive.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 742 matching lines @@
                  this,
                  next_link,
                  base::Passed(&results)));
 }
 
 void FileManagerPrivateSearchDriveFunction::OnEntryDefinitionList(
     const GURL& next_link,
     std::unique_ptr<SearchResultInfoList> search_result_info_list,
     std::unique_ptr<EntryDefinitionList> entry_definition_list) {
   DCHECK_EQ(search_result_info_list->size(), entry_definition_list->size());
-  base::ListValue* entries = new base::ListValue();
+  auto entries = base::MakeUnique<base::ListValue>();
 
   // Convert Drive files to something File API stack can understand.
   for (EntryDefinitionList::const_iterator it = entry_definition_list->begin();
        it != entry_definition_list->end();
        ++it) {
     auto entry = base::MakeUnique<base::DictionaryValue>();
     entry->SetString("fileSystemName", it->file_system_name);
     entry->SetString("fileSystemRoot", it->file_system_root_url);
     entry->SetString("fileFullPath", "/" + it->full_path.AsUTF8Unsafe());
     entry->SetBoolean("fileIsDirectory", it->is_directory);
     entries->Append(std::move(entry));
   }
 
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-  result->Set("entries", entries);
+  result->Set("entries", std::move(entries));
   result->SetString("nextFeed", next_link.spec());
 
   SetResult(std::move(result));
   SendResponse(true);
 }
 
 bool FileManagerPrivateSearchDriveMetadataFunction::RunAsync() {
   using api::file_manager_private::SearchDriveMetadata::Params;
   const std::unique_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
@@ skipping 73 matching lines @@
   std::unique_ptr<base::ListValue> results_list(new base::ListValue());
 
   // Convert Drive files to something File API stack can understand.  See
   // file_browser_handler_custom_bindings.cc and
   // file_manager_private_custom_bindings.js for how this is magically
   // converted to a FileEntry.
   for (size_t i = 0; i < entry_definition_list->size(); ++i) {
     auto result_dict = base::MakeUnique<base::DictionaryValue>();
 
     // FileEntry fields.
-    base::DictionaryValue* entry = new base::DictionaryValue();
+    auto entry = base::MakeUnique<base::DictionaryValue>();
     entry->SetString(
         "fileSystemName", entry_definition_list->at(i).file_system_name);
     entry->SetString(
         "fileSystemRoot", entry_definition_list->at(i).file_system_root_url);
     entry->SetString(
         "fileFullPath",
         "/" + entry_definition_list->at(i).full_path.AsUTF8Unsafe());
     entry->SetBoolean("fileIsDirectory",
                       entry_definition_list->at(i).is_directory);
 
-    result_dict->Set("entry", entry);
+    result_dict->Set("entry", std::move(entry));
     result_dict->SetString(
         "highlightedBaseName",
         search_result_info_list->at(i).highlighted_base_name);
     results_list->Append(std::move(result_dict));
   }
 
   SetResult(std::move(results_list));
   SendResponse(true);
 }
 
@@ skipping 255 matching lines @@
   }
 
   const std::string url =
       download_url_.Resolve("?alt=media&access_token=" + access_token).spec();
   SetResult(base::MakeUnique<base::Value>(url));
 
   SendResponse(true);
 }
 
 }  // namespace extensions