Merge Compositor and CompositorCC

ui/gfx/compositor/test/test_compositor_host_mac.mm

 // 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"
 
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSOpenGL.h>
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>
@@ skipping 108 matching lines @@
   DCHECK(!window_);
   window_ = [[NSWindow alloc]
                 initWithContentRect:NSMakeRect(bounds_.x(),
                                                bounds_.y(),
                                                bounds_.width(),
                                                bounds_.height())
                           styleMask:NSBorderlessWindowMask
                             backing:NSBackingStoreBuffered
                               defer:NO];
   scoped_nsobject<AcceleratedTestView> view([[AcceleratedTestView alloc] init]);
-  compositor_ = ui::Compositor::Create(this, view, bounds_.size());
+  compositor_ = new ui::Compositor(this, view, bounds_.size());
   [view setCompositor:compositor_];
   [window_ setContentView:view];
   [window_ orderFront:nil];
 }
 
 ui::Compositor* TestCompositorHostMac::GetCompositor() {
   return compositor_;
 }
 
 void TestCompositorHostMac::ScheduleDraw() {
   if (!compositor_)
     return;
 
   // Force display now.
   [window_ display];
 }
 
 // static
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostMac(bounds);
 }
 
 }  // namespace ui