aura/cc: fix interactive_ui_tests

chrome/test/base/view_event_test_base.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/view_event_test_base.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #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.
 class TestView : public views::View {
  public:
   TestView() {}
 
   void SetPreferredSize(const gfx::Size& size) {
     preferred_size_ = size;
     PreferredSizeChanged();
@@ skipping 43 matching lines @@
   // need to quit twice. The second quit does that for us. Finish all
   // pending UI events before posting closure because events it may be
   // executed before UI events are executed.
   ui_controls::RunClosureAfterAllPendingUIEvents(MessageLoop::QuitClosure());
 }
 
 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);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
 #if defined(OS_WIN)
     DestroyWindow(window_->GetNativeWindow());
 #else
     window_->Close();
     ui_test_utils::RunAllPendingInMessageLoop();
 #endif
     window_ = NULL;
   }
+#if defined(USE_AURA)
+  aura::RootWindow::DeleteInstance();
+#endif
+  ui::CompositorTestSupport::Terminate();
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
 bool ViewEventTestBase::CanResize() const {
   return true;
 }
 
 views::View* ViewEventTestBase::GetContentsView() {
@@ skipping 58 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }