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

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

Issue 22824009: Remove StreamTextureManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 c8505c104936ba1d22264b35125e12000a275fbf..1176f8a8331cf7fd90ebb4e958db0a5d7755ab7e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -16,7 +16,6 @@
#include "gpu/command_buffer/service/query_manager.h"
#include "gpu/command_buffer/service/renderbuffer_manager.h"
#include "gpu/command_buffer/service/shader_manager.h"
-#include "gpu/command_buffer/service/stream_texture_manager_mock.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "gpu/command_buffer/service/texture_manager.h"
#include "gpu/command_buffer/service/vertex_array_manager.h"
@@ -138,11 +137,6 @@ class GLES2DecoderTestBase : public testing::Test {
return group_->program_manager();
}
- ::testing::StrictMock<MockStreamTextureManager>*
- stream_texture_manager() const {
- return stream_texture_manager_.get();
- }
-
void DoCreateProgram(GLuint client_id, GLuint service_id);
void DoCreateShader(GLenum shader_type, GLuint client_id, GLuint service_id);
@@ -535,8 +529,6 @@ class GLES2DecoderTestBase : public testing::Test {
void AddExpectationsForVertexAttribManager();
scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_;
- scoped_ptr< ::testing::StrictMock<MockStreamTextureManager> >
- stream_texture_manager_;
scoped_refptr<ContextGroup> group_;
};

Powered by Google App Engine
This is Rietveld 408576698