Remove the removed display from the active list after displays are added

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 <vector>
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
@@ skipping 16 matching lines @@
 
 namespace {
 
 std::vector<DisplayInfo> CreateDisplayInfoListFromString(
     const std::string specs,
     DisplayManager* display_manager) {
   std::vector<DisplayInfo> display_info_list;
   std::vector<std::string> parts;
   base::SplitString(specs, ',', &parts);
   size_t index = 0;
+
+  DisplayManager::DisplayList 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 id = index < display_manager->GetNumDisplays() ?
-        display_manager->GetDisplayAt(index).id() :
-        gfx::Display::kInvalidDisplayID;
+    int64 id = (index < list.size()) ? list[index].id()
+                                     : gfx::Display::kInvalidDisplayID;
     display_info_list.push_back(
         DisplayInfo::CreateFromSpecWithID(*iter, id));
   }
   return display_info_list;
 }
 
 }  // namespace
 
 // static
 bool DisplayManagerTestApi::TestIfMouseWarpsAt(
@@ skipping 92 matching lines @@
 
 void DisplayManagerTestApi::SetAvailableColorProfiles(
     int64 display_id,
     const std::vector<ui::ColorCalibrationProfile>& profiles) {
   display_manager_->display_info_[display_id].set_available_color_profiles(
       profiles);
 }
 
 }  // namespace test
 }  // namespace ash