Revert of Moves ash content specific tests into ash_content_unittests

ash/test/ash_test_helper.h

Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 9e8b2022d03e6da36aa243336faabe4636b3fd63..820409a0552b722769b498bcc9db1d8fc04bdd92 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -16,6 +16,10 @@
 class Window;
 }  // namespace aura
 
+namespace base {
+class MessageLoopForUI;
+}  // namespace base
+
 namespace ui {
 class ScopedAnimationDurationScaleMode;
 }  // namespace ui
@@ -25,10 +29,11 @@
 }
 
 namespace ash {
+class ShellContentState;
 namespace test {
 
-class AshTestEnvironment;
 class TestScreenshotDelegate;
+class TestShellContentState;
 class TestShellDelegate;
 class TestSessionStateDelegate;
 
@@ -36,7 +41,7 @@
 // root window and an ash::Shell instance with a test delegate.
 class AshTestHelper {
  public:
-  explicit AshTestHelper(AshTestEnvironment* ash_test_environment);
+  explicit AshTestHelper(base::MessageLoopForUI* message_loop);
   ~AshTestHelper();
 
   // Creates the ash::Shell and performs associated initialization.  Set
@@ -58,6 +63,7 @@
 
   static TestSessionStateDelegate* GetTestSessionStateDelegate();
 
+  base::MessageLoopForUI* message_loop() { return message_loop_; }
   TestShellDelegate* test_shell_delegate() { return test_shell_delegate_; }
   void set_test_shell_delegate(TestShellDelegate* test_shell_delegate) {
     test_shell_delegate_ = test_shell_delegate;
@@ -65,8 +71,12 @@
   TestScreenshotDelegate* test_screenshot_delegate() {
     return test_screenshot_delegate_;
   }
-
-  AshTestEnvironment* ash_test_environment() { return ash_test_environment_; }
+  TestShellContentState* test_shell_content_state() {
+    return test_shell_content_state_;
+  }
+  void set_content_state(ShellContentState* content_state) {
+    content_state_ = content_state;
+  }
 
   // True if the running environment supports multiple displays,
   // or false otherwise (e.g. win8 bot).
@@ -77,7 +87,7 @@
   static bool SupportsHostWindowResize();
 
  private:
-  AshTestEnvironment* ash_test_environment_;  // Not owned.
+  base::MessageLoopForUI* message_loop_;    // Not owned.
   TestShellDelegate* test_shell_delegate_;  // Owned by ash::Shell.
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
 
@@ -85,6 +95,14 @@
   TestScreenshotDelegate* test_screenshot_delegate_;
 
   std::unique_ptr<views::ViewsDelegate> views_delegate_;
+
+  // An implementation of ShellContentState supplied by the user prior to
+  // SetUp().
+  ShellContentState* content_state_;
+  // If |content_state_| is not set prior to SetUp(), this value will be
+  // set to an instance of TestShellContentState created by this class. If
+  // |content_state_| is non-null, this will be nullptr.
+  TestShellContentState* test_shell_content_state_;
 
 #if defined(OS_CHROMEOS)
   // Check if DBus Thread Manager was initialized here.