Adds DesktopWindowTreeHostMus

ui/aura/test/aura_test_helper.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 UI_AURA_TEST_AURA_TEST_HELPER_H_
 #define UI_AURA_TEST_AURA_TEST_HELPER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 35 matching lines @@
 class TestWindowParentingClient;
 
 // A helper class owned by tests that does common initialization required for
 // Aura use. This class creates a root window with clients and other objects
 // that are necessary to run test on Aura.
 class AuraTestHelper {
  public:
   explicit AuraTestHelper(base::MessageLoopForUI* message_loop);
   ~AuraTestHelper();
 
-  void EnableMus(WindowTreeClientDelegate* window_tree_delegate,
-                 WindowManagerDelegate* window_manager_delegate);
+  // Makes aura target mus with a mock WindowTree (TestWindowTree). Must be
+  // called before SetUp().
+  void EnableMusWithTestWindowTree(
+      WindowTreeClientDelegate* window_tree_delegate,
+      WindowManagerDelegate* window_manager_delegate);
+
+  // Makes aura target mus with the specified WindowTreeClient. Must be called
+  // before SetUp().
+  void EnableMusWithWindowTreeClient(WindowTreeClient* window_tree_client);
 
   // Creates and initializes (shows and sizes) the RootWindow for use in tests.
   void SetUp(ui::ContextFactory* context_factory);
 
   // Clean up objects that are created for tests. This also deletes the Env
   // object.
   void TearDown();
 
   // Flushes message loop.
   void RunAllPendingInMessageLoop();
 
   Window* root_window() { return host_->window(); }
   ui::EventProcessor* event_processor() { return host_->event_processor(); }
   WindowTreeHost* host() { return host_.get(); }
 
   TestScreen* test_screen() { return test_screen_.get(); }
 
+  // This function only returns a valid value if EnableMusWithTestWindowTree()
+  // was called.
   TestWindowTree* window_tree();
+
+  // Returns a WindowTreeClient only if one of the EnableMus functions is
+  // called.
   WindowTreeClient* window_tree_client();
 
   client::FocusClient* focus_client() { return focus_client_.get(); }
   client::CaptureClient* capture_client();
 
  private:
-  Env::WindowPortFactory InitMus();
+  enum class Mode {
+    // Classic aura.
+    LOCAL,
 
-  std::unique_ptr<WindowPort> CreateWindowPortMus(Window* window);
+    // Mus with a test WindowTree implementation that does not target the real
+    // service:ui.
+    MUS_CREATE_WINDOW_TREE_CLIENT,
 
-  base::MessageLoopForUI* message_loop_;
-  bool use_mus_ = false;
+    // Mus without creating a WindowTree. This is used when the test wants to
+    // create the WindowTreeClient itself. This mode is enabled by way of
+    // EnableMusWithWindowTreeClient().
+    MUS,
+  };
+
+  // Initializes a WindowTreeClient with a test WindowTree.
+  void InitWindowTreeClient();
+
+  // Factory function for creating the appropriate WindowPort function.
+  std::unique_ptr<WindowPort> CreateWindowPort(Window* window);
+
+  Mode mode_ = Mode::LOCAL;
   bool setup_called_;
   bool teardown_called_;
   std::unique_ptr<TestWindowTreeClientSetup> window_tree_client_setup_;
   std::unique_ptr<aura::Env> env_;
   std::unique_ptr<wm::WMState> wm_state_;
   std::unique_ptr<WindowTreeHost> host_;
   std::unique_ptr<TestWindowParentingClient> parenting_client_;
   std::unique_ptr<client::DefaultCaptureClient> capture_client_;
   std::unique_ptr<client::FocusClient> focus_client_;
   std::unique_ptr<TestScreen> test_screen_;
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
   WindowTreeClientDelegate* window_tree_delegate_ = nullptr;
   WindowManagerDelegate* window_manager_delegate_ = nullptr;
 
+  WindowTreeClient* window_tree_client_ = nullptr;
+
   DISALLOW_COPY_AND_ASSIGN(AuraTestHelper);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_AURA_TEST_HELPER_H_