Extract content dependency from keyboard code

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 499496492e010b0c193eaf0f201b7dda7a052ec9..83fbb9b438b03b17a697529e980f9ed0c58d831f 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -724,6 +724,8 @@
       'test/task_switch_time_tracker_test_api.h',
       'test/test_activation_delegate.cc',
       'test/test_activation_delegate.h',
+      'test/test_keyboard_ui.cc',
+      'test/test_keyboard_ui.h',
       'test/test_lock_state_controller_delegate.cc',
       'test/test_lock_state_controller_delegate.h',
       'test/test_overlay_delegate.cc',
@@ -760,8 +762,6 @@
       'test/virtual_keyboard_test_helper.h',
     ],
     'ash_test_support_with_content_sources': [
-      'test/content/keyboard_controller_proxy_stub.cc',
-      'test/content/keyboard_controller_proxy_stub.h',
       'test/content/test_shell_content_state.cc',
       'test/content/test_shell_content_state.h',
     ],
@@ -969,6 +969,7 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
+        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
@@ -1063,6 +1064,7 @@
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../ui/views/controls/webview/webview.gyp:webview',
@@ -1164,6 +1166,7 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
+        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/message_center/message_center.gyp:message_center_test_support',
         '../ui/resources/ui_resources.gyp:ui_resources',
@@ -1264,6 +1267,7 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
+        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/views/examples/examples.gyp:views_examples_lib',