Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1209)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/test/values_test_util.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/test/trace_to_file.cc ('k') | base/threading/platform_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/values_test_util.cc
diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc
index 3e762b97eaaf41a1559a548dcea7c9983c75bc3c..ebfc4948ecf3b9f0c6b8089ea92eb463a5523000 100644
--- a/base/test/values_test_util.cc
+++ b/base/test/values_test_util.cc
@@ -64,9 +64,8 @@ namespace test {
scoped_ptr<Value> ParseJson(base::StringPiece json) {
std::string error_msg;
- scoped_ptr<Value> result(base::JSONReader::ReadAndReturnError(
- json, base::JSON_ALLOW_TRAILING_COMMAS,
- NULL, &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 = Value::CreateNullValue();
« no previous file with comments | « base/test/trace_to_file.cc ('k') | base/threading/platform_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698