Rename the remaining usage of Monitor to Display

ash/test/ash_test_base.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/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/string_split.h"
 #include "content/public/test/web_contents_tester.h"
 #include "ui/aura/env.h"
-#include "ui/aura/monitor_manager.h"
+#include "ui/aura/display_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace test {
 namespace {
 
 std::vector<gfx::Display> CreateDisplaysFromString(
     const std::string specs) {
   std::vector<gfx::Display> displays;
   std::vector<std::string> parts;
   base::SplitString(specs, ',', &parts);
   for (std::vector<std::string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter) {
-    displays.push_back(aura::MonitorManager::CreateMonitorFromSpec(*iter));
+    displays.push_back(aura::DisplayManager::CreateDisplayFromSpec(*iter));
   }
   return displays;
 }
 
 }  // namespace
 
 content::WebContents* AshTestViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return content::WebContentsTester::CreateTestWebContents(browser_context,
@@ skipping 21 matching lines @@
 void AshTestBase::TearDown() {
   // Flush the message loop to finish pending release tasks.
   RunAllPendingInMessageLoop();
 
   // Tear down the shell.
   Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   ui::TextInputTestSupport::Shutdown();
 }
 
-void AshTestBase::ChangeMonitorConfig(float scale,
+void AshTestBase::ChangeDisplayConfig(float scale,
                                       const gfx::Rect& bounds_in_pixel) {
   gfx::Display display = gfx::Display(gfx::Screen::GetPrimaryDisplay().id());
   display.SetScaleAndBounds(scale, bounds_in_pixel);
   std::vector<gfx::Display> displays;
   displays.push_back(display);
-  aura::Env::GetInstance()->monitor_manager()->OnNativeMonitorsChanged(
+  aura::Env::GetInstance()->display_manager()->OnNativeDisplaysChanged(
       displays);
 }
 
-void AshTestBase::UpdateMonitor(const std::string& display_specs) {
+void AshTestBase::UpdateDisplay(const std::string& display_specs) {
   std::vector<gfx::Display> displays = CreateDisplaysFromString(display_specs);
-  aura::Env::GetInstance()->monitor_manager()->
-      OnNativeMonitorsChanged(displays);
+  aura::Env::GetInstance()->display_manager()->
+      OnNativeDisplaysChanged(displays);
 }
 
 void AshTestBase::RunAllPendingInMessageLoop() {
 #if !defined(OS_MACOSX)
   message_loop_.RunAllPendingWithDispatcher(
       aura::Env::GetInstance()->GetDispatcher());
 #endif
 }
 
 }  // namespace test
 }  // namespace ash