summaryrefslogtreecommitdiff
path: root/chromium/ipc/ipc_message_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-12 14:07:37 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-17 10:29:26 +0000
commitec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch)
tree25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/ipc/ipc_message_unittest.cc
parentbb09965444b5bb20b096a291445170876225268d (diff)
downloadqtwebengine-chromium-ec02ee4181c49b61fce1c8fb99292dbb8139cc90.tar.gz
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ipc/ipc_message_unittest.cc')
-rw-r--r--chromium/ipc/ipc_message_unittest.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/ipc/ipc_message_unittest.cc b/chromium/ipc/ipc_message_unittest.cc
index bde96a13e72..1bf52d8f9d2 100644
--- a/chromium/ipc/ipc_message_unittest.cc
+++ b/chromium/ipc/ipc_message_unittest.cc
@@ -11,6 +11,7 @@
#include <limits>
#include <memory>
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -66,8 +67,8 @@ TEST(IPCMessageTest, BasicMessageTest) {
TEST(IPCMessageTest, ListValue) {
base::ListValue input;
input.Set(0, new base::Value(42.42));
- input.Set(1, new base::StringValue("forty"));
- input.Set(2, base::Value::CreateNullValue());
+ input.Set(1, new base::Value("forty"));
+ input.Set(2, base::MakeUnique<base::Value>());
IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
IPC::WriteParam(&msg, input);
@@ -87,19 +88,19 @@ TEST(IPCMessageTest, ListValue) {
TEST(IPCMessageTest, DictionaryValue) {
base::DictionaryValue input;
- input.Set("null", base::Value::CreateNullValue());
+ input.Set("null", base::MakeUnique<base::Value>());
input.Set("bool", new base::Value(true));
input.Set("int", new base::Value(42));
input.SetWithoutPathExpansion("int.with.dot", new base::Value(43));
std::unique_ptr<base::DictionaryValue> subdict(new base::DictionaryValue());
- subdict->Set("str", new base::StringValue("forty two"));
+ subdict->Set("str", new base::Value("forty two"));
subdict->Set("bool", new base::Value(false));
std::unique_ptr<base::ListValue> sublist(new base::ListValue());
sublist->Set(0, new base::Value(42.42));
- sublist->Set(1, new base::StringValue("forty"));
- sublist->Set(2, new base::StringValue("two"));
+ sublist->Set(1, new base::Value("forty"));
+ sublist->Set(2, new base::Value("two"));
subdict->Set("list", sublist.release());
input.Set("dict", subdict.release());