| Index: gpu/config/gpu_control_list.cc
|
| diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
|
| index 09f6d1e6b791b930650c4c8d029fa7aa2c293feb..9ff8a4d24c63e0a05faa47190775e2be4ea4c00f 100644
|
| --- a/gpu/config/gpu_control_list.cc
|
| +++ b/gpu/config/gpu_control_list.cc
|
| @@ -1363,7 +1363,7 @@ GpuControlList::~GpuControlList() {
|
| bool GpuControlList::LoadList(
|
| const std::string& json_context,
|
| GpuControlList::OsFilter os_filter) {
|
| - scoped_ptr<base::Value> root = base::JSONReader::Read(json_context);
|
| + std::unique_ptr<base::Value> root = base::JSONReader::Read(json_context);
|
| if (root.get() == NULL || !root->IsType(base::Value::TYPE_DICTIONARY))
|
| return false;
|
|
|
|
|