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

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

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/test/trace_event_analyzer_unittest.cc ('k') | base/test/values_test_util.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 (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 #ifndef BASE_TEST_VALUES_TEST_UTIL_H_ 5 #ifndef BASE_TEST_VALUES_TEST_UTIL_H_
6 #define BASE_TEST_VALUES_TEST_UTIL_H_ 6 #define BASE_TEST_VALUES_TEST_UTIL_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/memory/scoped_ptr.h"
11 #include "base/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
12 12
13 namespace base { 13 namespace base {
14 class DictionaryValue; 14 class DictionaryValue;
15 class ListValue; 15 class ListValue;
16 class StringValue; 16 class StringValue;
17 class Value; 17 class Value;
18 18
19 // All the functions below expect that the value for the given key in 19 // All the functions below expect that the value for the given key in
20 // the given dictionary equals the given expected value. 20 // the given dictionary equals the given expected value.
(...skipping 20 matching lines...) Expand all
41 41
42 // Takes ownership of |actual|. 42 // Takes ownership of |actual|.
43 void ExpectStringValue(const std::string& expected_str, 43 void ExpectStringValue(const std::string& expected_str,
44 StringValue* actual); 44 StringValue* actual);
45 45
46 namespace test { 46 namespace test {
47 47
48 // Parses |json| as JSON, allowing trailing commas, and returns the 48 // Parses |json| as JSON, allowing trailing commas, and returns the
49 // resulting value. If the json fails to parse, causes an EXPECT 49 // resulting value. If the json fails to parse, causes an EXPECT
50 // failure and returns the Null Value (but never a NULL pointer). 50 // failure and returns the Null Value (but never a NULL pointer).
51 scoped_ptr<Value> ParseJson(base::StringPiece json); 51 std::unique_ptr<Value> ParseJson(base::StringPiece json);
52 52
53 } // namespace test 53 } // namespace test
54 } // namespace base 54 } // namespace base
55 55
56 #endif // BASE_TEST_VALUES_TEST_UTIL_H_ 56 #endif // BASE_TEST_VALUES_TEST_UTIL_H_
OLDNEW
« no previous file with comments | « base/test/trace_event_analyzer_unittest.cc ('k') | base/test/values_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698