Merge Compositor and CompositorCC

ui/gfx/compositor/test/test_suite.cc

Index: ui/gfx/compositor/test/test_suite.cc
diff --git a/ui/gfx/compositor/test/test_suite.cc b/ui/gfx/compositor/test/test_suite.cc
index 0072fe4e353a90a99c0a7882dd1f7f9ea5328652..0b29f32e0a060c90d3b8888a6f1c712813cd444e 100644
--- a/ui/gfx/compositor/test/test_suite.cc
+++ b/ui/gfx/compositor/test/test_suite.cc
@@ -7,7 +7,7 @@
 #include "base/message_loop.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/gfx/compositor/compositor_cc.h"
+#include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/gl/gl_implementation.h"
@@ -27,11 +27,11 @@ void CompositorTestSuite::Initialize() {
 
   message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
   ui::CompositorTestSupport::Initialize();
-  ui::CompositorCC::Initialize(false);
+  ui::Compositor::Initialize(false);
 }
 
 void CompositorTestSuite::Shutdown() {
-  ui::CompositorCC::Terminate();
+  ui::Compositor::Terminate();
   ui::CompositorTestSupport::Terminate();
   message_loop_.reset();