Revert 139494 - ash: Improved window maximize/restore animations

ash/wm/workspace/workspace_manager_unittest.cc

 // 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.
 
 #include "ash/wm/workspace/workspace_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 12 matching lines @@
 #include "ui/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 using aura::Window;
 
 namespace ash {
 namespace internal {
 
 class WorkspaceManagerTest : public test::AshTestBase {
  public:
-  WorkspaceManagerTest() : manager_(NULL) {}
+  WorkspaceManagerTest() {}
   virtual ~WorkspaceManagerTest() {}
 
   aura::Window* CreateTestWindowUnparented() {
     aura::Window* window = new aura::Window(NULL);
     window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
     window->SetType(aura::client::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     return window;
   }
 
@@ skipping 520 matching lines @@
 
   // Activate w2 again, shouldn't switch workspaces.
   wm::ActivateWindow(w2.get());
   EXPECT_EQ(Workspace::TYPE_MANAGED, active_workspace()->type());
   EXPECT_FALSE(w1->layer()->IsDrawn());
   EXPECT_TRUE(w2->layer()->IsDrawn());
   EXPECT_TRUE(w3->layer()->IsDrawn());
 }
 
 // Verifies Show()ing a minimized window that persists across all workspaces
-// unminimizes the window.
+// unminimizes thew indow.
 TEST_F(WorkspaceManagerTest, ShowMinimizedPersistWindow) {
   // Create a window that persists across all workspaces.
   scoped_ptr<Window> w1(CreateTestWindow());
   SetPersistsAcrossAllWorkspaces(
       w1.get(),
       WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_YES);
   w1->Show();
   wm::ActivateWindow(w1.get());
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
   EXPECT_FALSE(w1->IsVisible());
@@ skipping 79 matching lines @@
   w1->Show();
   w1->SetProperty(aura::client::kAnimationsDisabledKey, true);
 
   w2->Show();
   w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_TRUE(w1->GetProperty(aura::client::kAnimationsDisabledKey));
 }
 
 }  // namespace internal
 }  // namespace ash