Remove raw DictionaryValue::Set in //components

base/test/values_test_util.h

 // 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.
 
 #ifndef BASE_TEST_VALUES_TEST_UTIL_H_
 #define BASE_TEST_VALUES_TEST_UTIL_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 20 matching lines @@
                             const std::string& key);
 
 void ExpectDictListValue(const ListValue& expected_value,
                          const DictionaryValue& value,
                          const std::string& key);
 
 void ExpectDictStringValue(const std::string& expected_value,
                            const DictionaryValue& value,
                            const std::string& key);
 
-// Takes ownership of |actual|.
-void ExpectStringValue(const std::string& expected_str, Value* actual);
+void ExpectStringValue(const std::string& expected_str,
+                       std::unique_ptr<Value> actual);

[brettw, 2017/05/19 20:31:02]

It seems weird to me that such a function would take ownership of the value to
compare against.

Before we used unique_ptr and had to heap-allocate all Values, this may have
made sense so people wouldn't forget to free the values.

But now can we pass a const Ref here? This has the advantage of making the
callsites shorter too, since you can do *foo instead of std::move(foo).

[jdoerrie, 2017/05/22 08:15:59]

Good point, I changed it now. 

Shorter callsites is unfortunately not true currently, because all callsites are
of form |ExpectStringValue("my_string", MyFun())|, meaning there is no move we
can drop. Updating all MyFuns to return Values directly is currently blocked on
having DictionaryValue::Set(StringPiece, Value) or equivalent. However, once we
do have that, we can return Values in a lot of places directly and can fix the
MyFuns.

 
 namespace test {
 
 // Parses |json| as JSON, allowing trailing commas, and returns the
 // resulting value.  If the json fails to parse, causes an EXPECT
 // failure and returns the Null Value (but never a NULL pointer).
 std::unique_ptr<Value> ParseJson(base::StringPiece json);
 
 }  // namespace test
 }  // namespace base
 
 #endif  // BASE_TEST_VALUES_TEST_UTIL_H_