| Index: gpu/command_buffer/service/program_manager_unittest.cc
|
| diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
|
| index 088342bce3a666931c84e8c200d983ec89df9366..5fcb3dcbb4db4f488c3b9e08ccfd2a7cb09307b1 100644
|
| --- a/gpu/command_buffer/service/program_manager_unittest.cc
|
| +++ b/gpu/command_buffer/service/program_manager_unittest.cc
|
| @@ -8,9 +8,9 @@
|
| #include <stdint.h>
|
|
|
| #include <algorithm>
|
| +#include <memory>
|
|
|
| #include "base/command_line.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "gpu/command_buffer/common/gles2_cmd_format.h"
|
| @@ -86,7 +86,7 @@ class ProgramManagerTestBase : public GpuServiceTest {
|
| GpuServiceTest::TearDown();
|
| }
|
|
|
| - scoped_ptr<ProgramManager> manager_;
|
| + std::unique_ptr<ProgramManager> manager_;
|
| GpuPreferences gpu_preferences_;
|
| scoped_refptr<FeatureInfo> feature_info_;
|
| };
|
| @@ -2118,7 +2118,7 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
|
| .Times(1);
|
| }
|
|
|
| - scoped_ptr<MockProgramCache> cache_;
|
| + std::unique_ptr<MockProgramCache> cache_;
|
|
|
| Shader* vertex_shader_;
|
| Shader* fragment_shader_;
|
|
|