Rename the remaining usage of Monitor to Display

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 857581d1ba47ce2c4c1e0eebffb13a4bdb92a265..65537afa9cc872b7c4176bdfc1e44895911b5557 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -97,14 +97,14 @@
         'launcher/tabbed_launcher_button.h',
         'magnifier/magnification_controller.cc',
         'magnifier/magnification_controller.h',
-        'monitor/monitor_controller.cc',
-        'monitor/monitor_controller.h',
-        'monitor/mouse_cursor_event_filter.cc',
-        'monitor/mouse_cursor_event_filter.h',
-        'monitor/multi_monitor_manager.cc',
-        'monitor/multi_monitor_manager.h',
-        'monitor/secondary_monitor_view.cc',
-        'monitor/secondary_monitor_view.h',
+        'display/display_controller.cc',
+        'display/display_controller.h',
+        'display/mouse_cursor_event_filter.cc',
+        'display/mouse_cursor_event_filter.h',
+        'display/multi_display_manager.cc',
+        'display/multi_display_manager.h',
+        'display/secondary_display_view.cc',
+        'display/secondary_display_view.h',
         'root_window_controller.cc',
         'root_window_controller.h',
         'screen_ash.cc',
@@ -379,6 +379,7 @@
         'accelerators/accelerator_table_unittest.cc',
         'accelerators/nested_dispatcher_controller_unittest.cc',
         'dip_unittest.cc',
+        'display/multi_display_manager_unittest.cc',
         'drag_drop/drag_drop_controller_unittest.cc',
         'extended_desktop_unittest.cc',
         'focus_cycler_unittest.cc',
@@ -387,7 +388,6 @@
         'launcher/launcher_navigator_unittest.cc',
         'launcher/launcher_unittest.cc',
         'launcher/launcher_view_unittest.cc',
-        'monitor/multi_monitor_manager_unittest.cc',
         'root_window_controller_unittest.cc',
         'screensaver/screensaver_view_unittest.cc',
         'shell_unittest.cc',