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

Side by Side Diff: base/json/json_string_value_serializer.cc

Issue 1852433005: Convert //base to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase after r384946 Created 4 years, 8 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
« no previous file with comments | « base/json/json_string_value_serializer.h ('k') | base/json/json_value_converter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/json/json_string_value_serializer.h" 5 #include "base/json/json_string_value_serializer.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 JSONStringValueDeserializer::JSONStringValueDeserializer( 43 JSONStringValueDeserializer::JSONStringValueDeserializer(
44 const base::StringPiece& json_string) 44 const base::StringPiece& json_string)
45 : json_string_(json_string), 45 : json_string_(json_string),
46 allow_trailing_comma_(false) { 46 allow_trailing_comma_(false) {
47 } 47 }
48 48
49 JSONStringValueDeserializer::~JSONStringValueDeserializer() {} 49 JSONStringValueDeserializer::~JSONStringValueDeserializer() {}
50 50
51 scoped_ptr<Value> JSONStringValueDeserializer::Deserialize( 51 std::unique_ptr<Value> JSONStringValueDeserializer::Deserialize(
52 int* error_code, 52 int* error_code,
53 std::string* error_str) { 53 std::string* error_str) {
54 return base::JSONReader::ReadAndReturnError( 54 return base::JSONReader::ReadAndReturnError(
55 json_string_, allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS 55 json_string_, allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS
56 : base::JSON_PARSE_RFC, 56 : base::JSON_PARSE_RFC,
57 error_code, error_str); 57 error_code, error_str);
58 } 58 }
OLDNEW
« no previous file with comments | « base/json/json_string_value_serializer.h ('k') | base/json/json_value_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698