Merge Compositor and CompositorCC

ui/gfx/compositor/test/test_compositor_host_win.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/compiler_specific.h"
 #include "ui/base/win/window_impl.h"
 #include "ui/gfx/compositor/compositor.h"
 
 namespace ui {
 
 class TestCompositorHostWin : public TestCompositorHost,
                               public WindowImpl,
                               public CompositorDelegate {
  public:
   TestCompositorHostWin(const gfx::Rect& bounds) {
     Init(NULL, bounds);
-    compositor_ = ui::Compositor::Create(this, hwnd(), GetSize());
+    compositor_ = new ui::Compositor(this, hwnd(), GetSize());
   }
 
   virtual ~TestCompositorHostWin() {
     DestroyWindow(hwnd());
   }
 
   // Overridden from MessageLoop::Dispatcher:
   virtual bool Dispatch(const MSG& msg) {
     TranslateMessage(&msg);
     DispatchMessage(&msg);
@@ skipping 34 matching lines @@
   scoped_refptr<ui::Compositor> compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(TestCompositorHostWin);
 };
 
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostWin(bounds);
 }
 
 }  // namespace ui