Update from https://crrev.com/329939

base/test/values_test_util.cc

Index: base/test/values_test_util.cc
diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc
index c5dfd7946adc2333e67fa96dac955e2953126879..3e762b97eaaf41a1559a548dcea7c9983c75bc3c 100644
--- a/base/test/values_test_util.cc
+++ b/base/test/values_test_util.cc
@@ -69,7 +69,7 @@ scoped_ptr<Value> ParseJson(base::StringPiece json) {
       NULL, &error_msg));
   if (!result) {
     ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
-    result.reset(Value::CreateNullValue());
+    result = Value::CreateNullValue();
   }
   return result.Pass();
 }