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

Unified Diff: trunk/src/chrome/test/base/view_event_test_base.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/chrome/chrome_tests_unit.gypi ('k') | trunk/src/ui/app_list/app_list.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/test/base/view_event_test_base.cc
===================================================================
--- trunk/src/chrome/test/base/view_event_test_base.cc (revision 202789)
+++ trunk/src/chrome/test/base/view_event_test_base.cc (working copy)
@@ -13,6 +13,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/browser_thread.h"
#include "ui/base/ime/text_input_test_support.h"
+#include "ui/compositor/test/compositor_test_support.h"
#include "ui/message_center/message_center.h"
#include "ui/views/view.h"
#include "ui/views/widget/desktop_aura/desktop_screen.h"
@@ -100,6 +101,7 @@
void ViewEventTestBase::SetUp() {
ui::TextInputTestSupport::Initialize();
+ ui::CompositorTestSupport::Initialize();
gfx::NativeView context = NULL;
#if defined(USE_ASH)
#if defined(OS_WIN)
@@ -158,6 +160,7 @@
#elif defined(USE_AURA)
aura_test_helper_->TearDown();
#endif
+ ui::CompositorTestSupport::Terminate();
ui::TextInputTestSupport::Shutdown();
}
« no previous file with comments | « trunk/src/chrome/chrome_tests_unit.gypi ('k') | trunk/src/ui/app_list/app_list.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698