Add a base::ParseJson() function to help tests construct Values.

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 "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
-#include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 void ExpectDictBooleanValue(bool expected_value,
                             const DictionaryValue& value,
                             const std::string& key) {
   bool boolean_value = false;
   EXPECT_TRUE(value.GetBoolean(key, &boolean_value)) << key;
@@ skipping 33 matching lines @@
 }
 
 void ExpectStringValue(const std::string& expected_str,
                        StringValue* actual) {
   scoped_ptr<StringValue> scoped_actual(actual);
   std::string actual_str;
   EXPECT_TRUE(scoped_actual->GetAsString(&actual_str));
   EXPECT_EQ(expected_str, actual_str);
 }
 
+scoped_ptr<Value> ParseJson(base::StringPiece json) {

[Jeffrey Yasskin, 2012/12/13 23:20:29]

It might make sense to put this into a base::test namespace. Which do you
prefer?

[willchan no longer on Chromium, 2012/12/14 20:35:04]

It would make sense if I foresaw someone taking the time to move all the rest.
Realistically speaking, I don't see that happening.

Actually, now that I look at it, I may lean a bit more towards putting it in the
base::test namespace. My reasoning is that ParseJson() is too generic a name to
put just in base::. Either we should rename to base::ParseJsonForTests() or put
it in base::test::ParseJson().

[Jeffrey Yasskin, 2012/12/14 23:12:41]

I've moved it into base::test so that tests that want the shorter name can use
"using base::test::ParseJson". I'll wait until Monday to submit so Dominic can
weigh in if he wants.

+  std::string error_msg;
+  scoped_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.reset(Value::CreateNullValue());
+  }
+  return result.Pass();
+}
+
 }  // namespace base