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

Unified Diff: trunk/src/ui/message_center/test/run_all_unittests.cc

Issue 15838015: Revert 202787 "Remove unnecessary ui::CompositorTestSupport" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | « trunk/src/ui/message_center/message_center.gyp ('k') | trunk/src/ui/snapshot/snapshot.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/message_center/test/run_all_unittests.cc
===================================================================
--- trunk/src/ui/message_center/test/run_all_unittests.cc (revision 202789)
+++ trunk/src/ui/message_center/test/run_all_unittests.cc (working copy)
@@ -7,6 +7,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/test/test_suite.h"
#include "ui/views/view.h"
@@ -28,12 +29,17 @@
ui::test::UITestSuite::Initialize();
#if !defined(OS_MACOSX)
+ ui::CompositorTestSupport::Initialize();
ui::SetupTestCompositor();
#endif
}
void MessageCenterTestSuite::Shutdown() {
ui::test::UITestSuite::Shutdown();
+
+#if !defined(OS_MACOSX)
+ ui::CompositorTestSupport::Terminate();
+#endif
}
int main(int argc, char** argv) {
« no previous file with comments | « trunk/src/ui/message_center/message_center.gyp ('k') | trunk/src/ui/snapshot/snapshot.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698