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

Side by Side Diff: cc/test/layer_tree_json_parser.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 | « cc/test/layer_tree_host_common_test.h ('k') | cc/test/layer_tree_json_parser_unittest.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "cc/test/layer_tree_json_parser.h" 5 #include "cc/test/layer_tree_json_parser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/test/values_test_util.h" 9 #include "base/test/values_test_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 if (!success) 159 if (!success)
160 return NULL; 160 return NULL;
161 161
162 return new_layer; 162 return new_layer;
163 } 163 }
164 164
165 } // namespace 165 } // namespace
166 166
167 scoped_refptr<Layer> ParseTreeFromJson(std::string json, 167 scoped_refptr<Layer> ParseTreeFromJson(std::string json,
168 ContentLayerClient* content_client) { 168 ContentLayerClient* content_client) {
169 scoped_ptr<base::Value> val = base::test::ParseJson(json); 169 std::unique_ptr<base::Value> val = base::test::ParseJson(json);
170 return ParseTreeFromValue(val.get(), content_client); 170 return ParseTreeFromValue(val.get(), content_client);
171 } 171 }
172 172
173 } // namespace cc 173 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_host_common_test.h ('k') | cc/test/layer_tree_json_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698