diff --git a/gpu/command_buffer/client/client_test_helper.h b/gpu/command_buffer/client/client_test_helper.h index f54a44f2e5da78..c415315a22cd56 100644 --- a/gpu/command_buffer/client/client_test_helper.h +++ b/gpu/command_buffer/client/client_test_helper.h @@ -87,7 +87,7 @@ class MockClientCommandBuffer : public CommandBuffer, class MockClientCommandBufferMockFlush : public MockClientCommandBuffer { public: MockClientCommandBufferMockFlush(); - virtual ~MockClientCommandBufferMockFlush(); + ~MockClientCommandBufferMockFlush() override; MOCK_METHOD1(Flush, void(int32_t put_offset)); MOCK_METHOD1(OrderingBarrier, void(int32_t put_offset)); @@ -99,7 +99,7 @@ class MockClientCommandBufferMockFlush : public MockClientCommandBuffer { class MockClientGpuControl : public GpuControl { public: MockClientGpuControl(); - virtual ~MockClientGpuControl(); + ~MockClientGpuControl() override; MOCK_METHOD1(SetGpuControlClient, void(GpuControlClient*)); MOCK_CONST_METHOD0(GetCapabilities, const Capabilities&()); diff --git a/gpu/command_buffer/client/cmd_buffer_helper_test.cc b/gpu/command_buffer/client/cmd_buffer_helper_test.cc index 3a76b384204620..bc100f65936955 100644 --- a/gpu/command_buffer/client/cmd_buffer_helper_test.cc +++ b/gpu/command_buffer/client/cmd_buffer_helper_test.cc @@ -41,7 +41,7 @@ const int32_t kUnusedCommandId = 5; // we use 0 and 2 currently. // interface (calling it directly, not through the RPC mechanism). class CommandBufferHelperTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { transfer_buffer_manager_ = std::make_unique(nullptr); command_buffer_.reset( new CommandBufferDirectLocked(transfer_buffer_manager_.get())); @@ -59,7 +59,7 @@ class CommandBufferHelperTest : public testing::Test { test_command_next_id_ = kUnusedCommandId; } - virtual void TearDown() { + void TearDown() override { // If the CommandExecutor posts any tasks, this forces them to run. base::RunLoop().RunUntilIdle(); test_command_args_.clear(); diff --git a/gpu/command_buffer/client/transfer_buffer_unittest.cc b/gpu/command_buffer/client/transfer_buffer_unittest.cc index c247a713917a62..0a08b07643f650 100644 --- a/gpu/command_buffer/client/transfer_buffer_unittest.cc +++ b/gpu/command_buffer/client/transfer_buffer_unittest.cc @@ -257,7 +257,7 @@ TEST_F(TransferBufferTest, Flush) { class MockClientCommandBufferCanFail : public MockClientCommandBufferMockFlush { public: MockClientCommandBufferCanFail() = default; - virtual ~MockClientCommandBufferCanFail() = default; + ~MockClientCommandBufferCanFail() override = default; MOCK_METHOD2(CreateTransferBuffer, scoped_refptr(size_t size, int32_t* id)); diff --git a/gpu/command_buffer/service/error_state_mock.h b/gpu/command_buffer/service/error_state_mock.h index cdfbf92ac337ce..7bd5c2833a728c 100644 --- a/gpu/command_buffer/service/error_state_mock.h +++ b/gpu/command_buffer/service/error_state_mock.h @@ -19,7 +19,7 @@ namespace gles2 { class MockErrorState : public ErrorState { public: MockErrorState(); - virtual ~MockErrorState(); + ~MockErrorState() override; MOCK_METHOD0(GetGLError, uint32_t()); MOCK_METHOD5(SetGLError, void( diff --git a/gpu/command_buffer/service/gl_context_mock.h b/gpu/command_buffer/service/gl_context_mock.h index 1a63ad32d65c91..6e2b138ab3ec92 100644 --- a/gpu/command_buffer/service/gl_context_mock.h +++ b/gpu/command_buffer/service/gl_context_mock.h @@ -17,7 +17,7 @@ class GLContextMock : public gl::GLContextStub { MOCK_METHOD1(MakeCurrent, bool(gl::GLSurface* surface)); protected: - virtual ~GLContextMock(); + ~GLContextMock() override; }; } // namespace gpu diff --git a/gpu/command_buffer/service/gl_surface_mock.h b/gpu/command_buffer/service/gl_surface_mock.h index cf77025ee85237..948bc59eb749c0 100644 --- a/gpu/command_buffer/service/gl_surface_mock.h +++ b/gpu/command_buffer/service/gl_surface_mock.h @@ -45,7 +45,7 @@ class GLSurfaceMock : public gl::GLSurface { MOCK_METHOD0(GetFormat, gl::GLSurfaceFormat()); protected: - virtual ~GLSurfaceMock(); + ~GLSurfaceMock() override; private: DISALLOW_COPY_AND_ASSIGN(GLSurfaceMock); diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h index 7c6c2b0e0f4180..21366933edf659 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h @@ -39,7 +39,7 @@ class MockGLES2Decoder : public GLES2Decoder { public: MockGLES2Decoder(CommandBufferServiceBase* command_buffer_service, Outputter* outputter); - virtual ~MockGLES2Decoder(); + ~MockGLES2Decoder() override; base::WeakPtr AsWeakPtr() override; diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc index 4c31c047684b34..61f6154295f43b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -1086,8 +1086,7 @@ class SizeOnlyMemoryTracker : public MemoryTracker { // Ensure a certain amount of GPU memory is free. Returns true on success. MOCK_METHOD1(EnsureGPUMemoryAvailable, bool(size_t size_needed)); - virtual void TrackMemoryAllocatedChange(size_t old_size, - size_t new_size) { + void TrackMemoryAllocatedChange(size_t old_size, size_t new_size) override { pool_info_.size += new_size - old_size; } @@ -1100,7 +1099,7 @@ class SizeOnlyMemoryTracker : public MemoryTracker { uint64_t ShareGroupTracingGUID() const override { return 0; } private: - virtual ~SizeOnlyMemoryTracker() = default; + ~SizeOnlyMemoryTracker() override = default; struct PoolInfo { PoolInfo() : initial_size(0), size(0) {} size_t initial_size; diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc index 9aa5db650a6e95..b54f557c135ede 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc @@ -3679,7 +3679,7 @@ class MockGLImage : public gl::GLImage { const std::string&)); protected: - virtual ~MockGLImage() = default; + ~MockGLImage() override = default; }; TEST_P(GLES2DecoderWithShaderTest, CopyTexImage) { diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h index 28d0f48c94faa4..7899ce08fdee68 100644 --- a/gpu/command_buffer/service/mocks.h +++ b/gpu/command_buffer/service/mocks.h @@ -32,7 +32,7 @@ class AsyncAPIMock : public AsyncAPIInterface { public: explicit AsyncAPIMock(bool default_do_commands, CommandBufferServiceBase* command_buffer_service); - virtual ~AsyncAPIMock(); + ~AsyncAPIMock() override; error::Error FakeDoCommands(unsigned int num_commands, const volatile void* buffer, @@ -119,7 +119,7 @@ class MockShaderTranslator : public ShaderTranslatorInterface { class MockProgramCache : public ProgramCache { public: MockProgramCache(); - virtual ~MockProgramCache(); + ~MockProgramCache() override; MOCK_METHOD7(LoadLinkedProgram, ProgramLoadResult( @@ -160,7 +160,7 @@ class MockMemoryTracker : public MemoryTracker { private: friend class ::testing::StrictMock; friend class base::RefCounted< ::testing::StrictMock >; - virtual ~MockMemoryTracker(); + ~MockMemoryTracker() override; }; } // namespace gles2 diff --git a/gpu/command_buffer/service/raster_decoder_unittest.cc b/gpu/command_buffer/service/raster_decoder_unittest.cc index 725d5aace25122..fd1392d0c92845 100644 --- a/gpu/command_buffer/service/raster_decoder_unittest.cc +++ b/gpu/command_buffer/service/raster_decoder_unittest.cc @@ -46,7 +46,7 @@ class MockMemoryTracker : public gles2::MemoryTracker { uint64_t ShareGroupTracingGUID() const override { return 0; } private: - virtual ~MockMemoryTracker() = default; + ~MockMemoryTracker() override = default; }; } // namespace