Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*.

ash/test/test_shell_delegate.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/test_shell_delegate.h"
 
 #include <limits>
 
 #include "ash/app_list/app_list_presenter_delegate.h"
 #include "ash/app_list/app_list_presenter_delegate_factory.h"
 #include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/gpu_support_stub.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/new_window_delegate.h"
-#include "ash/pointer_down_watcher_delegate_aura.h"
+#include "ash/pointer_watcher_delegate_aura.h"
 #include "ash/test/test_keyboard_ui.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shelf_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_user_wallpaper_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/app_list/presenter/app_list_presenter_impl.h"
 #include "ui/app_list/presenter/app_list_view_delegate_factory.h"
@@ skipping 149 matching lines @@
 }
 
 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() {
   return new NewWindowDelegateImpl;
 }
 
 MediaDelegate* TestShellDelegate::CreateMediaDelegate() {
   return new MediaDelegateImpl;
 }
 
-std::unique_ptr<PointerDownWatcherDelegate>
-TestShellDelegate::CreatePointerDownWatcherDelegate() {
-  return base::WrapUnique(new PointerDownWatcherDelegateAura);
+std::unique_ptr<PointerWatcherDelegate>
+TestShellDelegate::CreatePointerWatcherDelegate() {
+  return base::WrapUnique(new PointerWatcherDelegateAura);
 }
 
 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf,
                                                     const ShelfItem* item) {
   return nullptr;
 }
 
 GPUSupport* TestShellDelegate::CreateGPUSupport() {
   // Real GPU support depends on src/content, so just use a stub.
   return new GPUSupportStub;
@@ skipping 10 matching lines @@
 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
 #if defined(OS_CHROMEOS)
   static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate())
       ->set_media_capture_state(state);
   WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged();
 #endif
 }
 
 }  // namespace test
 }  // namespace ash