Use WebKit compositor in ui::Layer

ui/gfx/compositor/test_suite.cc

Index: ui/gfx/compositor/test_suite.cc
diff --git a/ui/gfx/compositor/test_suite.cc b/ui/gfx/compositor/test_suite.cc
index f26cd314584e5a4d3e49a493d1364e3992c2d9d8..66d4b26b020360e4281b46988ca066ce71621188 100644
--- a/ui/gfx/compositor/test_suite.cc
+++ b/ui/gfx/compositor/test_suite.cc
@@ -4,14 +4,23 @@
 
 #include "ui/gfx/compositor/test_suite.h"
 
+#include "base/message_loop.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/compositor/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
+#if defined(USE_WEBKIT_COMPOSITOR)
+#include "ui/gfx/compositor/compositor_cc.h"
+#endif
+
 CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
+CompositorTestSuite::~CompositorTestSuite() {}
+
 void CompositorTestSuite::Initialize() {
 #if defined(OS_LINUX)
   gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
@@ -24,9 +33,15 @@ void CompositorTestSuite::Initialize() {
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstance("en-US");
+
+  message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
+  ui::CompositorTestSupport::Initialize();
 }
 
 void CompositorTestSuite::Shutdown() {
+  ui::CompositorTestSupport::Terminate();
+  message_loop_.reset();
+
   ui::ResourceBundle::CleanupSharedInstance();
 
   base::TestSuite::Shutdown();