Move a11y related srcs to ash/system/accessibility

Some a11y related source files were put directly under ash/system
or ash/system/unified while there's ash/system/accessibility.

TEST=trybot pass
BUG=none

Change-Id: I779b7791c582422451d0f8ef1d63ccadc0d40952
Reviewed-on: https://chromium-review.googlesource.com/c/1272918
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600653}

ash/BUILD.gn

@@ -619,10 +619,16 @@ component("ash") {
     "sticky_keys/sticky_keys_overlay.cc",
     "sticky_keys/sticky_keys_overlay.h",
     "sticky_keys/sticky_keys_state.h",
+    "system/accessibility/accessibility_feature_pod_controller.cc",
+    "system/accessibility/accessibility_feature_pod_controller.h",
     "system/accessibility/dictation_button_tray.cc",
     "system/accessibility/dictation_button_tray.h",
     "system/accessibility/select_to_speak_tray.cc",
     "system/accessibility/select_to_speak_tray.h",
+    "system/accessibility/tray_accessibility.cc",
+    "system/accessibility/tray_accessibility.h",
+    "system/accessibility/unified_accessibility_detailed_view_controller.cc",
+    "system/accessibility/unified_accessibility_detailed_view_controller.h",
     "system/audio/audio_detailed_view.cc",
     "system/audio/audio_detailed_view.h",
     "system/audio/display_speaker_controller.cc",
@@ -1000,16 +1006,12 @@ component("ash") {
     "system/tray/tri_view.cc",
     "system/tray/tri_view.h",
     "system/tray/view_click_listener.h",
-    "system/tray_accessibility.cc",
-    "system/tray_accessibility.h",
     "system/tray_caps_lock.cc",
     "system/tray_caps_lock.h",
     "system/tray_drag_controller.cc",
     "system/tray_drag_controller.h",
     "system/tray_tracing.cc",
     "system/tray_tracing.h",
-    "system/unified/accessibility_feature_pod_controller.cc",
-    "system/unified/accessibility_feature_pod_controller.h",
     "system/unified/collapse_button.cc",
     "system/unified/collapse_button.h",
     "system/unified/detailed_view_controller.h",
@@ -1056,8 +1058,6 @@ component("ash") {
     "system/unified/unified_system_tray_view.h",
     "system/unified/user_chooser_view.cc",
     "system/unified/user_chooser_view.h",
-    "system/unified_accessibility_detailed_view_controller.cc",
-    "system/unified_accessibility_detailed_view_controller.h",
     "system/update/tray_update.cc",
     "system/update/tray_update.h",
     "system/update/update_notification_controller.cc",
@@ -1845,8 +1845,10 @@ test("ash_unittests") {
     "shell_unittest.cc",
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
+    "system/accessibility/accessibility_feature_pod_controller_unittest.cc",
     "system/accessibility/dictation_button_tray_unittest.cc",
     "system/accessibility/select_to_speak_tray_unittest.cc",
+    "system/accessibility/tray_accessibility_unittest.cc",
     "system/audio/tray_audio_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc",
@@ -1923,10 +1925,8 @@ test("ash_unittests") {
     "system/tray/tray_event_filter_unittest.cc",
     "system/tray/tray_info_label_unittest.cc",
     "system/tray/tri_view_unittest.cc",
-    "system/tray_accessibility_unittest.cc",
     "system/tray_caps_lock_unittest.cc",
     "system/tray_tracing_unittest.cc",
-    "system/unified/accessibility_feature_pod_controller_unittest.cc",
     "system/unified/feature_pods_container_view_unittest.cc",
     "system/unified/quiet_mode_feature_pod_controller_unittest.cc",
     "system/unified/top_shortcuts_view_unittest.cc",

ash/system/unified/accessibility_feature_pod_controller.cc → ash/system/accessibility/accessibility_feature_pod_controller.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/unified/accessibility_feature_pod_controller.h"
+#include "ash/system/accessibility/accessibility_feature_pod_controller.h"
 
 #include "ash/accessibility/accessibility_delegate.h"
 #include "ash/resources/vector_icons/vector_icons.h"

ash/system/unified/accessibility_feature_pod_controller.h → ash/system/accessibility/accessibility_feature_pod_controller.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_UNIFIED_ACCESSIBILITY_FEATURE_POD_CONTROLLER_H_
-#define ASH_SYSTEM_UNIFIED_ACCESSIBILITY_FEATURE_POD_CONTROLLER_H_
+#ifndef ASH_SYSTEM_ACCESSIBILITY_ACCESSIBILITY_FEATURE_POD_CONTROLLER_H_
+#define ASH_SYSTEM_ACCESSIBILITY_ACCESSIBILITY_FEATURE_POD_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/system/unified/feature_pod_controller_base.h"
@@ -35,4 +35,4 @@ class ASH_EXPORT AccessibilityFeaturePodController
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_UNIFIED_ACCESSIBILITY_FEATURE_POD_CONTROLLER_H_
+#endif  // ASH_SYSTEM_ACCESSIBILITY_ACCESSIBILITY_FEATURE_POD_CONTROLLER_H_

ash/system/unified/accessibility_feature_pod_controller_unittest.cc → ash/system/accessibility/accessibility_feature_pod_controller_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/unified/accessibility_feature_pod_controller.h"
+#include "ash/system/accessibility/accessibility_feature_pod_controller.h"
 
 #include "ash/system/unified/feature_pod_button.h"
 #include "ash/system/unified/unified_system_tray_controller.h"

ash/system/tray_accessibility.cc → ash/system/accessibility/tray_accessibility.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/tray_accessibility.h"
+#include "ash/system/accessibility/tray_accessibility.h"
 
 #include <memory>
 #include <utility>

ash/system/tray_accessibility.h → ash/system/accessibility/tray_accessibility.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
-#define ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
+#ifndef ASH_SYSTEM_ACCESSIBILITY_TRAY_ACCESSIBILITY_H_
+#define ASH_SYSTEM_ACCESSIBILITY_TRAY_ACCESSIBILITY_H_
 
 #include <stdint.h>
 
@@ -25,7 +25,7 @@ namespace views {
 class Button;
 class Button;
 class View;
-}
+}  // namespace views
 
 namespace ash {
 class HoverHighlightView;
@@ -150,4 +150,4 @@ class TrayAccessibility : public TrayImageItem,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
+#endif  // ASH_SYSTEM_ACCESSIBILITY_TRAY_ACCESSIBILITY_H_

ash/system/tray_accessibility_unittest.cc → ash/system/accessibility/tray_accessibility_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/tray_accessibility.h"
+#include "ash/system/accessibility/tray_accessibility.h"
 
 #include "ash/accessibility/accessibility_controller.h"
 #include "ash/public/cpp/ash_features.h"

ash/system/unified_accessibility_detailed_view_controller.cc → ash/system/accessibility/unified_accessibility_detailed_view_controller.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/unified_accessibility_detailed_view_controller.h"
+#include "ash/system/accessibility/unified_accessibility_detailed_view_controller.h"
 
 #include "ash/accessibility/accessibility_controller.h"
 #include "ash/shell.h"
-#include "ash/system/tray_accessibility.h"
+#include "ash/system/accessibility/tray_accessibility.h"
 #include "ash/system/unified/unified_detailed_view_delegate.h"
 
 namespace ash {

ash/system/unified_accessibility_detailed_view_controller.h → ash/system/accessibility/unified_accessibility_detailed_view_controller.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_UNIFIED_ACCESSIBILITY_DETAILED_VIEW_CONTROLLER_H_
-#define ASH_SYSTEM_UNIFIED_ACCESSIBILITY_DETAILED_VIEW_CONTROLLER_H_
+#ifndef ASH_SYSTEM_ACCESSIBILITY_UNIFIED_ACCESSIBILITY_DETAILED_VIEW_CONTROLLER_H_
+#define ASH_SYSTEM_ACCESSIBILITY_UNIFIED_ACCESSIBILITY_DETAILED_VIEW_CONTROLLER_H_
 
 #include <memory>
 
@@ -45,4 +45,4 @@ class UnifiedAccessibilityDetailedViewController
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_UNIFIED_ACCESSIBILITY_DETAILED_VIEW_CONTROLLER_H_
+#endif  // ASH_SYSTEM_ACCESSIBILITY_UNIFIED_ACCESSIBILITY_DETAILED_VIEW_CONTROLLER_H_

ash/system/ime/tray_ime_chromeos.cc

@@ -13,6 +13,7 @@
 #include "ash/session/session_observer.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/system/accessibility/tray_accessibility.h"
 #include "ash/system/model/system_tray_model.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item_detailed_view_delegate.h"
@@ -25,7 +26,6 @@
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tray_utils.h"
 #include "ash/system/tray/tri_view.h"
-#include "ash/system/tray_accessibility.h"
 #include "base/logging.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"

ash/system/tray/system_tray.cc

@@ -20,6 +20,7 @@
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/system/accessibility/tray_accessibility.h"
 #include "ash/system/audio/tray_audio.h"
 #include "ash/system/bluetooth/tray_bluetooth.h"
 #include "ash/system/brightness/tray_brightness.h"
@@ -50,7 +51,6 @@
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
-#include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/tray_tracing.h"
 #include "ash/system/unified/unified_system_tray.h"

ash/system/unified/unified_system_tray_controller.cc

@@ -9,6 +9,8 @@
 #include "ash/multi_profile_uma.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
+#include "ash/system/accessibility/accessibility_feature_pod_controller.h"
+#include "ash/system/accessibility/unified_accessibility_detailed_view_controller.h"
 #include "ash/system/audio/unified_audio_detailed_view_controller.h"
 #include "ash/system/audio/unified_volume_slider_controller.h"
 #include "ash/system/bluetooth/bluetooth_feature_pod_controller.h"
@@ -27,7 +29,6 @@
 #include "ash/system/night_light/night_light_feature_pod_controller.h"
 #include "ash/system/rotation/rotation_lock_feature_pod_controller.h"
 #include "ash/system/tray/system_tray_item_uma_type.h"
-#include "ash/system/unified/accessibility_feature_pod_controller.h"
 #include "ash/system/unified/detailed_view_controller.h"
 #include "ash/system/unified/feature_pod_button.h"
 #include "ash/system/unified/feature_pod_controller_base.h"
@@ -37,7 +38,6 @@
 #include "ash/system/unified/unified_system_tray_model.h"
 #include "ash/system/unified/unified_system_tray_view.h"
 #include "ash/system/unified/user_chooser_view.h"
-#include "ash/system/unified_accessibility_detailed_view_controller.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"

chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

@@ -7,10 +7,10 @@
 #include "ash/public/cpp/ash_pref_names.h"
 #include "ash/shell.h"
 #include "ash/shell_test_api.h"
+#include "ash/system/accessibility/tray_accessibility.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_test_api.h"
-#include "ash/system/tray_accessibility.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"