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

Side by Side Diff: base/test/values_test_util.cc

Issue 178253007: Parse manifest file with app.service_worker.script. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/test/values_test_util.h" 5 #include "base/test/values_test_util.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 scoped_ptr<Value> result(base::JSONReader::ReadAndReturnError( 67 scoped_ptr<Value> result(base::JSONReader::ReadAndReturnError(
68 json, base::JSON_ALLOW_TRAILING_COMMAS, 68 json, base::JSON_ALLOW_TRAILING_COMMAS,
69 NULL, &error_msg)); 69 NULL, &error_msg));
70 if (!result) { 70 if (!result) {
71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; 71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
72 result.reset(Value::CreateNullValue()); 72 result.reset(Value::CreateNullValue());
73 } 73 }
74 return result.Pass(); 74 return result.Pass();
75 } 75 }
76 76
77 scoped_ptr<DictionaryValue> ParseJsonDictionaryWithSingleQuotes(
78 std::string json) {
79 std::replace(json.begin(), json.end(), '\'', '"');
80 std::string error_msg;
81 scoped_ptr<Value> result(base::JSONReader::ReadAndReturnError(
82 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg));
83 scoped_ptr<base::DictionaryValue> result_dict;
84 if (result && result->IsType(base::Value::TYPE_DICTIONARY)) {
85 result_dict.reset(static_cast<DictionaryValue*>(result.release()));
86 } else {
87 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
88 result_dict.reset(new base::DictionaryValue());
89 }
90 return result_dict.Pass();
91 }
92
77 } // namespace test 93 } // namespace test
78 } // namespace base 94 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698