Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Side by Side Diff: gpu/command_buffer/service/vertex_array_manager_unittest.cc

Issue 682743002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/vertex_array_manager.h" 5 #include "gpu/command_buffer/service/vertex_array_manager.h"
6 #include "gpu/command_buffer/service/vertex_attrib_manager.h" 6 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "gpu/command_buffer/service/feature_info.h" 9 #include "gpu/command_buffer/service/feature_info.h"
10 #include "gpu/command_buffer/service/gpu_service_test.h" 10 #include "gpu/command_buffer/service/gpu_service_test.h"
11 #include "gpu/command_buffer/service/test_helper.h" 11 #include "gpu/command_buffer/service/test_helper.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "ui/gl/gl_mock.h" 13 #include "ui/gl/gl_mock.h"
14 14
15 using ::testing::Pointee; 15 using ::testing::Pointee;
16 using ::testing::_; 16 using ::testing::_;
17 17
18 namespace gpu { 18 namespace gpu {
19 namespace gles2 { 19 namespace gles2 {
20 20
21 class VertexArrayManagerTest : public GpuServiceTest { 21 class VertexArrayManagerTest : public GpuServiceTest {
22 public: 22 public:
23 static const uint32 kNumVertexAttribs = 8; 23 static const uint32 kNumVertexAttribs = 8;
24 24
25 VertexArrayManagerTest() { 25 VertexArrayManagerTest() {
26 } 26 }
27 27
28 virtual ~VertexArrayManagerTest() { 28 ~VertexArrayManagerTest() override {}
29 }
30 29
31 protected: 30 protected:
32 virtual void SetUp() { 31 void SetUp() override {
33 GpuServiceTest::SetUp(); 32 GpuServiceTest::SetUp();
34 manager_.reset(new VertexArrayManager()); 33 manager_.reset(new VertexArrayManager());
35 } 34 }
36 35
37 virtual void TearDown() { 36 void TearDown() override {
38 manager_.reset(); 37 manager_.reset();
39 GpuServiceTest::TearDown(); 38 GpuServiceTest::TearDown();
40 } 39 }
41 40
42 scoped_ptr<VertexArrayManager> manager_; 41 scoped_ptr<VertexArrayManager> manager_;
43 }; 42 };
44 43
45 // GCC requires these declarations, but MSVC requires they not be present 44 // GCC requires these declarations, but MSVC requires they not be present
46 #ifndef COMPILER_MSVC 45 #ifndef COMPILER_MSVC
47 const uint32 VertexArrayManagerTest::kNumVertexAttribs; 46 const uint32 VertexArrayManagerTest::kNumVertexAttribs;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 manager.Destroy(true); 90 manager.Destroy(true);
92 // Check that resources got freed. 91 // Check that resources got freed.
93 info1 = manager.GetVertexAttribManager(kClient1Id); 92 info1 = manager.GetVertexAttribManager(kClient1Id);
94 ASSERT_TRUE(info1 == NULL); 93 ASSERT_TRUE(info1 == NULL);
95 } 94 }
96 95
97 } // namespace gles2 96 } // namespace gles2
98 } // namespace gpu 97 } // namespace gpu
99 98
100 99
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698