aura: Clean up compositor initialization/destruction.

chrome/test/base/view_event_test_base.h

Index: chrome/test/base/view_event_test_base.h
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h
index c6c7be765054097610046d8ce575f2c65517aaf0..fb0f6f51e82a0e801bc6ad0897798bcb5a7d19bc 100644
--- a/chrome/test/base/view_event_test_base.h
+++ b/chrome/test/base/view_event_test_base.h
@@ -23,6 +23,12 @@
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
+namespace ash {
+namespace test {
+class AshTestHelper;
+}
+}
+
 namespace aura {
 namespace test {
 class AuraTestHelper;
@@ -147,7 +153,9 @@ class ViewEventTestBase : public views::WidgetDelegate,
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
+  scoped_ptr<ash::test::AshTestHelper> ash_test_helper_;
+#elif defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif