Move DisplayList to display; add ScreenBase.

ash/mus/test/wm_test_base.cc

 // 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.
 
 #include "ash/mus/test/wm_test_base.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/mus/root_window_controller.h"
@@ skipping 99 matching lines @@
   std::vector<RootWindowController*> roots =
       WmTestBase::GetRootsOrderedByDisplayId();
   roots[0]->display_.set_bounds(bounds);
   gfx::Rect work_area(bounds);
   // Offset the height slightly to give a different work area. -2 is arbitrary,
   // it could be anything.
   work_area.set_height(std::max(0, work_area.height() - 2));
   roots[0]->display_.set_work_area(work_area);
   roots[0]->root()->SetBounds(gfx::Rect(bounds.size()));
   test_helper_->screen()->display_list()->UpdateDisplay(
-      roots[0]->display(), views::DisplayList::Type::PRIMARY);
+      roots[0]->display(), display::DisplayList::Type::PRIMARY);
 }
 
 ui::Window* WmTestBase::GetPrimaryRootWindow() {
   std::vector<RootWindowController*> roots =
       WmTestBase::GetRootsOrderedByDisplayId();
   DCHECK(!roots.empty());
   return roots[0]->root();
 }
 
 ui::Window* WmTestBase::GetSecondaryRootWindow() {
@@ skipping 85 matching lines @@
                                               ->window_manager()
                                               ->GetRootWindowControllers();
   std::vector<RootWindowController*> ordered_roots;
   ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
   std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
   return ordered_roots;
 }
 
 }  // namespace mus
 }  // namespace ash