Make aura work with mus

ui/aura/test/test_screen.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_TEST_SCREEN_H_
 #define UI_AURA_TEST_TEST_SCREEN_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace gfx {
 class Insets;
 class Rect;
 class Transform;
 }
 
 namespace aura {
 class Window;
+class WindowTreeClient;
 class WindowTreeHost;
 
 // A minimal, testing Aura implementation of display::Screen.
 // TODO(bruthig): Consider extending gfx::test::TestScreen.
 class TestScreen : public display::Screen, public WindowObserver {
  public:
   // Creates a display::Screen of the specified size. If no size is specified,
   // then creates a 800x600 screen. |size| is in physical pixels.
-  static TestScreen* Create(const gfx::Size& size);
+  static TestScreen* Create(const gfx::Size& size,
+                            WindowTreeClient* window_tree_client = nullptr);
   ~TestScreen() override;
 
   WindowTreeHost* CreateHostForPrimaryDisplay();
 
   void SetDeviceScaleFactor(float device_scale_fator);
   void SetDisplayRotation(display::Display::Rotation rotation);
   void SetUIScale(float ui_scale);
   void SetWorkAreaInsets(const gfx::Insets& insets);
 
   // display::Screen overrides:
@@ skipping 17 matching lines @@
   std::vector<display::Display> GetAllDisplays() const override;
   display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
   display::Display GetDisplayNearestPoint(
       const gfx::Point& point) const override;
   display::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const override;
   void AddObserver(display::DisplayObserver* observer) override;
   void RemoveObserver(display::DisplayObserver* observer) override;
 
  private:
-  explicit TestScreen(const gfx::Rect& screen_bounds);
+  TestScreen(const gfx::Rect& screen_bounds,
+             WindowTreeClient* window_tree_client);
 
   aura::WindowTreeHost* host_;
 
   display::Display display_;
 
   float ui_scale_;
 
+  WindowTreeClient* window_tree_client_;
+
   DISALLOW_COPY_AND_ASSIGN(TestScreen);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_SCREEN_H_