Merge Compositor and CompositorCC

ui/gfx/compositor/test/test_compositor_host_linux.cc

 // Copyright (c) 2011 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 "ui/gfx/compositor/test/test_compositor_host.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 62 matching lines @@
       CopyFromParent,  // visual
       CWEventMask | CWOverrideRedirect, &swa);
   XMapWindow(display, window_);
 
   while (1) {
     XEvent event;
     XNextEvent(display, &event);
     if (event.type == MapNotify && event.xmap.window == window_)
       break;
   }
-  compositor_ = ui::Compositor::Create(this, window_, bounds_.size());
+  compositor_ = new ui::Compositor(this, window_, bounds_.size());
 }
 
 ui::Compositor* TestCompositorHostLinux::GetCompositor() {
   return compositor_;
 }
 
 void TestCompositorHostLinux::ScheduleDraw() {
   if (compositor_)
     compositor_->Draw(false);
 }
 
 #if defined(USE_AURA)
 base::MessagePumpDispatcher::DispatchStatus TestCompositorHostLinux::Dispatch(
     XEvent* xev) {
   return MessagePumpDispatcher::EVENT_IGNORED;
 }
 #elif defined(TOOLKIT_USES_GTK)
 bool TestCompositorHostLinux::Dispatch(GdkEvent*) {
   return false;
 }
 #endif
 
 // static
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostLinux(bounds);
 }
 
 }  // namespace ui