Revert 173417 - Broke on win_aura

ash/ash.gyp

 # Copyright (c) 2012 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,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
@@ skipping 562 matching lines @@
         'shell/toplevel_window.cc',
         'shell/widgets.cc',
         'shell/window_type_launcher.cc',
         'shell/window_watcher.cc',
         'shell/window_watcher_unittest.cc',
         'system/tray/system_tray_unittest.cc',
         'system/web_notification/web_notification_tray_unittest.cc',
         'test/ash_unittests.cc',
         'tooltips/tooltip_controller_unittest.cc',
         'wm/activation_controller_unittest.cc',
-        'wm/ash_activation_controller_unittest.cc',
         'wm/base_layout_manager_unittest.cc',
         'wm/cursor_manager_unittest.cc',
         'wm/custom_frame_view_ash_unittest.cc',
         'wm/drag_window_resizer_unittest.cc',
         'wm/frame_painter_unittest.cc',
         'wm/panel_layout_manager_unittest.cc',
         'wm/power_button_controller_unittest.cc',
         'wm/screen_dimmer_unittest.cc',
         'wm/session_state_controller_impl2_unittest.cc',
         'wm/shelf_layout_manager_unittest.cc',
@@ skipping 140 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }