Keep the split view activities topmost in z-order in Athena

athena/wm/window_manager_unittest.cc

 // Copyright 2014 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 "athena/wm/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/split_view_controller.h"
@@ skipping 242 matching lines @@
   generator.GestureScrollSequence(gfx::Point(20, 10),
                                   gfx::Point(20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_EQ(second.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(fourth.get(), wm_api.GetSplitViewController()->right_window());
   aura::Window::Windows windows =
       wm_api.GetWindowListProvider()->GetWindowList();
   ASSERT_EQ(4u, windows.size());
   EXPECT_EQ(second.get(), windows[3]);
-  EXPECT_EQ(third.get(), windows[2]);
-  EXPECT_EQ(fourth.get(), windows[1]);
+  EXPECT_EQ(fourth.get(), windows[2]);
 
   // Swipe the title of the right window now. It should switch to |third|.
   generator.GestureScrollSequence(gfx::Point(x_middle + 20, 10),
                                   gfx::Point(x_middle + 20, 400),
                                   base::TimeDelta::FromMilliseconds(20),
                                   5);
   EXPECT_EQ(second.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->right_window());
+  windows = wm_api.GetWindowListProvider()->GetWindowList();
+  ASSERT_EQ(4u, windows.size());
+  EXPECT_EQ(second.get(), windows[3]);
+  EXPECT_EQ(third.get(), windows[2]);
 }
 
 TEST_F(WindowManagerTest, NewWindowBounds) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> first(CreateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
   aura::client::ParentWindowWithContext(
       first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   // The window should have the same size as the container.
@@ skipping 77 matching lines @@
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
   overview_delegate->OnSelectWindow(w1.get());
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_TRUE(w1->IsVisible());
   // Make sure the windows that were in split-view mode are hidden.
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 }
 
 }  // namespace athena