Index: gpu/command_buffer/service/feature_info_unittest.cc |
diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc |
index 81ecfe29bf2f3cddf5a2ab98d510055f1431994d..be3e38a6715b75c6f32b8d699ff555566562458b 100644 |
--- a/gpu/command_buffer/service/feature_info_unittest.cc |
+++ b/gpu/command_buffer/service/feature_info_unittest.cc |
@@ -7,6 +7,7 @@ |
#include "base/command_line.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/strings/string_number_conversions.h" |
+#include "gpu/command_buffer/service/gpu_service_test.h" |
#include "gpu/command_buffer/service/gpu_switches.h" |
#include "gpu/command_buffer/service/test_helper.h" |
#include "gpu/command_buffer/service/texture_manager.h" |
@@ -15,7 +16,6 @@ |
#include "ui/gl/gl_implementation.h" |
#include "ui/gl/gl_mock.h" |
-using ::gfx::MockGLInterface; |
using ::testing::_; |
using ::testing::DoAll; |
using ::testing::HasSubstr; |
@@ -27,7 +27,6 @@ using ::testing::Return; |
using ::testing::SetArrayArgument; |
using ::testing::SetArgumentPointee; |
using ::testing::StrEq; |
-using ::testing::StrictMock; |
namespace gpu { |
namespace gles2 { |
@@ -36,7 +35,7 @@ namespace { |
const char kGLRendererStringANGLE[] = "ANGLE (some renderer)"; |
} // anonymous namespace |
-class FeatureInfoTest : public testing::Test { |
+class FeatureInfoTest : public GpuServiceTest { |
public: |
FeatureInfoTest() { |
} |
@@ -70,18 +69,11 @@ class FeatureInfoTest : public testing::Test { |
} |
protected: |
- virtual void SetUp() { |
- gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>()); |
- ::gfx::MockGLInterface::SetGLInterface(gl_.get()); |
- } |
- |
virtual void TearDown() { |
info_ = NULL; |
- ::gfx::MockGLInterface::SetGLInterface(NULL); |
- gl_.reset(); |
+ GpuServiceTest::TearDown(); |
} |
- scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_; |
scoped_refptr<FeatureInfo> info_; |
}; |