[Cleanup] Screen cleanup

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index ecf4275a9d0283fe770776de7046c9eca2f2e480..a32a2700f1ae111d7cff04148ff1196831f8b1fe 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -127,6 +127,8 @@
         'display/resolution_notification_controller.h',
         'display/root_window_transformers.cc',
         'display/root_window_transformers.h',
+        'display/screen_ash.cc',
+        'display/screen_ash.h',
         'display/screen_position_controller.cc',
         'display/screen_position_controller.h',
         'display/shared_display_edge_indicator.cc',
@@ -184,8 +186,8 @@
         'rotator/screen_rotation.h',
         'scoped_target_root_window.cc',
         'scoped_target_root_window.h',
-        'screen_ash.cc',
-        'screen_ash.h',
+        'screen_util.cc',
+        'screen_util.h',
         'screenshot_delegate.h',
         'session_state_delegate.h',
         'session_state_observer.cc',
@@ -837,7 +839,7 @@
         'keyboard_overlay/keyboard_overlay_view_unittest.cc',
         'magnifier/magnification_controller_unittest.cc',
         'root_window_controller_unittest.cc',
-        'screen_ash_unittest.cc',
+        'screen_util_unittest.cc',
         'screensaver/screensaver_view_unittest.cc',
         'session_state_delegate_stub.cc',
         'session_state_delegate_stub.h',