Keep dedicated layers for hiding animation

ui/wm/core/focus_controller_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 "ui/wm/core/focus_controller.h"
 
 #include <map>
 
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 987 matching lines @@
   FocusControllerHideTest() : FocusControllerImplicitTestBase(false) {}
 
  protected:
   FocusControllerHideTest(bool parent)
       : FocusControllerImplicitTestBase(parent) {}
 
   // Overridden from FocusControllerImplicitTestBase:
   virtual void ChangeWindowDisposition(aura::Window* window) OVERRIDE {
     GetDispositionWindow(window)->Hide();
   }
-  virtual void PostDispostionChangeExpectations() OVERRIDE {
-    // BasicActivation() starts with the stacking order: 1, 2, 3 (3 topmost)
-    // and then activates 2. After 2 is hidden in ChangeWindowDisposition
-    // above, 3 is activated, but code in
-    // FocusController::OnWindowVisibilityChanging keeps 2's layer above 3's
-    // until a hide animation completes (e.g. a fade-out transition).
-    aura::Window* w2 = root_window()->GetChildById(2);
-    aura::Window* w3 = root_window()->GetChildById(3);
-
-    // W2 was hidden, but its layer should still be stacked above W3's.
-    typedef std::vector<ui::Layer*> Layers;
-    const Layers& children = w3->parent()->layer()->children();
-    Layers::const_iterator w3_iter =
-        std::find(children.begin(), children.end(), w3->layer());
-    Layers::const_iterator w2_iter =
-        std::find(children.begin(), children.end(), w2->layer());
-    EXPECT_TRUE(w2_iter > w3_iter);
-  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FocusControllerHideTest);
 };
 
 // Focus and Activation changes in response to window parent visibility
 // changes.
 class FocusControllerParentHideTest : public FocusControllerHideTest {
  public:
   FocusControllerParentHideTest() : FocusControllerHideTest(true) {}
@@ skipping 157 matching lines @@
 // Clicking on a window which has capture should not result in a focus change.
 DIRECT_FOCUS_CHANGE_TESTS(NoFocusChangeOnClickOnCaptureWindow);
 
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest,
                       ChangeFocusWhenNothingFocusedAndCaptured);
 
 // See description above DontPassDeletedWindow() for details.
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow);
 
 }  // namespace wm