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

Side by Side Diff: content/common/common_param_traits_unittest.cc

Issue 2792573002: Remove base::Value::CreateNullValue (Closed)
Patch Set: Rebase Created 3 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
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 "content/public/common/common_param_traits.h" 5 #include "content/public/common/common_param_traits.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ptr_util.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "content/public/common/content_constants.h" 16 #include "content/public/common/content_constants.h"
16 #include "ipc/ipc_message.h" 17 #include "ipc/ipc_message.h"
17 #include "ipc/ipc_message_utils.h" 18 #include "ipc/ipc_message_utils.h"
18 #include "net/base/host_port_pair.h" 19 #include "net/base/host_port_pair.h"
19 #include "printing/backend/print_backend.h" 20 #include "printing/backend/print_backend.h"
20 #include "printing/page_range.h" 21 #include "printing/page_range.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 23 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "ui/gfx/geometry/rect.h" 24 #include "ui/gfx/geometry/rect.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // Make sure we don't read out the bitmap! 78 // Make sure we don't read out the bitmap!
78 SkBitmap bad_output; 79 SkBitmap bad_output;
79 iter = base::PickleIterator(bad_msg); 80 iter = base::PickleIterator(bad_msg);
80 EXPECT_FALSE(IPC::ParamTraits<SkBitmap>::Read(&bad_msg, &iter, &bad_output)); 81 EXPECT_FALSE(IPC::ParamTraits<SkBitmap>::Read(&bad_msg, &iter, &bad_output));
81 } 82 }
82 83
83 TEST(IPCMessageTest, ListValue) { 84 TEST(IPCMessageTest, ListValue) {
84 base::ListValue input; 85 base::ListValue input;
85 input.Set(0, new base::Value(42.42)); 86 input.Set(0, new base::Value(42.42));
86 input.Set(1, new base::Value("forty")); 87 input.Set(1, new base::Value("forty"));
87 input.Set(2, base::Value::CreateNullValue()); 88 input.Set(2, base::MakeUnique<base::Value>());
88 89
89 IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL); 90 IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
90 IPC::WriteParam(&msg, input); 91 IPC::WriteParam(&msg, input);
91 92
92 base::ListValue output; 93 base::ListValue output;
93 base::PickleIterator iter(msg); 94 base::PickleIterator iter(msg);
94 EXPECT_TRUE(IPC::ReadParam(&msg, &iter, &output)); 95 EXPECT_TRUE(IPC::ReadParam(&msg, &iter, &output));
95 96
96 EXPECT_TRUE(input.Equals(&output)); 97 EXPECT_TRUE(input.Equals(&output));
97 98
98 // Also test the corrupt case. 99 // Also test the corrupt case.
99 IPC::Message bad_msg(1, 2, IPC::Message::PRIORITY_NORMAL); 100 IPC::Message bad_msg(1, 2, IPC::Message::PRIORITY_NORMAL);
100 bad_msg.WriteInt(99); 101 bad_msg.WriteInt(99);
101 iter = base::PickleIterator(bad_msg); 102 iter = base::PickleIterator(bad_msg);
102 EXPECT_FALSE(IPC::ReadParam(&bad_msg, &iter, &output)); 103 EXPECT_FALSE(IPC::ReadParam(&bad_msg, &iter, &output));
103 } 104 }
104 105
105 TEST(IPCMessageTest, DictionaryValue) { 106 TEST(IPCMessageTest, DictionaryValue) {
106 base::DictionaryValue input; 107 base::DictionaryValue input;
107 input.Set("null", base::Value::CreateNullValue()); 108 input.Set("null", base::MakeUnique<base::Value>());
108 input.Set("bool", new base::Value(true)); 109 input.Set("bool", new base::Value(true));
109 input.Set("int", new base::Value(42)); 110 input.Set("int", new base::Value(42));
110 111
111 std::unique_ptr<base::DictionaryValue> subdict(new base::DictionaryValue()); 112 std::unique_ptr<base::DictionaryValue> subdict(new base::DictionaryValue());
112 subdict->Set("str", new base::Value("forty two")); 113 subdict->Set("str", new base::Value("forty two"));
113 subdict->Set("bool", new base::Value(false)); 114 subdict->Set("bool", new base::Value(false));
114 115
115 std::unique_ptr<base::ListValue> sublist(new base::ListValue()); 116 std::unique_ptr<base::ListValue> sublist(new base::ListValue());
116 sublist->Set(0, new base::Value(42.42)); 117 sublist->Set(0, new base::Value(42.42));
117 sublist->Set(1, new base::Value("forty")); 118 sublist->Set(1, new base::Value("forty"));
(...skipping 24 matching lines...) Expand all
142 143
143 IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL); 144 IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
144 IPC::ParamTraits<net::HostPortPair>::Write(&msg, input); 145 IPC::ParamTraits<net::HostPortPair>::Write(&msg, input);
145 146
146 net::HostPortPair output; 147 net::HostPortPair output;
147 base::PickleIterator iter(msg); 148 base::PickleIterator iter(msg);
148 EXPECT_TRUE(IPC::ParamTraits<net::HostPortPair>::Read(&msg, &iter, &output)); 149 EXPECT_TRUE(IPC::ParamTraits<net::HostPortPair>::Read(&msg, &iter, &output));
149 EXPECT_EQ(input.host(), output.host()); 150 EXPECT_EQ(input.host(), output.host());
150 EXPECT_EQ(input.port(), output.port()); 151 EXPECT_EQ(input.port(), output.port());
151 } 152 }
OLDNEW
« no previous file with comments | « content/child/v8_value_converter_impl_unittest.cc ('k') | content/renderer/java/gin_java_function_invocation_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698