aura/cc: fix interactive_ui_tests

BUG=106787
TEST=interactive_ui_tests


Review URL: http://codereview.chromium.org/8887002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113632 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_tests.gypi

@@ -66,6 +66,7 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../ui/gfx/compositor/compositor.gyp:test_compositor',
+        '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
       ],
       'export_dependent_settings': [
         'renderer',

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.
@@ -80,6 +85,10 @@ void ViewEventTestBase::Done() {
 void ViewEventTestBase::SetUp() {
 #if defined(OS_WIN)
   OleInitialize(NULL);
+#endif
+  ui::CompositorTestSupport::Initialize();
+#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