Adds ability for ash_unittests to run in mushrome mode

ash/test/ash_test_helper.h

 // Copyright 2013 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_HELPER_H_
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "ash/common/test/test_session_controller_client.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/test/mus/test_window_tree_client_setup.h"
 
 namespace aura {
 class Window;
 class WindowTreeClientPrivate;
 }  // namespace aura
 
 namespace display {
 class Display;
 }
 
+namespace mash {
+namespace test {
+class MashTestSuite;
+}
+}
+
 namespace ui {
 class ScopedAnimationDurationScaleMode;
 }  // namespace ui
 
 namespace wm {
 class WMState;
 }
 
 namespace ash {
 
 class RootWindowController;
 
+enum class Config;

[msw, 2017/03/30 23:06:05]

optional nit: order before RootWindowController?

[sky, 2017/03/30 23:35:46]

I actually prefer separating them out and there doesn't appear to be a standard
here...

+
 namespace mus {
 class WindowManagerApplication;
 }
 
 namespace test {
 
 class AshTestEnvironment;
+class AshTestSuite;

[msw, 2017/03/30 23:06:05]

optional nit: technically, I don't think this fwd decl is needed

 class AshTestViewsDelegate;
 class TestScreenshotDelegate;
 class TestShellDelegate;
 class TestSessionControllerClient;
 class TestSessionStateDelegate;
 
 // A helper class that does common initialization required for Ash. Creates a
 // root window and an ash::Shell instance with a test delegate.
 class AshTestHelper {
  public:
@@ skipping 39 matching lines @@
 
   TestSessionControllerClient* test_session_controller_client() {
     return session_controller_client_.get();
   }
   void set_test_session_controller_client(
       std::unique_ptr<TestSessionControllerClient> session_controller_client) {
     session_controller_client_ = std::move(session_controller_client);
   }
 
  private:
+  // The two TestSuites need to manipulate |config_|.

[msw, 2017/03/30 23:06:05]

nit: These? optionally expose |config_for_testing()| accessor instead?

[sky, 2017/03/30 23:35:46]

They need to set config_, which I would like to restrict to the TestSuites.

+  friend class AshTestSuite;
+  friend class mash::test::MashTestSuite;
+
   // Called when running in mash to create the WindowManager.
   void CreateMashWindowManager();
 
   // Called when running in ash to create Shell.
   void CreateShell();
 
   // Creates a new RootWindowController based on |display_spec|. The origin is
   // set to |next_x| and on exit |next_x| is set to the origin + the width.
   RootWindowController* CreateRootWindowController(
       const std::string& display_spec,
       int* next_x);
 
   // Updates an existing display based on |display_spec|.
   void UpdateDisplay(RootWindowController* root_window_controller,
                      const std::string& display_spec,
                      int* next_x);
 
   std::vector<RootWindowController*> GetRootsOrderedByDisplayId();
 
+  static Config config_;
+
   AshTestEnvironment* ash_test_environment_;  // Not owned.
   TestShellDelegate* test_shell_delegate_;  // Owned by ash::Shell.
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
 
-  // Owned by ash::AcceleratorController
+  // Owned by ash::AcceleratorController.
   TestScreenshotDelegate* test_screenshot_delegate_;
 
   std::unique_ptr<::wm::WMState> wm_state_;
   std::unique_ptr<AshTestViewsDelegate> views_delegate_;
 
   // Check if DBus Thread Manager was initialized here.
   bool dbus_thread_manager_initialized_;
   // Check if Bluez DBus Manager was initialized here.
   bool bluez_dbus_manager_initialized_;
 
   aura::TestWindowTreeClientSetup window_tree_client_setup_;
   std::unique_ptr<mus::WindowManagerApplication> window_manager_app_;
   std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_;
   // Id for the next Display created by CreateRootWindowController().
   int64_t next_display_id_ = 1;
 
   std::unique_ptr<TestSessionControllerClient> session_controller_client_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_HELPER_H_