| Index: ui/compositor/layer_unittest.cc
|
| diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
|
| index 52051c1cb00ee4e8624624cf98569924ef825aed..01b93aa3f5b0c6fe63eab888654ac170031d746e 100644
|
| --- a/ui/compositor/layer_unittest.cc
|
| +++ b/ui/compositor/layer_unittest.cc
|
| @@ -91,7 +91,6 @@ class LayerWithRealCompositorTest : public testing::Test {
|
| virtual void SetUp() OVERRIDE {
|
| bool enable_pixel_output = true;
|
| InitializeContextFactoryForTests(enable_pixel_output);
|
| - Compositor::Initialize();
|
|
|
| const gfx::Rect host_bounds(10, 10, 500, 500);
|
| compositor_host_.reset(TestCompositorHost::Create(host_bounds));
|
| @@ -101,7 +100,6 @@ class LayerWithRealCompositorTest : public testing::Test {
|
| virtual void TearDown() OVERRIDE {
|
| compositor_host_.reset();
|
| TerminateContextFactoryForTests();
|
| - Compositor::Terminate();
|
| }
|
|
|
| Compositor* GetCompositor() { return compositor_host_->GetCompositor(); }
|
| @@ -400,7 +398,6 @@ class LayerWithDelegateTest : public testing::Test {
|
| virtual void SetUp() OVERRIDE {
|
| bool enable_pixel_output = false;
|
| InitializeContextFactoryForTests(enable_pixel_output);
|
| - Compositor::Initialize();
|
|
|
| const gfx::Rect host_bounds(1000, 1000);
|
| compositor_host_.reset(TestCompositorHost::Create(host_bounds));
|
| @@ -410,7 +407,6 @@ class LayerWithDelegateTest : public testing::Test {
|
| virtual void TearDown() OVERRIDE {
|
| compositor_host_.reset();
|
| TerminateContextFactoryForTests();
|
| - Compositor::Terminate();
|
| }
|
|
|
| Compositor* compositor() { return compositor_host_->GetCompositor(); }
|
|
|