Changes how window manager obtains WindowTree from mus

components/mus/ws/window_manager_factory_service.h

Index: components/mus/ws/window_manager_factory_service.h
diff --git a/components/mus/ws/window_manager_factory_service.h b/components/mus/ws/window_manager_factory_service.h
deleted file mode 100644
index 6e1b6cde38e62014897c0dd1cff59fa0818cdacd..0000000000000000000000000000000000000000
--- a/components/mus/ws/window_manager_factory_service.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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_WS_WINDOW_MANAGER_FACTORY_SERVICE_H_
-#define COMPONENTS_MUS_WS_WINDOW_MANAGER_FACTORY_SERVICE_H_
-
-#include <stdint.h>
-
-#include "components/mus/public/interfaces/window_manager_factory.mojom.h"
-#include "components/mus/ws/user_id.h"
-#include "mojo/public/cpp/bindings/binding.h"
-
-namespace mus {
-namespace ws {
-
-class ServerWindow;
-class WindowManagerFactoryRegistry;
-
-namespace test {
-class WindowManagerFactoryRegistryTestApi;
-}
-
-class WindowManagerFactoryService : public mojom::WindowManagerFactoryService {
- public:
-  WindowManagerFactoryService(
-      WindowManagerFactoryRegistry* registry,
-      const UserId& user_id,
-      mojo::InterfaceRequest<mojom::WindowManagerFactoryService> request);
-  ~WindowManagerFactoryService() override;
-
-  const UserId& user_id() const { return user_id_; }
-
-  mojom::WindowManagerFactory* window_manager_factory() {
-    return window_manager_factory_;
-  }
-
-  // mojom::WindowManagerFactoryService:
-  void SetWindowManagerFactory(mojom::WindowManagerFactoryPtr factory) override;
-
- private:
-  friend class test::WindowManagerFactoryRegistryTestApi;
-
-  // Used by tests.
-  WindowManagerFactoryService(WindowManagerFactoryRegistry* registry,
-                              const UserId& user_id);
-
-  void SetWindowManagerFactoryImpl(mojom::WindowManagerFactory* factory);
-  void OnConnectionLost();
-
-  WindowManagerFactoryRegistry* registry_;
-  const UserId user_id_;
-  mojo::Binding<mojom::WindowManagerFactoryService> binding_;
-  mojom::WindowManagerFactoryPtr window_manager_factory_ptr_;
-  // Typically the same as |window_manager_factory_ptr_|, but differs for
-  // tests that don't create bindings.
-  mojom::WindowManagerFactory* window_manager_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowManagerFactoryService);
-};
-
-}  // namespace ws
-}  // namespace mus
-
-#endif  // COMPONENTS_MUS_WS_WINDOW_MANAGER_FACTORY_SERVICE_H_