ui: No more TestCompositor. Use NullDraw contexts in unit tests.

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 69 matching lines @@
     if (PathService::Get(gfx::DIR_TEST_DATA, &test_data_directory_)) {
       test_data_directory_ = test_data_directory_.AppendASCII("compositor");
     } else {
       LOG(ERROR) << "Could not open test data directory.";
     }
   }
   virtual ~LayerWithRealCompositorTest() {}
 
   // Overridden from testing::Test:
   virtual void SetUp() OVERRIDE {
-    bool allow_test_contexts = false;
-    InitializeContextFactoryForTests(allow_test_contexts);
+    bool enable_pixel_output = true;
+    InitializeContextFactoryForTests(enable_pixel_output);
     Compositor::Initialize();
 
     const gfx::Rect host_bounds(10, 10, 500, 500);
     window_.reset(TestCompositorHost::Create(host_bounds));
     window_->Show();
   }
 
   virtual void TearDown() OVERRIDE {
     window_.reset();
     TerminateContextFactoryForTests();
@@ skipping 245 matching lines @@
   DrawTree(l1.get());
 }
 
 class LayerWithDelegateTest : public testing::Test {
  public:
   LayerWithDelegateTest() {}
   virtual ~LayerWithDelegateTest() {}
 
   // Overridden from testing::Test:
   virtual void SetUp() OVERRIDE {
-    bool allow_test_contexts = true;
-    InitializeContextFactoryForTests(allow_test_contexts);
+    bool enable_pixel_output = false;
+    InitializeContextFactoryForTests(enable_pixel_output);
     Compositor::Initialize();
-    compositor_.reset(new Compositor(gfx::kNullAcceleratedWidget));
-    compositor_->SetScaleAndSize(1.0f, gfx::Size(1000, 1000));
+
+    const gfx::Rect host_bounds(1000, 1000);
+    window_.reset(TestCompositorHost::Create(host_bounds));

[piman, 2014/01/29 01:40:17]

nit: s/window_/compositor_host_/ ?

[danakj, 2014/01/29 20:19:00]

Done.

+    window_->Show();
   }
 
   virtual void TearDown() OVERRIDE {
-    compositor_.reset();
+    window_.reset();
     TerminateContextFactoryForTests();
     Compositor::Terminate();
   }
 
-  Compositor* compositor() { return compositor_.get(); }
+  Compositor* compositor() { return window_->GetCompositor(); }
 
   virtual Layer* CreateLayer(LayerType type) {
     return new Layer(type);
   }
 
   Layer* CreateColorLayer(SkColor color, const gfx::Rect& bounds) {
     Layer* layer = new ColoredLayer(color);
     layer->SetBounds(bounds);
     return layer;
   }
@@ skipping 23 matching lines @@
 
   void WaitForDraw() {
     DrawWaiterForTest::Wait(compositor());
   }
 
   void WaitForCommit() {
     DrawWaiterForTest::WaitForCommit(compositor());
   }
 
  private:
-  scoped_ptr<Compositor> compositor_;
+  scoped_ptr<TestCompositorHost> window_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerWithDelegateTest);
 };
 
 // L1
 //  +-- L2
 TEST_F(LayerWithDelegateTest, ConvertPointToLayer_Simple) {
   scoped_ptr<Layer> l1(CreateColorLayer(SK_ColorRED,
                                         gfx::Rect(20, 20, 400, 400)));
   scoped_ptr<Layer> l2(CreateColorLayer(SK_ColorBLUE,
@@ skipping 1040 matching lines @@
   l1->SetOpacity(0.5f);
 
   // Change l1's cc::Layer.
   l1->SwitchCCLayerForTest();
 
   // Ensure that the opacity animation completed.
   EXPECT_FLOAT_EQ(l1->opacity(), 0.5f);
 }
 
 }  // namespace ui