From 7ce0394e9e538467c9d11c85cd35689cfa281280 Mon Sep 17 00:00:00 2001
From: oshima <oshima@chromium.org>
Date: Tue, 21 Apr 2015 17:58:38 -0700
Subject: DisplayManager Cleanup 2

better naming
simplified condition etc.

BUG=None

Review URL: https://codereview.chromium.org/1094413002

Cr-Commit-Position: refs/heads/master@{#326201}
---
 ash/test/ash_test_base.cc            | 3 +--
 ash/test/display_manager_test_api.cc | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'ash/test')

diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index ef7fba3..6e6f78d 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -214,8 +214,7 @@ void AshTestBase::UpdateDisplay(const std::string& display_specs) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   DisplayManagerTestApi display_manager_test_api(display_manager);
   display_manager_test_api.UpdateDisplay(display_specs);
-  if (display_manager->HasSoftwareMirroringDisplay())
-    RunAllPendingInMessageLoop();
+  display_manager->RunPendingTasksForTest();
 }
 
 aura::Window* AshTestBase::CurrentContext() {
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc
index 9bed696..87326ee 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ash/test/display_manager_test_api.cc
@@ -82,7 +82,7 @@ void DisplayManagerTestApi::UpdateDisplay(
 }
 
 int64 DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() {
-  const gfx::Display& internal = display_manager_->displays_[0];
+  const gfx::Display& internal = display_manager_->active_display_list_[0];
   SetInternalDisplayId(internal.id());
   return gfx::Display::InternalDisplayId();
 }
-- 
cgit v1.1