Combine dictation and Select-to-Speak trays under ash/system/accessibility.

This is just an internal cleanup / refactor and has no functional changes.

Change-Id: I4a90d631d5e66822d47df3cc521d6095c6f141fe
Reviewed-on: https://chromium-review.googlesource.com/1054197Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Katie Dektar <katie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558891}

ash/BUILD.gn

@@ -536,6 +536,8 @@ component("ash") {
     "sticky_keys/sticky_keys_overlay.cc",
     "sticky_keys/sticky_keys_overlay.h",
     "sticky_keys/sticky_keys_state.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/audio/audio_detailed_view.cc",
@@ -581,8 +583,6 @@ component("ash") {
     "system/date/system_info_default_view.h",
     "system/date/tray_system_info.cc",
     "system/date/tray_system_info.h",
-    "system/dictation/dictation_button_tray.cc",
-    "system/dictation/dictation_button_tray.h",
     "system/display_scale/scale_detailed_view.cc",
     "system/display_scale/scale_detailed_view.h",
     "system/display_scale/scale_view.cc",
@@ -1686,6 +1686,7 @@ test("ash_unittests") {
     "shell_unittest.cc",
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
+    "system/accessibility/dictation_button_tray_unittest.cc",
     "system/accessibility/select_to_speak_tray_unittest.cc",
     "system/audio/tray_audio_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
@@ -1694,7 +1695,6 @@ test("ash_unittests") {
     "system/caps_lock_notification_controller_unittest.cc",
     "system/date/date_view_unittest.cc",
     "system/date/system_info_default_view_unittest.cc",
-    "system/dictation/dictation_button_tray_unittest.cc",
     "system/enterprise/tray_enterprise_unittest.cc",
     "system/flag_warning/flag_warning_tray_unittest.cc",
     "system/ime/tray_ime_chromeos_unittest.cc",

ash/system/dictation/dictation_button_tray.cc → ash/system/accessibility/dictation_button_tray.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/dictation/dictation_button_tray.h"
+#include "ash/system/accessibility/dictation_button_tray.h"
 
 #include "ash/accessibility/accessibility_controller.h"
 #include "ash/resources/vector_icons/vector_icons.h"

ash/system/dictation/dictation_button_tray.h → ash/system/accessibility/dictation_button_tray.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_DICTATION_DICTATION_BUTTON_TRAY_H_
-#define ASH_SYSTEM_DICTATION_DICTATION_BUTTON_TRAY_H_
+#ifndef ASH_SYSTEM_ACCESSIBILITY_DICTATION_BUTTON_TRAY_H_
+#define ASH_SYSTEM_ACCESSIBILITY_DICTATION_BUTTON_TRAY_H_
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accessibility/accessibility_observer.h"
@@ -72,4 +72,4 @@ class ASH_EXPORT DictationButtonTray : public TrayBackgroundView,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_DICTATION_DICTATION_BUTTON_TRAY_H_
+#endif  // ASH_SYSTEM_ACCESSIBILITY_DICTATION_BUTTON_TRAY_H_

ash/system/dictation/dictation_button_tray_unittest.cc → ash/system/accessibility/dictation_button_tray_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/dictation/dictation_button_tray.h"
+#include "ash/system/accessibility/dictation_button_tray.h"
 
 #include "ash/accessibility/accessibility_controller.h"
 #include "ash/accessibility/test_accessibility_controller_client.h"

ash/system/status_area_widget.cc

@@ -9,8 +9,8 @@
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
+#include "ash/system/accessibility/dictation_button_tray.h"
 #include "ash/system/accessibility/select_to_speak_tray.h"
-#include "ash/system/dictation/dictation_button_tray.h"
 #include "ash/system/flag_warning/flag_warning_tray.h"
 #include "ash/system/ime_menu/ime_menu_tray.h"
 #include "ash/system/message_center/notification_tray.h"