Index: ui/gfx/test_suite.cc |
diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc |
index 1901ed003f69e1f4b28788244d532acc96dc0492..cc29564893a832b49f0ffa7ead0b77d9d8cef60a 100644 |
--- a/ui/gfx/test_suite.cc |
+++ b/ui/gfx/test_suite.cc |
@@ -15,6 +15,10 @@ |
#include "base/mac/foundation_util.h" |
#endif |
+#if defined(USE_AURA) |
sky
2011/10/25 21:21:57
What gfx tests are actually using the compositor?
sadrul
2011/10/25 21:24:08
ScreenTest (ui/gfx/screen_unittest.cc):
http://bu
|
+#include "ui/gfx/compositor/compositor_test_support.h" |
+#endif |
+ |
GfxTestSuite::GfxTestSuite(int argc, char** argv) : TestSuite(argc, argv) {} |
void GfxTestSuite::Initialize() { |
@@ -50,11 +54,20 @@ void GfxTestSuite::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"); |
+ |
+#if defined(USE_AURA) |
+ ui::CompositorTestSupport::Initialize(); |
+ ui::CompositorTestSupport::SetupMockCompositor(); |
+#endif |
} |
void GfxTestSuite::Shutdown() { |
ui::ResourceBundle::CleanupSharedInstance(); |
+#if defined(USE_AURA) |
+ ui::CompositorTestSupport::Terminate(); |
+#endif |
+ |
#if defined(OS_MACOSX) |
base::mac::SetOverrideAppBundle(NULL); |
#endif |