Revert of Moves ash content specific tests into ash_content_unittests

ash/test/ash_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 ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "base/compiler_specific.h"
 #include "base/macros.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 "third_party/skia/include/core/SkColor.h"
 #include "ui/display/display.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 namespace aura {
@@ skipping 17 matching lines @@
 class WidgetDelegate;
 }
 
 namespace ash {
 class DisplayManager;
 class SystemTray;
 class WmShelf;
 
 namespace test {
 
-class AshTestEnvironment;
 class AshTestHelper;
 class TestScreenshotDelegate;
 class TestSystemTrayDelegate;
+#if defined(OS_WIN)
+class TestMetroViewerProcessHost;
+#endif
 
 class AshTestBase : public testing::Test {
  public:
   AshTestBase();
   ~AshTestBase() override;
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
@@ skipping 100 matching lines @@
   void UnblockUserSession();
 
   void DisableIME();
 
  private:
   bool setup_called_;
   bool teardown_called_;
   // |SetUp()| doesn't activate session if this is set to false.
   bool start_session_;
   MaterialDesignController::Mode material_mode_;
-  std::unique_ptr<AshTestEnvironment> ash_test_environment_;
+  std::unique_ptr<content::TestBrowserThreadBundle> thread_bundle_;
   std::unique_ptr<AshTestHelper> ash_test_helper_;
   std::unique_ptr<ui::test::EventGenerator> event_generator_;
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 class NoSessionAshTestBase : public AshTestBase {
  public:
   NoSessionAshTestBase() { set_start_session(false); }
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_