| Index: gpu/config/gpu_blacklist_unittest.cc
|
| diff --git a/gpu/config/gpu_blacklist_unittest.cc b/gpu/config/gpu_blacklist_unittest.cc
|
| index 1c7211e6d01f09d9580921198fcc54bd7695fbdf..b5e27e711fab77b245394f849d616449c7cc31d7 100644
|
| --- a/gpu/config/gpu_blacklist_unittest.cc
|
| +++ b/gpu/config/gpu_blacklist_unittest.cc
|
| @@ -2,8 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "gpu/config/gpu_blacklist.h"
|
| +
|
| +#include <memory>
|
| +
|
| #include "gpu/config/gpu_control_list_jsons.h"
|
| #include "gpu/config/gpu_feature_type.h"
|
| #include "gpu/config/gpu_info.h"
|
| @@ -46,7 +48,7 @@ class GpuBlacklistTest : public testing::Test {
|
| " ]\n"
|
| "}";
|
|
|
| - scoped_ptr<GpuBlacklist> blacklist(GpuBlacklist::Create());
|
| + std::unique_ptr<GpuBlacklist> blacklist(GpuBlacklist::Create());
|
| EXPECT_TRUE(blacklist->LoadList(json, GpuBlacklist::kAllOs));
|
| std::set<int> type = blacklist->MakeDecision(
|
| GpuBlacklist::kOsMacosx, kOsVersion, gpu_info());
|
| @@ -74,7 +76,7 @@ class GpuBlacklistTest : public testing::Test {
|
| };
|
|
|
| TEST_F(GpuBlacklistTest, CurrentBlacklistValidation) {
|
| - scoped_ptr<GpuBlacklist> blacklist(GpuBlacklist::Create());
|
| + std::unique_ptr<GpuBlacklist> blacklist(GpuBlacklist::Create());
|
| EXPECT_TRUE(blacklist->LoadList(
|
| kSoftwareRenderingListJson, GpuBlacklist::kAllOs));
|
| }
|
|
|