Index: content/browser/compositor/reflector_impl_unittest.cc |
diff --git a/content/browser/compositor/reflector_impl_unittest.cc b/content/browser/compositor/reflector_impl_unittest.cc |
index 2ae28a6b79bd14f0f913dab18c6f0fb7d263a832..7483ae6f1443e69b407fa46946834028415693cd 100644 |
--- a/content/browser/compositor/reflector_impl_unittest.cc |
+++ b/content/browser/compositor/reflector_impl_unittest.cc |
@@ -94,18 +94,10 @@ |
mirroring_layer_.reset(new ui::Layer()); |
gfx::Size size = output_surface_->SurfaceSize(); |
mirroring_layer_->SetBounds(gfx::Rect(size.width(), size.height())); |
- } |
- void SetUpReflector(bool threaded) { |
int32 surface_id = 1; |
- |
- if (threaded) { |
- reflector_ = new ReflectorImpl(compositor_.get(), mirroring_layer_.get(), |
- &surface_map_, proxy_.get(), surface_id); |
- } else { |
- reflector_ = new ReflectorImpl(compositor_.get(), mirroring_layer_.get(), |
- &surface_map_, NULL, surface_id); |
- } |
+ reflector_ = new ReflectorImpl(compositor_.get(), mirroring_layer_.get(), |
+ &surface_map_, proxy_.get(), surface_id); |
} |
void TearDown() override { |
@@ -141,8 +133,6 @@ |
namespace { |
TEST_F(ReflectorImplTest, CheckNormalOutputSurface) { |
- bool threaded = true; |
- SetUpReflector(threaded); |
output_surface_->SetFlip(false); |
Init(); |
UpdateTexture(); |
@@ -154,31 +144,6 @@ |
} |
TEST_F(ReflectorImplTest, CheckInvertedOutputSurface) { |
- bool threaded = true; |
- SetUpReflector(threaded); |
- output_surface_->SetFlip(true); |
- Init(); |
- UpdateTexture(); |
- EXPECT_FALSE(mirroring_layer_->TextureFlipped()); |
- EXPECT_EQ(SkRegion(kSkSubRect), mirroring_layer_->damaged_region()); |
-} |
- |
-TEST_F(ReflectorImplTest, CheckNormalOutputSurface_SingleThread) { |
- bool threaded = false; |
- SetUpReflector(threaded); |
- output_surface_->SetFlip(false); |
- Init(); |
- UpdateTexture(); |
- EXPECT_TRUE(mirroring_layer_->TextureFlipped()); |
- EXPECT_EQ(SkRegion(SkIRect::MakeXYWH( |
- 0, output_surface_->SurfaceSize().height() - kSubRect.height(), |
- kSubRect.width(), kSubRect.height())), |
- mirroring_layer_->damaged_region()); |
-} |
- |
-TEST_F(ReflectorImplTest, CheckInvertedOutputSurface_SingleThread) { |
- bool threaded = false; |
- SetUpReflector(threaded); |
output_surface_->SetFlip(true); |
Init(); |
UpdateTexture(); |