Reland: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions

chrome/browser/extensions/convert_web_app.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/extensions/convert_web_app.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <cmath>
 #include <limits>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/web_application_info.h"
 #include "crypto/sha2.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/image_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
@@ skipping 72 matching lines @@
   root->SetString(keys::kName, base::UTF16ToUTF8(web_app.title));
   root->SetString(keys::kVersion, ConvertTimeToExtensionVersion(create_time));
   root->SetString(keys::kDescription, base::UTF16ToUTF8(web_app.description));
   root->SetString(keys::kLaunchWebURL, web_app.app_url.spec());
   if (web_app.generated_icon_color != SK_ColorTRANSPARENT) {
     root->SetString(keys::kAppIconColor, image_util::GenerateHexColorString(
                                              web_app.generated_icon_color));
   }
 
   // Add the icons and linked icon information.
-  base::DictionaryValue* icons = new base::DictionaryValue();
-  root->Set(keys::kIcons, icons);
-  base::ListValue* linked_icons = new base::ListValue();
-  root->Set(keys::kLinkedAppIcons, linked_icons);
+  auto icons = base::MakeUnique<base::DictionaryValue>();
+  auto linked_icons = base::MakeUnique<base::ListValue>();
   for (const auto& icon : web_app.icons) {
     std::string size = base::StringPrintf("%i", icon.width);
     std::string icon_path = base::StringPrintf("%s/%s.png", kIconsDirName,
                                                size.c_str());
     icons->SetString(size, icon_path);
 
     if (icon.url.is_valid()) {
       std::unique_ptr<base::DictionaryValue> linked_icon(
           new base::DictionaryValue());
       linked_icon->SetString(keys::kLinkedAppIconURL, icon.url.spec());
       linked_icon->SetInteger(keys::kLinkedAppIconSize, icon.width);
       linked_icons->Append(std::move(linked_icon));
     }
   }
+  root->Set(keys::kIcons, std::move(icons));
+  root->Set(keys::kLinkedAppIcons, std::move(linked_icons));
 
   // Write the manifest.
   base::FilePath manifest_path = temp_dir.GetPath().Append(kManifestFilename);
   JSONFileValueSerializer serializer(manifest_path);
   if (!serializer.Serialize(*root)) {
     LOG(ERROR) << "Could not serialize manifest.";
     return NULL;
   }
 
   // Write the icon files.
@@ skipping 33 matching lines @@
   if (!extension.get()) {
     LOG(ERROR) << error;
     return NULL;
   }
 
   temp_dir.Take();  // The caller takes ownership of the directory.
   return extension;
 }
 
 }  // namespace extensions