views: Move ime and test directories to ui/views.

views/views.gyp

Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index d7a313aa61543ce671bf94a5fd31253fac8d9efe..6c63a8ca61ec254cc9aa0e86c36635dd0f221c80 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -284,22 +284,6 @@
         'focus/view_storage.h',
         'focus/widget_focus_manager.cc',
         'focus/widget_focus_manager.h',
-        'ime/input_method.h',
-        'ime/input_method_delegate.h',
-        'ime/input_method_base.cc',
-        'ime/input_method_base.h',
-        'ime/input_method_gtk.cc',
-        'ime/input_method_gtk.h',
-        'ime/input_method_ibus.cc',
-        'ime/input_method_ibus.h',
-        'ime/input_method_wayland.cc',
-        'ime/input_method_wayland.h',
-        'ime/input_method_win.cc',
-        'ime/input_method_win.h',
-        'ime/mock_input_method.cc',
-        'ime/mock_input_method.h',
-        'ime/text_input_type_tracker.h',
-        'ime/text_input_type_tracker.cc',
         'layout/box_layout.cc',
         'layout/box_layout.h',
         'layout/fill_layout.cc',
@@ -390,6 +374,22 @@
         '../ui/views/animation/bounds_animator.h',
         '../ui/views/accessibility/native_view_accessibility_win.cc',
         '../ui/views/accessibility/native_view_accessibility_win.h',
+        '../ui/views/ime/input_method_base.cc',
+        '../ui/views/ime/input_method_base.h',
+        '../ui/views/ime/input_method_delegate.h',
+        '../ui/views/ime/input_method_gtk.cc',
+        '../ui/views/ime/input_method_gtk.h',
+        '../ui/views/ime/input_method.h',
+        '../ui/views/ime/input_method_ibus.cc',
+        '../ui/views/ime/input_method_ibus.h',
+        '../ui/views/ime/input_method_wayland.cc',
+        '../ui/views/ime/input_method_wayland.h',
+        '../ui/views/ime/input_method_win.cc',
+        '../ui/views/ime/input_method_win.h',
+        '../ui/views/ime/mock_input_method.cc',
+        '../ui/views/ime/mock_input_method.h',
+        '../ui/views/ime/text_input_type_tracker.cc',
+        '../ui/views/ime/text_input_type_tracker.h',
         '../ui/views/touchui/gesture_manager.cc',
         '../ui/views/touchui/gesture_manager.h',
         '../ui/views/touchui/touch_selection_controller.cc',
@@ -520,13 +520,13 @@
             '../build/linux/system.gyp:ibus',
           ],
           'sources/': [
-            ['exclude', 'ime/mock_input_method.cc'],
-            ['exclude', 'ime/mock_input_method.h'],
+            ['exclude', '../ui/views/ime/mock_input_method.cc'],
+            ['exclude', '../ui/views/ime/mock_input_method.h'],
           ],
         }, { # else: use_ibus != 1
           'sources/': [
-            ['exclude', 'ime/input_method_ibus.cc'],
-            ['exclude', 'ime/input_method_ibus.h'],
+            ['exclude', '../ui/views/ime/input_method_ibus.cc'],
+            ['exclude', '../ui/views/ime/input_method_ibus.h'],
           ],
         }],
         ['OS=="win"', {
@@ -576,6 +576,10 @@
       'sources': [
         '../ui/views/animation/bounds_animator_unittest.cc',
         '../ui/views/touchui/touch_selection_controller_impl_unittest.cc',
+        '../ui/views/test/test_views_delegate.cc',
+        '../ui/views/test/test_views_delegate.h',
+        '../ui/views/test/views_test_base.cc',
+        '../ui/views/test/views_test_base.h',
         'accessible_pane_view_unittest.cc',
         'bubble/bubble_delegate_unittest.cc',
         'bubble/bubble_frame_view_unittest.cc',
@@ -594,11 +598,7 @@
         'focus/focus_manager_unittest.cc',
         'layout/grid_layout_unittest.cc',
         'layout/box_layout_unittest.cc',
-        'test/views_test_base.cc',
-        'test/views_test_base.h',
         'run_all_unittests.cc',
-        'test/test_views_delegate.cc',
-        'test/test_views_delegate.h',
         'view_unittest.cc',
         'widget/native_widget_test_utils.h',
         'widget/native_widget_test_utils_aura.cc',
@@ -733,8 +733,8 @@
         '../ui/views/examples/throbber_example.h',
         '../ui/views/examples/widget_example.cc',
         '../ui/views/examples/widget_example.h',
-        'test/test_views_delegate.cc',
-        'test/test_views_delegate.h',
+        '../ui/views/test/test_views_delegate.cc',
+        '../ui/views/test/test_views_delegate.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',