ui/compositor: move the browser compositor thread to the ContextFactory

content/browser/compositor/software_output_device_ozone_unittest.cc

 // Copyright 2014 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/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/software_frame_data.h"
 #include "content/browser/compositor/software_output_device_ozone.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkSurface.h"
@@ skipping 82 matching lines @@
 SoftwareOutputDeviceOzoneTest::SoftwareOutputDeviceOzoneTest()
     : enable_pixel_output_(false) {
   message_loop_.reset(new base::MessageLoopForUI);
 }
 
 SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {
 }
 
 void SoftwareOutputDeviceOzoneTest::SetUp() {
   ui::InitializeContextFactoryForTests(enable_pixel_output_);
-  ui::Compositor::Initialize();
 
   surface_factory_.reset(new MockSurfaceFactoryOzone());
   gfx::SurfaceFactoryOzone::SetInstance(surface_factory_.get());
 
   const gfx::Size size(500, 400);
   compositor_.reset(new ui::Compositor(
       gfx::SurfaceFactoryOzone::GetInstance()->GetAcceleratedWidget()));
   compositor_->SetScaleAndSize(1.0f, size);
 
   output_device_.reset(new content::SoftwareOutputDeviceOzone(
       compositor_.get()));
   output_device_->Resize(size);
 }
 
 void SoftwareOutputDeviceOzoneTest::TearDown() {
   output_device_.reset();
   compositor_.reset();
   surface_factory_.reset();
   ui::TerminateContextFactoryForTests();
-  ui::Compositor::Terminate();
 }
 
 class SoftwareOutputDeviceOzonePixelTest
     : public SoftwareOutputDeviceOzoneTest {
  protected:
   virtual void SetUp() OVERRIDE;
 };
 
 void SoftwareOutputDeviceOzonePixelTest::SetUp() {
   enable_pixel_output_ = true;
@@ skipping 53 matching lines @@
   const SkPMColor black = SkPreMultiplyColor(SK_ColorBLACK);
   for (int i = 0; i < area.height(); ++i) {
     for (int j = 0; j < area.width(); ++j) {
       if (j < damage.width() && i < damage.height())
         EXPECT_EQ(white, pixels[i * area.width() + j]);
       else
         EXPECT_EQ(black, pixels[i * area.width() + j]);
     }
   }
 }