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

Unified Diff: trunk/src/gpu/command_buffer/service/shader_manager_unittest.cc

Issue 346573002: Revert 278059 "gpu: Add base class for gpu service tests" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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: trunk/src/gpu/command_buffer/service/shader_manager_unittest.cc
===================================================================
--- trunk/src/gpu/command_buffer/service/shader_manager_unittest.cc (revision 278063)
+++ trunk/src/gpu/command_buffer/service/shader_manager_unittest.cc (working copy)
@@ -5,7 +5,6 @@
#include "gpu/command_buffer/service/shader_manager.h"
#include "base/memory/scoped_ptr.h"
-#include "gpu/command_buffer/service/gpu_service_test.h"
#include "gpu/command_buffer/service/mocks.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_mock.h"
@@ -16,7 +15,7 @@
namespace gpu {
namespace gles2 {
-class ShaderManagerTest : public GpuServiceTest {
+class ShaderManagerTest : public testing::Test {
public:
ShaderManagerTest() {
}
@@ -26,6 +25,18 @@
}
protected:
+ virtual void SetUp() {
+ gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
+ ::gfx::MockGLInterface::SetGLInterface(gl_.get());
+ }
+
+ virtual void TearDown() {
+ ::gfx::MockGLInterface::SetGLInterface(NULL);
+ gl_.reset();
+ }
+
+ // Use StrictMock to make 100% sure we know how GL will be called.
+ scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
ShaderManager manager_;
};

Powered by Google App Engine
This is Rietveld 408576698