Renames Workspace*2 -> Workspace*.

ash/wm/workspace_controller.h

 // 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.
 
 #ifndef ASH_WM_WORKSPACE_CONTROLLER_H_
 #define ASH_WM_WORKSPACE_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/wm/workspace/workspace_types.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/activation_change_observer.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ash {
 namespace internal {
 
 class ShelfLayoutManager;
 class WorkspaceControllerTestHelper;
 class WorkspaceEventHandler;
-class WorkspaceManager2;
+class WorkspaceManager;
 
 // WorkspaceController acts as a central place that ties together all the
 // various workspace pieces.
 class ASH_EXPORT WorkspaceController
     : public aura::client::ActivationChangeObserver {
  public:
   explicit WorkspaceController(aura::Window* viewport);
   virtual ~WorkspaceController();
 
   // Returns the current window state.
@@ skipping 12 matching lines @@
 
   // aura::client::ActivationChangeObserver overrides:
   virtual void OnWindowActivated(aura::Window* window,
                                  aura::Window* old_active) OVERRIDE;
 
  private:
   friend class WorkspaceControllerTestHelper;
 
   aura::Window* viewport_;
 
-  scoped_ptr<WorkspaceManager2> workspace_manager_;
+  scoped_ptr<WorkspaceManager> workspace_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_CONTROLLER_H_