Move Ash window-show code from AshTestHelper back to AshTestBase

This allows other tests (Chrome OS BrowserWithTestWindowTest in particular)
to use AshTestHelper without opening an X window. This speeds up the tests
noticably and makes them less flaky when running locally.

This is a partial revert of https://chromiumcodereview.appspot.com/14284017/ - I was too aggressive in moving code from AshTestBase to AshTestHelper.

BUG=233374
TEST=ash_unittests, unit_tests

Review URL: https://chromiumcodereview.appspot.com/14791002

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

1 files changed, 11 insertions, 0 deletions

diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index eacdad6..dd65bf4 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -14,6 +14,10 @@
 #include "ui/aura/client/window_types.h"
 #include "ui/views/test/test_views_delegate.h"
 
+#if defined(OS_WIN)
+#include "ui/base/win/scoped_ole_initializer.h"
+#endif
+
 namespace aura {
 class RootWindow;
 class Window;
@@ -32,6 +36,9 @@ class DisplayManager;
 namespace test {
 
 class AshTestHelper;
+#if defined(OS_WIN)
+class TestMetroViewerProcessHost;
+#endif
 
 class AshTestViewsDelegate : public views::TestViewsDelegate {
  public:
@@ -101,6 +108,10 @@ class AshTestBase : public testing::Test {
   base::MessageLoopForUI message_loop_;
   scoped_ptr<AshTestHelper> ash_test_helper_;
   scoped_ptr<aura::test::EventGenerator> event_generator_;
+#if defined(OS_WIN)
+  scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_;
+  ui::ScopedOleInitializer ole_initializer_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };