Move keyboard_test_util to test directory

Change-Id: I25c5dc28b1080804e569232790aebc2a132c7193
Reviewed-on: https://chromium-review.googlesource.com/1031990
Commit-Queue: Blake O'Hare <blakeo@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Yuichiro Hanada <yhanada@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569192}

ash/app_list/app_list_presenter_delegate_unittest.cc

@@ -44,7 +44,7 @@
 #include "ui/events/test/event_generator.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace ash {

ash/login/ui/login_keyboard_test_base.cc

@@ -16,8 +16,8 @@
 #include "base/strings/strcat.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 
 namespace ash {
 

ash/root_window_controller_unittest.cc

@@ -35,9 +35,9 @@
 #include "ui/events/test/test_event_handler.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"

ash/wm/always_on_top_controller_unittest.cc

@@ -13,8 +13,8 @@
 #include "base/memory/ptr_util.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 
 namespace ash {
 

ash/wm/lock_action_handler_layout_manager_unittest.cc

@@ -32,9 +32,9 @@
 #include "ui/aura/window.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 

ash/wm/lock_layout_manager_unittest.cc

@@ -17,9 +17,9 @@
 #include "ui/display/screen.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 

ash/wm/system_modal_container_layout_manager_unittest.cc

@@ -26,8 +26,8 @@
 #include "ui/events/test/event_generator.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/views/test/capture_tracking_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"

ash/wm/workspace/workspace_layout_manager_unittest.cc

@@ -59,9 +59,9 @@
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/keyboard/keyboard_controller.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_util.h"

chrome/browser/ui/ash/keyboard_controller_browsertest.cc

@@ -22,8 +22,8 @@
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_resource_util.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 
 namespace {
 const int kKeyboardHeightForTest = 100;

chrome/browser/ui/ash/keyboard_end_to_end_browsertest.cc

@@ -15,8 +15,8 @@
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_resource_util.h"
 #include "ui/keyboard/keyboard_switches.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 
 namespace {
 

ui/keyboard/BUILD.gn

@@ -77,8 +77,8 @@ jumbo_component("keyboard") {
 static_library("test_support") {
   testonly = true
   sources = [
-    "keyboard_test_util.cc",
-    "keyboard_test_util.h",
+    "test/keyboard_test_util.cc",
+    "test/keyboard_test_util.h",
   ]
   deps = [
     ":keyboard",

ui/keyboard/keyboard_controller_unittest.cc

@@ -32,9 +32,9 @@
 #include "ui/keyboard/container_full_width_behavior.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/keyboard/keyboard_layout_manager.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/wm/core/default_activation_client.h"
 
 #if defined(USE_OZONE)

ui/keyboard/keyboard_util_unittest.cc

@@ -7,8 +7,8 @@
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/keyboard/keyboard_controller.h"
-#include "ui/keyboard/keyboard_test_util.h"
 #include "ui/keyboard/keyboard_ui.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 
 namespace keyboard {
 namespace {

ui/keyboard/keyboard_test_util.cc → ui/keyboard/test/keyboard_test_util.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 "ui/keyboard/keyboard_test_util.h"
+#include "ui/keyboard/test/keyboard_test_util.h"
 
 #include "base/run_loop.h"
 #include "ui/aura/window.h"

ui/keyboard/keyboard_test_util.h → ui/keyboard/test/keyboard_test_util.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 UI_KEYBOARD_KEYBOARD_TEST_UTIL_
-#define UI_KEYBOARD_KEYBOARD_TEST_UTIL_
+#ifndef UI_KEYBOARD_TEST_KEYBOARD_TEST_UTIL_H_
+#define UI_KEYBOARD_TEST_KEYBOARD_TEST_UTIL_H_
 
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ -57,4 +57,4 @@ class TestKeyboardUI : public KeyboardUI {
 
 }  // namespace keyboard
 
-#endif  // UI_KEYBOARD_KEYBOARD_TEST_UTIL_
+#endif  // UI_KEYBOARD_TEST_KEYBOARD_TEST_UTIL_H_