aura/cc: fix interactive_ui_tests

chrome/test/base/view_event_test_base.cc

Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index facfd59f1075be4dee4d4ec7f31e085d0f7c2c6b..91ab67be28d23dd93a65e142a83d17759e2350a5 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -15,9 +15,14 @@
 #include "base/string_number_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(USE_AURA)
+#include "ui/aura/root_window.h"
+#endif
+
 namespace {
 
 // View subclass that allows you to specify the preferred size.
@@ -81,6 +86,10 @@ void ViewEventTestBase::SetUp() {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
+  ui::CompositorTestSupport::Initialize();

[sky, 2011/12/08 04:34:44]

Should this be ifdef'd around VIEWS_COMPOSITOR?

[piman, 2011/12/08 07:10:18]

We don't need to, but wee could if you prefer.

+#if defined(USE_AURA)
+  aura::RootWindow::GetInstance();
+#endif
   window_ = views::Widget::CreateWindow(this);
 }
 
@@ -94,6 +103,10 @@ void ViewEventTestBase::TearDown() {
 #endif
     window_ = NULL;
   }
+#if defined(USE_AURA)
+  aura::RootWindow::DeleteInstance();
+#endif
+  ui::CompositorTestSupport::Terminate();
 #if defined(OS_WIN)
   OleUninitialize();
 #endif