Index: gpu/config/gpu_driver_bug_list_unittest.cc |
diff --git a/gpu/config/gpu_driver_bug_list_unittest.cc b/gpu/config/gpu_driver_bug_list_unittest.cc |
index e7eaaa510ff3e9cb6835540282a6cd81e6d43097..40b7d905a88839de493a65281b6e7f8744fbd645 100644 |
--- a/gpu/config/gpu_driver_bug_list_unittest.cc |
+++ b/gpu/config/gpu_driver_bug_list_unittest.cc |
@@ -2,13 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "gpu/config/gpu_driver_bug_list.h" |
no sievers
2016/04/05 19:02:42
leave below
Mostyn Bramley-Moore
2016/04/05 21:35:32
Fixed.
|
+ |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/command_line.h" |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
#include "gpu/config/gpu_control_list_jsons.h" |
-#include "gpu/config/gpu_driver_bug_list.h" |
#include "gpu/config/gpu_driver_bug_workaround_type.h" |
#include "gpu/config/gpu_info.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -47,13 +49,13 @@ class GpuDriverBugListTest : public testing::Test { |
}; |
TEST_F(GpuDriverBugListTest, CurrentDriverBugListValidation) { |
- scoped_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
+ std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
std::string json; |
EXPECT_TRUE(list->LoadList(kGpuDriverBugListJson, GpuControlList::kAllOs)); |
} |
TEST_F(GpuDriverBugListTest, CurrentListForARM) { |
- scoped_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
+ std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
EXPECT_TRUE(list->LoadList(kGpuDriverBugListJson, GpuControlList::kAllOs)); |
GPUInfo gpu_info; |
@@ -65,7 +67,7 @@ TEST_F(GpuDriverBugListTest, CurrentListForARM) { |
} |
TEST_F(GpuDriverBugListTest, CurrentListForImagination) { |
- scoped_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
+ std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
EXPECT_TRUE(list->LoadList(kGpuDriverBugListJson, GpuControlList::kAllOs)); |
GPUInfo gpu_info; |
@@ -103,7 +105,7 @@ TEST_F(GpuDriverBugListTest, GpuSwitching) { |
] |
} |
); |
- scoped_ptr<GpuDriverBugList> driver_bug_list(GpuDriverBugList::Create()); |
+ std::unique_ptr<GpuDriverBugList> driver_bug_list(GpuDriverBugList::Create()); |
EXPECT_TRUE(driver_bug_list->LoadList(json, GpuControlList::kAllOs)); |
std::set<int> switching = driver_bug_list->MakeDecision( |
GpuControlList::kOsMacosx, "10.8", gpu_info()); |
@@ -179,7 +181,7 @@ TEST_F(GpuDriverBugListTest, NVIDIANumberingScheme) { |
} |
); |
- scoped_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
+ std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create()); |
EXPECT_TRUE(list->LoadList(json, GpuControlList::kAllOs)); |
GPUInfo gpu_info; |