1 files changed, 6 insertions, 0 deletions
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
index cd73011..d2962b4 100644
--- a/ui/views/run_all_unittests.cc
+++ b/ui/views/run_all_unittests.cc
@@ -8,6 +8,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor_setup.h"
+#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/views/view.h"
 
 class ViewTestSuite : public base::TestSuite {
@@ -20,9 +21,14 @@ class ViewTestSuite : public base::TestSuite {
     ui::RegisterPathProvider();
     ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
+    ui::CompositorTestSupport::Initialize();
     ui::SetupTestCompositor();
   }
 
+  virtual void Shutdown() OVERRIDE {
+    ui::CompositorTestSupport::Terminate();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ViewTestSuite);
 };