Eliminate WindowTreeConnection

components/mus/public/cpp/tests/test_window_tree_client_setup.h

Index: components/mus/public/cpp/tests/test_window_tree_client_setup.h
diff --git a/components/mus/public/cpp/tests/test_window_tree_client_setup.h b/components/mus/public/cpp/tests/test_window_tree_client_setup.h
new file mode 100644
index 0000000000000000000000000000000000000000..68861582958a87cdcab1f831229b937c83412411
--- /dev/null
+++ b/components/mus/public/cpp/tests/test_window_tree_client_setup.h
@@ -0,0 +1,53 @@
+// Copyright 2016 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 COMPONENTS_MUS_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
+#define COMPONENTS_MUS_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "components/mus/public/cpp/window_tree_client_observer.h"
+
+namespace mus {
+
+class TestWindowTree;
+class WindowManagerDelegate;
+class WindowTreeClient;
+class WindowTreeClientDelegate;
+
+// TestWindowTreeClientSetup is used to create a WindowTreeClient that is not
+// connected to mus.
+class TestWindowTreeClientSetup : public mus::WindowTreeClientObserver {
+ public:
+  TestWindowTreeClientSetup();
+  ~TestWindowTreeClientSetup() override;
+
+  // Initializes the WindowTreeClient. |window_manager_delegate| may be
+  // null.
+  void Init(WindowTreeClientDelegate* window_tree_delegate,
+            WindowManagerDelegate* window_manager_delegate);
+
+  // The WindowTree that WindowTreeClient talks to.
+  TestWindowTree* window_tree() { return window_tree_.get(); }
+
+  WindowTreeClient* window_tree_client();
+
+ private:
+  // mus::WindowTreeClientObserver:
+  void OnWillDestroyClient(mus::WindowTreeClient* client) override;
+
+  std::unique_ptr<TestWindowTree> window_tree_;
+
+  // See description of WindowTreeClientDelegate for details on ownership. The
+  // WindowTreeClient may be deleted during shutdown by the test. If not,
+  // we own it and must delete it.
+  std::unique_ptr<WindowTreeClient> window_tree_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup);
+};
+
+}  // namespace mus
+
+#endif  // COMPONENTS_MUS_PUBLIC_CPP_TESTS_TEST_WINDOW_TREE_CLIENT_SETUP_H_