| Index: third_party/WebKit/Source/platform/TracedValueTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/TracedValueTest.cpp b/third_party/WebKit/Source/platform/TracedValueTest.cpp
|
| index b2357545156c84e6755ee4c3a21ed7d5de4bd9ed..7a35df6c185d308dea307b24875ecb0c5835bf8c 100644
|
| --- a/third_party/WebKit/Source/platform/TracedValueTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/TracedValueTest.cpp
|
| @@ -7,10 +7,11 @@
|
| #include "base/json/json_reader.h"
|
| #include "base/values.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| -std::unique_ptr<base::Value> parseTracedValue(PassOwnPtr<TracedValue> value)
|
| +std::unique_ptr<base::Value> parseTracedValue(std::unique_ptr<TracedValue> value)
|
| {
|
| base::JSONReader reader;
|
| CString utf8 = value->toString().utf8();
|
| @@ -19,7 +20,7 @@ std::unique_ptr<base::Value> parseTracedValue(PassOwnPtr<TracedValue> value)
|
|
|
| TEST(TracedValueTest, FlatDictionary)
|
| {
|
| - OwnPtr<TracedValue> value = TracedValue::create();
|
| + std::unique_ptr<TracedValue> value = TracedValue::create();
|
| value->setInteger("int", 2014);
|
| value->setDouble("double", 0.0);
|
| value->setBoolean("bool", true);
|
| @@ -41,7 +42,7 @@ TEST(TracedValueTest, FlatDictionary)
|
|
|
| TEST(TracedValueTest, Hierarchy)
|
| {
|
| - OwnPtr<TracedValue> value = TracedValue::create();
|
| + std::unique_ptr<TracedValue> value = TracedValue::create();
|
| value->setInteger("i0", 2014);
|
| value->beginDictionary("dict1");
|
| value->setInteger("i1", 2014);
|
| @@ -102,7 +103,7 @@ TEST(TracedValueTest, Hierarchy)
|
|
|
| TEST(TracedValueTest, Escape)
|
| {
|
| - OwnPtr<TracedValue> value = TracedValue::create();
|
| + std::unique_ptr<TracedValue> value = TracedValue::create();
|
| value->setString("s0", "value0\\");
|
| value->setString("s1", "value\n1");
|
| value->setString("s2", "\"value2\"");
|
|
|