Move DisplayList to display; add ScreenBase.

ash/test/display_manager_test_api.cc

 // 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.
 
 #include "ash/test/display_manager_test_api.h"
 
 #include <cstdarg>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
@@ skipping 18 matching lines @@
 namespace {
 
 DisplayInfoList CreateDisplayInfoListFromString(
     const std::string specs,
     DisplayManager* display_manager) {
   DisplayInfoList display_info_list;
   std::vector<std::string> parts = base::SplitString(
       specs, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   size_t index = 0;
 
-  display::DisplayList list =
+  display::Displays list =
       display_manager->IsInUnifiedMode()
           ? display_manager->software_mirroring_display_list()
           : display_manager->active_display_list();
 
   for (std::vector<std::string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter, ++index) {
     int64_t id = (index < list.size()) ? list[index].id()
                                        : display::Display::kInvalidDisplayID;
     display_info_list.push_back(
         display::ManagedDisplayInfo::CreateFromSpecWithID(*iter, id));
@@ skipping 148 matching lines @@
   for (size_t i = 0; i < count; i++) {
     int64_t id = va_arg(args, int64_t);
     list.push_back(id);
   }
   display::SortDisplayIdList(&list);
   return list;
 }
 
 }  // namespace test
 }  // namespace ash