Move wm/public into wm target

ui/wm/wm.gyp

Index: ui/wm/wm.gyp
diff --git a/ui/wm/wm.gyp b/ui/wm/wm.gyp
index cccadc07abe3e6af7e26cfc21e9c16bdd4beabe5..78c4bd699101dd5835f9e30c882d483b7bac3b32 100644
--- a/ui/wm/wm.gyp
+++ b/ui/wm/wm.gyp
@@ -8,19 +8,7 @@
   },
   'targets': [
     {
-      'target_name': 'wm_public',
-      'type': 'static_library',
-      'dependencies': [
-        '../../skia/skia.gyp:skia',
-        '../aura/aura.gyp:aura',
-        '../gfx/gfx.gyp:gfx_geometry',
-      ],
-      'sources': [
-        'public/window_types.h',
-      ],
-    },
-    {
-      'target_name': 'wm_core',
+      'target_name': 'wm',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
@@ -35,7 +23,7 @@
         '../base/ui_base.gyp:ui_base',
       ],
       'defines': [
-        'WM_CORE_IMPLEMENTATION',
+        'WM_IMPLEMENTATION',
       ],
       'sources': [
         'core/base_focus_rules.cc',
@@ -46,6 +34,8 @@
         'core/compound_event_filter.h',
         'core/cursor_manager.cc',
         'core/cursor_manager.h',
+        'core/default_activation_client.cc',
+        'core/default_activation_client.h',
         'core/easy_resize_window_targeter.cc',
         'core/easy_resize_window_targeter.h',
         'core/focus_controller.cc',
@@ -80,13 +70,36 @@
         'core/window_modality_controller.h',
         'core/window_util.cc',
         'core/window_util.h',
-        'core/wm_core_export.h',
         'core/wm_core_switches.cc',
         'core/wm_core_switches.h',
         'core/wm_state.cc',
         'core/wm_state.h',
+        'public/activation_change_observer.h',
+        'public/activation_change_observer.cc',
+        'public/activation_client.cc',
+        'public/activation_client.h',
+        'public/activation_delegate.cc',
+        'public/activation_delegate.h',
+        'public/animation_host.cc',
+        'public/animation_host.h',
         'public/cursor_delegate.cc',
         'public/cursor_delegate.h',
+        'public/dispatcher_client.cc',
+        'public/dispatcher_client.h',
+        'public/drag_drop_client.cc',
+        'public/drag_drop_client.h',
+        'public/drag_drop_delegate.cc',
+        'public/drag_drop_delegate.h',
+        'public/scoped_tooltip_disabler.cc',
+        'public/scoped_tooltip_disabler.h',
+        'public/tooltip_client.cc',
+        'public/tooltip_client.h',
+        'public/transient_window_client.cc',
+        'public/transient_window_client.h',
+        'public/window_move_client.cc',
+        'public/window_move_client.h',
+        'public/window_types.h',
+        'wm_export.h',
       ],
     },
     {
@@ -94,9 +107,13 @@
       'type': 'static_library',
       'dependencies': [
         '../../skia/skia.gyp:skia',
+        '../../testing/gtest.gyp:gtest',
         '../aura/aura.gyp:aura',
+        'wm',
       ],
       'sources': [
+        'test/wm_test_base.cc',
+        'test/wm_test_base.h',
         'test/wm_test_helper.cc',
         'test/wm_test_helper.h',
       ],
@@ -117,7 +134,7 @@
         '../gfx/gfx.gyp:gfx_geometry',
         '../gfx/gfx.gyp:gfx',
         '../base/ui_base.gyp:ui_base',
-        'wm_core',
+        'wm',
         'wm_test_support',
       ],
       'sources': [