Remove raw DictionaryValue::Set in //components

base/test/values_test_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 "base/test/values_test_util.h"
 
 #include <memory>
 
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
@@ skipping 36 matching lines @@
 }
 
 void ExpectDictStringValue(const std::string& expected_value,
                            const DictionaryValue& value,
                            const std::string& key) {
   std::string string_value;
   EXPECT_TRUE(value.GetString(key, &string_value)) << key;
   EXPECT_EQ(expected_value, string_value) << key;
 }
 
-void ExpectStringValue(const std::string& expected_str, Value* actual) {
-  std::unique_ptr<Value> scoped_actual(actual);
-  std::string actual_str;
-  EXPECT_TRUE(scoped_actual->GetAsString(&actual_str));
-  EXPECT_EQ(expected_str, actual_str);
+void ExpectStringValue(const std::string& expected_str, const Value& actual) {
+  EXPECT_EQ(Value::Type::STRING, actual.type());
+  EXPECT_EQ(expected_str, actual.GetString());
 }
 
 namespace test {
 
 std::unique_ptr<Value> ParseJson(base::StringPiece json) {
   std::string error_msg;
   std::unique_ptr<Value> result = base::JSONReader::ReadAndReturnError(
       json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg);
   if (!result) {
     ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
     result = MakeUnique<Value>();
   }
   return result;
 }
 
 }  // namespace test
 }  // namespace base