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

Side by Side Diff: extensions/browser/value_store/value_store_change_unittest.cc

Issue 2252373002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_reader.h" 5 #include "base/json/json_reader.h"
6 #include "base/json/json_writer.h" 6 #include "base/json/json_writer.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "extensions/browser/value_store/value_store_change.h" 10 #include "extensions/browser/value_store/value_store_change.h"
11 #include "extensions/common/value_builder.h" 11 #include "extensions/common/value_builder.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 using base::DictionaryValue; 14 using base::DictionaryValue;
15 using base::Value; 15 using base::Value;
16 using extensions::DictionaryBuilder; 16 using extensions::DictionaryBuilder;
17 using extensions::ListBuilder; 17 using extensions::ListBuilder;
18 18
19 namespace { 19 namespace {
20 20
21 TEST(ValueStoreChangeTest, NullOldValue) { 21 TEST(ValueStoreChangeTest, NullOldValue) {
22 ValueStoreChange change("key", nullptr, 22 ValueStoreChange change("key", nullptr,
23 base::WrapUnique(new base::StringValue("value"))); 23 base::MakeUnique<base::StringValue>("value"));
24 24
25 EXPECT_EQ("key", change.key()); 25 EXPECT_EQ("key", change.key());
26 EXPECT_EQ(NULL, change.old_value()); 26 EXPECT_EQ(NULL, change.old_value());
27 { 27 {
28 base::StringValue expected("value"); 28 base::StringValue expected("value");
29 EXPECT_TRUE(change.new_value()->Equals(&expected)); 29 EXPECT_TRUE(change.new_value()->Equals(&expected));
30 } 30 }
31 } 31 }
32 32
33 TEST(ValueStoreChangeTest, NullNewValue) { 33 TEST(ValueStoreChangeTest, NullNewValue) {
34 ValueStoreChange change( 34 ValueStoreChange change("key", base::MakeUnique<base::StringValue>("value"),
35 "key", base::WrapUnique(new base::StringValue("value")), nullptr); 35 nullptr);
36 36
37 EXPECT_EQ("key", change.key()); 37 EXPECT_EQ("key", change.key());
38 { 38 {
39 base::StringValue expected("value"); 39 base::StringValue expected("value");
40 EXPECT_TRUE(change.old_value()->Equals(&expected)); 40 EXPECT_TRUE(change.old_value()->Equals(&expected));
41 } 41 }
42 EXPECT_EQ(NULL, change.new_value()); 42 EXPECT_EQ(NULL, change.new_value());
43 } 43 }
44 44
45 TEST(ValueStoreChangeTest, NonNullValues) { 45 TEST(ValueStoreChangeTest, NonNullValues) {
46 ValueStoreChange change("key", 46 ValueStoreChange change("key",
47 base::WrapUnique(new base::StringValue("old_value")), 47 base::MakeUnique<base::StringValue>("old_value"),
48 base::WrapUnique(new base::StringValue("new_value"))); 48 base::MakeUnique<base::StringValue>("new_value"));
49 49
50 EXPECT_EQ("key", change.key()); 50 EXPECT_EQ("key", change.key());
51 { 51 {
52 base::StringValue expected("old_value"); 52 base::StringValue expected("old_value");
53 EXPECT_TRUE(change.old_value()->Equals(&expected)); 53 EXPECT_TRUE(change.old_value()->Equals(&expected));
54 } 54 }
55 { 55 {
56 base::StringValue expected("new_value"); 56 base::StringValue expected("new_value");
57 EXPECT_TRUE(change.new_value()->Equals(&expected)); 57 EXPECT_TRUE(change.new_value()->Equals(&expected));
58 } 58 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 .Set("key.with.dots", DictionaryBuilder() 91 .Set("key.with.dots", DictionaryBuilder()
92 .Set("oldValue", v3.Build()) 92 .Set("oldValue", v3.Build())
93 .Set("newValue", v4.Build()) 93 .Set("newValue", v4.Build())
94 .Build()) 94 .Build())
95 .Build(); 95 .Build();
96 96
97 EXPECT_TRUE(from_json->Equals(expected_from_json.get())); 97 EXPECT_TRUE(from_json->Equals(expected_from_json.get()));
98 } 98 }
99 99
100 } // namespace 100 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698