| Index: ash/display/json_converter_unittest.cc
|
| diff --git a/ash/display/json_converter_unittest.cc b/ash/display/json_converter_unittest.cc
|
| index 1d14ef1a0aea2f740c00e046116f1d4a4521ea49..df0bb21ec15e5980317ddff7deca2be5a1803caf 100644
|
| --- a/ash/display/json_converter_unittest.cc
|
| +++ b/ash/display/json_converter_unittest.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/display/json_converter.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/json/json_reader.h"
|
| #include "base/values.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -49,7 +51,7 @@ TEST(JsonConverterTest, JsonFromToDisplayLayout) {
|
| "}";
|
| int error_code = 0, error_line, error_column;
|
| std::string error_msg;
|
| - scoped_ptr<base::Value> read_value(base::JSONReader::ReadAndReturnError(
|
| + std::unique_ptr<base::Value> read_value(base::JSONReader::ReadAndReturnError(
|
| data, 0, &error_code, &error_msg, &error_line, &error_column));
|
| ASSERT_EQ(0, error_code) << error_msg << " at " << error_line << ":"
|
| << error_column;
|
| @@ -74,7 +76,7 @@ TEST(JsonConverterTest, OldJsonToDisplayLayout) {
|
| "}";
|
| int error_code = 0, error_line, error_column;
|
| std::string error_msg;
|
| - scoped_ptr<base::Value> read_value(base::JSONReader::ReadAndReturnError(
|
| + std::unique_ptr<base::Value> read_value(base::JSONReader::ReadAndReturnError(
|
| data, 0, &error_code, &error_msg, &error_line, &error_column));
|
| ASSERT_EQ(0, error_code) << error_msg << " at " << error_line << ":"
|
| << error_column;
|
|
|