Rename the remaining usage of Monitor to Display

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 18 matching lines @@
  public:
   AshTestBase();
   virtual ~AshTestBase();
 
   MessageLoopForUI* message_loop() { return &message_loop_; }
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
-  // Change the primary monitor's configuration to use |bounds|
+  // Change the primary display's configuration to use |bounds|
   // and |scale|.
-  void ChangeMonitorConfig(float scale, const gfx::Rect& bounds);
+  void ChangeDisplayConfig(float scale, const gfx::Rect& bounds);
 
   // Update the display configuration as given in |display_specs|.  The
   // format of |display_spec| is a list of comma separated spec for
   // each displays. Please refer to the comment in
-  // | aura::MonitorManager::CreateMonitorFromSpec| for the format of
+  // | aura::DisplayManager::CreateDisplayFromSpec| for the format of
   // the display spec.
-  void UpdateMonitor(const std::string& display_specs);
+  void UpdateDisplay(const std::string& display_specs);
 
  protected:
   void RunAllPendingInMessageLoop();
 
  private:
   MessageLoopForUI message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_