Stop using deprecated base::Value::CreateWithCopiedBuffer() in chrome/.

Bug: 646113
Change-Id: I2c2077217023325eb49a9a6ff79acadc37c507f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2473452Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818999}

chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc

@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/containers/span.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
@@ -175,15 +176,15 @@ TEST_F(FileSystemProviderOperationsReadFileTest, OnSuccess) {
   const bool has_more = false;
   const int execution_time = 0;
 
-  base::ListValue value_as_list;
-  value_as_list.Set(0, std::make_unique<base::Value>(kFileSystemId));
-  value_as_list.Set(1, std::make_unique<base::Value>(kRequestId));
-  value_as_list.Set(
-      2, base::Value::CreateWithCopiedBuffer(data.c_str(), data.size()));
-  value_as_list.Set(3, std::make_unique<base::Value>(has_more));
-  value_as_list.Set(4, std::make_unique<base::Value>(execution_time));
+  base::Value values_as_list(base::Value::Type::LIST);
+  values_as_list.Append(kFileSystemId);
+  values_as_list.Append(kRequestId);
+  values_as_list.Append(base::Value(base::as_bytes(base::make_span(data))));
+  values_as_list.Append(has_more);
+  values_as_list.Append(execution_time);
 
-  std::unique_ptr<Params> params(Params::Create(value_as_list));
+  std::unique_ptr<Params> params(
+      Params::Create(base::Value::AsListValue(std::move(values_as_list))));
   ASSERT_TRUE(params.get());
   std::unique_ptr<RequestValue> request_value(
       RequestValue::CreateForReadFileSuccess(std::move(params)));

chrome/browser/chromeos/file_system_provider/operations/write_file.cc

@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/containers/span.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/file_system_provider.h"
@@ -48,18 +49,22 @@ bool WriteFile::Execute(int request_id) {
 
   // Set the data directly on base::Value() to avoid an extra string copy.
   DCHECK(buffer_.get());
-  std::unique_ptr<base::DictionaryValue> options_as_value = options.ToValue();
-  options_as_value->Set(
-      "data", base::Value::CreateWithCopiedBuffer(buffer_->data(), length_));
 
-  std::unique_ptr<base::ListValue> event_args(new base::ListValue);
-  event_args->Append(std::move(options_as_value));
+  base::Value options_as_value =
+      base::Value::FromUniquePtrValue(options.ToValue());
+  options_as_value.SetKey(
+      "data",
+      base::Value(base::as_bytes(base::make_span(buffer_->data(), length_))));
+
+  base::Value event_args(base::Value::Type::LIST);
+  event_args.Append(std::move(options_as_value));
 
   return SendEvent(
       request_id,
       extensions::events::FILE_SYSTEM_PROVIDER_ON_WRITE_FILE_REQUESTED,
       extensions::api::file_system_provider::OnWriteFileRequested::kEventName,
-      std::move(event_args));
+      base::ListValue::From(
+          base::Value::ToUniquePtrValue(std::move(event_args))));
 }
 
 void WriteFile::OnSuccess(int /* request_id */,

chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc

@@ -6,7 +6,9 @@
 
 #include <utility>
 
+#include "base/containers/span.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/attestation/mock_tpm_challenge_key.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
@@ -135,25 +137,26 @@ class EPKChallengeMachineKeyTest : public EPKChallengeKeyTestBase {
   }
 
   std::unique_ptr<base::ListValue> CreateArgs() {
-    return CreateArgsInternal(nullptr);
+    return CreateArgsInternal(base::Value());
   }
 
   std::unique_ptr<base::ListValue> CreateArgsNoRegister() {
-    return CreateArgsInternal(std::make_unique<bool>(false));
+    return CreateArgsInternal(base::Value(false));
   }
 
   std::unique_ptr<base::ListValue> CreateArgsRegister() {
-    return CreateArgsInternal(std::make_unique<bool>(true));
+    return CreateArgsInternal(base::Value(true));
   }
 
   std::unique_ptr<base::ListValue> CreateArgsInternal(
-      std::unique_ptr<bool> register_key) {
-    std::unique_ptr<base::ListValue> args(new base::ListValue);
-    args->Append(base::Value::CreateWithCopiedBuffer("challenge", 9));
-    if (register_key) {
-      args->AppendBoolean(*register_key);
-    }
-    return args;
+      base::Value register_key) {
+    static constexpr base::StringPiece kData = "challenge";
+    base::Value args(base::Value::Type::LIST);
+    args.Append(base::Value(base::as_bytes(base::make_span(kData))));
+    if (register_key.is_bool())
+      args.Append(std::move(register_key));
+    return base::ListValue::From(
+        base::Value::ToUniquePtrValue(std::move(args)));
   }
 
   scoped_refptr<EnterprisePlatformKeysChallengeMachineKeyFunction> func_;
@@ -221,10 +224,12 @@ class EPKChallengeUserKeyTest : public EPKChallengeKeyTestBase {
   }
 
   std::unique_ptr<base::ListValue> CreateArgsInternal(bool register_key) {
-    std::unique_ptr<base::ListValue> args(new base::ListValue);
-    args->Append(base::Value::CreateWithCopiedBuffer("challenge", 9));
-    args->AppendBoolean(register_key);
-    return args;
+    static constexpr base::StringPiece kData = "challenge";
+    base::Value args(base::Value::Type::LIST);
+    args.Append(base::Value(base::as_bytes(base::make_span(kData))));
+    args.Append(register_key);
+    return base::ListValue::From(
+        base::Value::ToUniquePtrValue(std::move(args)));
   }
 
   EPKPChallengeKey impl_;

chrome/browser/extensions/api/idltest/idltest_api.cc

@@ -9,6 +9,8 @@
 #include <memory>
 #include <utility>
 
+#include "base/containers/span.h"
+#include "base/strings/string_piece.h"
 #include "base/values.h"
 
 namespace {
@@ -39,7 +41,7 @@ ExtensionFunction::ResponseAction IdltestSendArrayBufferViewFunction::Run() {
 }
 
 ExtensionFunction::ResponseAction IdltestGetArrayBufferFunction::Run() {
-  static constexpr char kHello[] = "hello world";
-  return RespondNow(
-      OneArgument(base::Value::CreateWithCopiedBuffer(kHello, strlen(kHello))));
+  static constexpr base::StringPiece kHello = "hello world";
+  return RespondNow(OneArgument(base::Value::ToUniquePtrValue(
+      base::Value(base::as_bytes(base::make_span(kHello))))));
 }

chrome/browser/extensions/api/platform_keys/platform_keys_api.cc

@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/containers/span.h"
 #include "base/logging.h"
 #include "base/optional.h"
 #include "base/stl_util.h"
@@ -66,12 +67,9 @@ void BuildWebCryptoRSAAlgorithmDictionary(const PublicKeyInfo& key_info,
                     base::Value(static_cast<int>(key_info.key_size_bits)));
 
   // Equals 65537.
-  const unsigned char defaultPublicExponent[] = {0x01, 0x00, 0x01};
-  algorithm->SetWithoutPathExpansion(
-      "publicExponent",
-      base::Value::CreateWithCopiedBuffer(
-          reinterpret_cast<const char*>(defaultPublicExponent),
-          base::size(defaultPublicExponent)));
+  static constexpr uint8_t kDefaultPublicExponent[] = {0x01, 0x00, 0x01};
+  algorithm->SetKey("publicExponent",
+                    base::Value(base::make_span(kDefaultPublicExponent)));
 }
 
 void BuildWebCryptoEcdsaAlgorithmDictionary(const PublicKeyInfo& key_info,