ash: Eliminate PointerWatcherDelegate

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index ef518ba4a2559a3e03465fcd98ecfa8a65a739d3..1ae8e796be5eb2f993e68b522a73256a4b9d8888 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -28,6 +28,8 @@
       'ash_touch_exploration_manager_chromeos.h',
       'aura/aura_layout_manager_adapter.cc',
       'aura/aura_layout_manager_adapter.h',
+      'aura/pointer_watcher_adapter.cc',
+      'aura/pointer_watcher_adapter.h',
       'aura/wm_lookup_aura.cc',
       'aura/wm_lookup_aura.h',
       'aura/wm_root_window_controller_aura.cc',
@@ -108,7 +110,6 @@
       'common/multi_profile_uma.cc',
       'common/multi_profile_uma.h',
       'common/palette_delegate.h',
-      'common/pointer_watcher_delegate.h',
       'common/popup_message.cc',
       'common/popup_message.h',
       'common/root_window_controller_common.cc',
@@ -627,8 +628,6 @@
       'metrics/task_switch_time_tracker.h',
       'metrics/user_metrics_recorder.cc',
       'metrics/user_metrics_recorder.h',
-      'pointer_watcher_delegate_aura.cc',
-      'pointer_watcher_delegate_aura.h',
       'root_window_controller.cc',
       'root_window_controller.h',
       'root_window_settings.cc',
@@ -935,6 +934,7 @@
       'accelerators/spoken_feedback_toggler_unittest.cc',
       'app_list/app_list_presenter_delegate_unittest.cc',
       'ash_touch_exploration_manager_chromeos_unittest.cc',
+      'aura/pointer_watcher_adapter_unittest.cc',
       'autoclick/autoclick_unittest.cc',
       'common/accelerators/accelerator_table_unittest.cc',
       'common/display/display_info_unittest.cc',
@@ -1001,7 +1001,6 @@
       'metrics/task_switch_metrics_recorder_unittest.cc',
       'metrics/task_switch_time_tracker_unittest.cc',
       'metrics/user_metrics_recorder_unittest.cc',
-      'pointer_watcher_delegate_aura_unittest.cc',
       'root_window_controller_unittest.cc',
       'rotator/screen_rotation_animation_unittest.cc',
       'screen_util_unittest.cc',