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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 4 years, 8 months 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index 3756eaca0101d1cd50e9c44d3d3b41d1b4e44803..a80e70d543aca708d2bc4b87ec9dabcc278fe2a0 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -8,6 +8,8 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/message_loop/message_loop.h"
#include "gpu/command_buffer/common/gles2_cmd_format.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ -631,11 +633,11 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
static const char* kOutputVariable1NameESSL3;
// 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_;
scoped_refptr<gfx::GLSurfaceStub> surface_;
scoped_refptr<GLContextMock> context_;
- scoped_ptr<MockGLES2Decoder> mock_decoder_;
- scoped_ptr<GLES2Decoder> decoder_;
+ std::unique_ptr<MockGLES2Decoder> mock_decoder_;
+ std::unique_ptr<GLES2Decoder> decoder_;
MemoryTracker* memory_tracker_;
GLuint client_buffer_id_;
@@ -758,7 +760,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
void SetupInitStateManualExpectations(bool es3_capable);
- scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_;
+ std::unique_ptr<::testing::StrictMock<MockCommandBufferEngine>> engine_;
GpuPreferences gpu_preferences_;
scoped_refptr<ContextGroup> group_;
MockGLStates gl_states_;
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698