Move wm/public into wm target

ui/keyboard/keyboard.gyp

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 30 matching lines @@
         '../../content/content.gyp:content_browser',
         '../../ipc/ipc.gyp:ipc',
         '../../skia/skia.gyp:skia',
         '../../url/url.gyp:url_lib',
         '../aura/aura.gyp:aura',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
-        '../wm/wm.gyp:wm_core',
+        '../wm/wm.gyp:wm',
         'keyboard_resources',
       ],
       'defines': [
         'KEYBOARD_IMPLEMENTATION',
       ],
       'sources': [
         'keyboard.cc',
         'keyboard.h',
         'keyboard_constants.cc',
         'keyboard_constants.h',
@@ skipping 22 matching lines @@
         '../../testing/gtest.gyp:gtest',
         '../../url/url.gyp:url_lib',
         '../aura/aura.gyp:aura',
         '../aura/aura.gyp:aura_test_support',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         '../resources/ui_resources.gyp:ui_test_pak',
+        '../wm/wm.gyp:wm_test_support',
         'keyboard',
       ],
       'sources': [
         'test/run_all_unittests.cc',
         'keyboard_controller_unittest.cc',
       ],
       'conditions': [
         # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
         ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
           'link_settings': {
             'ldflags': ['-rdynamic'],
           },
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
     },
   ],
 }