| Index: gpu/config/gpu_info_collector_unittest.cc
|
| diff --git a/gpu/config/gpu_info_collector_unittest.cc b/gpu/config/gpu_info_collector_unittest.cc
|
| index 3e35d00d2369cd8361ea5d7deebbd4f88daae149..3e698d4ce5b4a3a1a4f9d23331017004bb65f70b 100644
|
| --- a/gpu/config/gpu_info_collector_unittest.cc
|
| +++ b/gpu/config/gpu_info_collector_unittest.cc
|
| @@ -5,7 +5,8 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/strings/string_split.h"
|
| #include "gpu/config/gpu_info.h"
|
| #include "gpu/config/gpu_info_collector.h"
|
| @@ -173,7 +174,7 @@ class GPUInfoCollectorTest
|
|
|
| public:
|
| // Use StrictMock to make 100% sure we know how GL will be called.
|
| - scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
|
| + std::unique_ptr<::testing::StrictMock<::gfx::MockGLInterface>> gl_;
|
| GPUInfo test_values_;
|
| const char* gl_shading_language_version_ = nullptr;
|
|
|
|
|