Renames Workspace*2 -> Workspace*.

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 370 matching lines @@
         'wm/workspace/magnetism_matcher.cc',
         'wm/workspace/magnetism_matcher.h',
         'wm/workspace/maximize_bubble_frame_state.h',
         'wm/workspace/multi_window_resize_controller.cc',
         'wm/workspace/multi_window_resize_controller.h',
         'wm/workspace/phantom_window_controller.cc',
         'wm/workspace/phantom_window_controller.h',
         'wm/workspace/snap_sizer.cc',
         'wm/workspace/snap_sizer.h',
         'wm/workspace/snap_types.h',
-        'wm/workspace/workspace2.cc',
-        'wm/workspace/workspace2.h',
+        'wm/workspace/workspace.cc',
+        'wm/workspace/workspace.h',
         'wm/workspace/workspace_animations.cc',
         'wm/workspace/workspace_animations.h',
         'wm/workspace/workspace_event_handler.cc',
         'wm/workspace/workspace_event_handler.h',
-        'wm/workspace/workspace_layout_manager2.cc',
-        'wm/workspace/workspace_layout_manager2.h',
-        'wm/workspace/workspace_manager2.cc',
-        'wm/workspace/workspace_manager2.h',
+        'wm/workspace/workspace_layout_manager.cc',
+        'wm/workspace/workspace_layout_manager.h',
+        'wm/workspace/workspace_manager.cc',
+        'wm/workspace/workspace_manager.h',
         'wm/workspace/workspace_types.h',
         'wm/workspace/workspace_window_resizer.cc',
         'wm/workspace/workspace_window_resizer.h',
       ],
       'conditions': [
         ['OS=="mac"', {
           'sources/': [
             ['exclude', 'accelerators/accelerator_controller.cc'],
             ['exclude', 'accelerators/accelerator_controller.h'],
             ['exclude', 'accelerators/accelerator_dispatcher.cc'],
@@ skipping 143 matching lines @@
         'wm/window_cycle_controller_unittest.cc',
         'wm/window_manager_unittest.cc',
         'wm/window_modality_controller_unittest.cc',
         'wm/workspace_controller_test_helper.cc',
         'wm/workspace_controller_test_helper.h',
         'wm/workspace/magnetism_matcher_unittest.cc',
         'wm/workspace/multi_window_resize_controller_unittest.cc',
         'wm/workspace/workspace_event_handler_test_helper.cc',
         'wm/workspace/workspace_event_handler_test_helper.h',
         'wm/workspace/workspace_event_handler_unittest.cc',
-        'wm/workspace/workspace_layout_manager2_unittest.cc',
-        'wm/workspace/workspace_manager2_unittest.cc',
+        'wm/workspace/workspace_layout_manager_unittest.cc',
+        'wm/workspace/workspace_manager_unittest.cc',
         'wm/workspace/workspace_window_resizer_unittest.cc',
         '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc',
       ],
       'conditions': [
         ['use_ibus==1', {
           'dependencies': [
             '../build/linux/system.gyp:ibus',
           ],
         }],
         ['OS=="win"', {
@@ skipping 109 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }