aura: Clean up compositor initialization/destruction.

chrome/test/base/view_event_test_base.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_
 #define CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_
 
 // We only want to use ViewEventTestBase in test targets which properly
 // isolate each test case by running each test in a separate process.
 // This way if a test hangs the test launcher can reliably terminate it.
 #if defined(HAS_OUT_OF_PROC_TEST_RUNNER)
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
+namespace ash {
+namespace test {
+class AshTestHelper;
+}
+}
+
 namespace aura {
 namespace test {
 class AuraTestHelper;
 }
 }
 
 namespace gfx {
 class Size;
 }
 
@@ skipping 104 matching lines @@
 
   // Thread for posting background MouseMoves.
   scoped_ptr<base::Thread> dnd_thread_;
 
   content::TestBrowserThreadBundle thread_bundle_;
 
 #if defined(OS_WIN)
   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
 
   DISALLOW_COPY_AND_ASSIGN(ViewEventTestBase);
 };
 
 // Convenience macro for defining a ViewEventTestBase. See class description
 // of ViewEventTestBase for details.
 #define VIEW_TEST(test_class, name) \
   TEST_F(test_class, name) {\
     StartMessageLoopAndRunTest();\
   }
 
 #endif  // defined(HAS_OUT_OF_PROC_TEST_RUNNER)
 
 #endif  // CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_