Chromium Code Reviews| Index: gpu/command_buffer/service/vertex_array_manager_unittest.cc |
| diff --git a/gpu/command_buffer/service/vertex_array_manager_unittest.cc b/gpu/command_buffer/service/vertex_array_manager_unittest.cc |
| index 73f9bc7e20705332db503a1817cd4e573b406bef..20135155254098ffc7d18178d37c58068adc1d8a 100644 |
| --- a/gpu/command_buffer/service/vertex_array_manager_unittest.cc |
| +++ b/gpu/command_buffer/service/vertex_array_manager_unittest.cc |
| @@ -2,15 +2,16 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| +#include "gpu/command_buffer/service/vertex_array_manager.h" |
|
no sievers
2016/04/05 19:02:41
This should stay below.
Looks like the formatting
Mostyn Bramley-Moore
2016/04/05 21:35:32
Fixed.
|
| + |
| #include <stdint.h> |
| -#include "gpu/command_buffer/service/vertex_array_manager.h" |
| -#include "gpu/command_buffer/service/vertex_attrib_manager.h" |
| +#include <memory> |
| -#include "base/memory/scoped_ptr.h" |
| #include "gpu/command_buffer/service/feature_info.h" |
| #include "gpu/command_buffer/service/gpu_service_test.h" |
| #include "gpu/command_buffer/service/test_helper.h" |
| +#include "gpu/command_buffer/service/vertex_attrib_manager.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "ui/gl/gl_mock.h" |
| @@ -40,7 +41,7 @@ class VertexArrayManagerTest : public GpuServiceTest { |
| GpuServiceTest::TearDown(); |
| } |
| - scoped_ptr<VertexArrayManager> manager_; |
| + std::unique_ptr<VertexArrayManager> manager_; |
| }; |
| // GCC requires these declarations, but MSVC requires they not be present |