Keep dedicated layers for hiding animation

ash/wm/workspace_controller_unittest.cc

 // Copyright 2013 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_controller.h"
 
 #include <map>
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
@@ skipping 335 matching lines @@
   EXPECT_TRUE(w2_state->IsFullscreen());
   EXPECT_TRUE(w1->layer()->IsDrawn());
   EXPECT_TRUE(w2->layer()->IsDrawn());
 
   // Minimize the window, which should hide the window.
   EXPECT_TRUE(w2_state->IsActive());
   w2_state->Minimize();
   EXPECT_FALSE(w2_state->IsActive());
   EXPECT_FALSE(w2->layer()->IsDrawn());
   EXPECT_TRUE(w1_state->IsActive());
+  EXPECT_EQ(w2.get(), GetDesktop()->children()[0]);
+  EXPECT_EQ(w1.get(), GetDesktop()->children()[1]);
 
   // Make the window normal.
   w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
-  EXPECT_EQ(w1.get(), GetDesktop()->children()[0]);
-  EXPECT_EQ(w2.get(), GetDesktop()->children()[1]);
+  // Setting back to normal doesn't change the activation.
+  EXPECT_FALSE(w2_state->IsActive());
+  EXPECT_TRUE(w1_state->IsActive());
+  EXPECT_EQ(w2.get(), GetDesktop()->children()[0]);
+  EXPECT_EQ(w1.get(), GetDesktop()->children()[1]);
   EXPECT_TRUE(w2->layer()->IsDrawn());
 }
 
 // Verifies ShelfLayoutManager's visibility/auto-hide state is correctly
 // updated.
 TEST_F(WorkspaceControllerTest, ShelfStateUpdated) {
   // Since ShelfLayoutManager queries for mouse location, move the mouse so
   // it isn't over the shelf.
   aura::test::EventGenerator generator(
       Shell::GetPrimaryRootWindow(), gfx::Point());
@@ skipping 1127 matching lines @@
     target = targeter->FindTargetForEvent(root, &touch);
     if (points[i].is_target_hit)
       EXPECT_EQ(window.get(), target);
     else
       EXPECT_NE(window.get(), target);
   }
 }
 
 }  // namespace internal
 }  // namespace ash