Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: ui/gfx/test_suite.cc

Issue 8391006: aura: Set up the mock compositor to get gfx_unittests green on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/ui_unittests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698