Change single-display screens to use ScreenBase and DisplayList.

ui/aura/test/test_screen.h

Index: ui/aura/test/test_screen.h
diff --git a/ui/aura/test/test_screen.h b/ui/aura/test/test_screen.h
index 0c03b22210e859cc7da096c5a209c9be14dea0a2..947b702c3c0594de1ac5100792fadad9764cbeec 100644
--- a/ui/aura/test/test_screen.h
+++ b/ui/aura/test/test_screen.h
@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display.h"
-#include "ui/display/screen.h"
+#include "ui/display/screen_base.h"
 
 namespace gfx {
 class Insets;
@@ -24,7 +24,7 @@ class WindowTreeHost;
 
 // A minimal, testing Aura implementation of display::Screen.
 // TODO(bruthig): Consider extending gfx::test::TestScreen.
-class TestScreen : public display::Screen, public WindowObserver {
+class TestScreen : public display::ScreenBase, 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.
@@ -39,9 +39,6 @@ class TestScreen : public display::Screen, public WindowObserver {
   void SetUIScale(float ui_scale);
   void SetWorkAreaInsets(const gfx::Insets& insets);
 
-  // display::Screen overrides:
-  display::Display GetPrimaryDisplay() const override;
-
  protected:
   gfx::Transform GetRotationTransform() const;
   gfx::Transform GetUIScaleTransform() const;
@@ -56,15 +53,7 @@ class TestScreen : public display::Screen, public WindowObserver {
   gfx::Point GetCursorScreenPoint() override;
   bool IsWindowUnderCursor(gfx::NativeWindow window) override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
-  int GetNumDisplays() const override;
-  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:
   TestScreen(const gfx::Rect& screen_bounds,
@@ -72,8 +61,6 @@ class TestScreen : public display::Screen, public WindowObserver {
 
   aura::WindowTreeHost* host_;
 
-  display::Display display_;
-
   float ui_scale_;
 
   WindowTreeClient* window_tree_client_;