diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/tests/gtest/TestAsyncPanZoomController.cpp index 0f2710e0b150..a1ddbb2d7d85 100644 --- a/gfx/tests/gtest/TestAsyncPanZoomController.cpp +++ b/gfx/tests/gtest/TestAsyncPanZoomController.cpp @@ -29,14 +29,6 @@ using ::testing::InSequence; class Task; -class AsyncPanZoomControllerTester : public ::testing::Test { -protected: - virtual void SetUp() { - gfxPrefs::GetSingleton(); - AsyncPanZoomController::SetThreadAssertionsEnabled(false); - } -}; - class APZCTreeManagerTester : public ::testing::Test { protected: virtual void SetUp() { @@ -181,7 +173,7 @@ TestFrameMetrics() return fm; } -class APZCBasicTester : public AsyncPanZoomControllerTester { +class APZCBasicTester : public ::testing::Test { public: APZCBasicTester(AsyncPanZoomController::GestureBehavior aGestureBehavior = AsyncPanZoomController::DEFAULT_GESTURES) : mGestureBehavior(aGestureBehavior) @@ -191,6 +183,9 @@ public: protected: virtual void SetUp() { + gfxPrefs::GetSingleton(); + AsyncPanZoomController::SetThreadAssertionsEnabled(false); + testStartTime = TimeStamp::Now(); AsyncPanZoomController::SetFrameTime(testStartTime); @@ -577,13 +572,6 @@ public: } }; -TEST_F(AsyncPanZoomControllerTester, Constructor) { - // RefCounted class can't live in the stack - nsRefPtr mcc = new NiceMock(); - nsRefPtr apzc = new TestAsyncPanZoomController(0, mcc); - apzc->SetFrameMetrics(TestFrameMetrics()); -} - TEST_F(APZCPinchTester, Pinch_DefaultGestures_NoTouchAction) { DoPinchTest(true); }