Adding functions to the window_list_provider for accessing the activities window list

athena/wm/window_manager_unittest.cc

Index: athena/wm/window_manager_unittest.cc
diff --git a/athena/wm/window_manager_unittest.cc b/athena/wm/window_manager_unittest.cc
index 0f03ae12ce2229b7ae13b6349965fb06353452b6..7602f58963f0bd2c266e6d1447b56c911bd3321f 100644
--- a/athena/wm/window_manager_unittest.cc
+++ b/athena/wm/window_manager_unittest.cc
@@ -151,7 +151,7 @@ TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
       third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
 
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
 
   // Do a two-finger swipe from the left bezel.
   ui::test::EventGenerator generator(root_window());
@@ -164,10 +164,7 @@ TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
       2, left_bezel_points, kEventTimeSepration, 1, width, 0);
   EXPECT_TRUE(wm::IsActiveWindow(second.get()));
   EXPECT_EQ(second.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
-  EXPECT_FALSE(first->IsVisible());
-  EXPECT_TRUE(second->IsVisible());
-  EXPECT_FALSE(third->IsVisible());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
 }
 
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
@@ -186,7 +183,7 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
       third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
 
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
 
   // Do a title-swipe from the top to switch to the previous window.
   ui::test::EventGenerator generator(root_window());
@@ -196,7 +193,7 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
                                   5);
   EXPECT_TRUE(wm::IsActiveWindow(second.get()));
   EXPECT_EQ(second.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
   EXPECT_TRUE(second->IsVisible());
   EXPECT_FALSE(third->IsVisible());
 
@@ -207,7 +204,7 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
                                   5);
   EXPECT_TRUE(wm::IsActiveWindow(third.get()));
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
   EXPECT_FALSE(second->IsVisible());
   EXPECT_TRUE(third->IsVisible());
 
@@ -218,7 +215,7 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
                                   5);
   EXPECT_TRUE(wm::IsActiveWindow(third.get()));
   EXPECT_EQ(third.get(),
-            wm_api.GetWindowListProvider()->GetWindowList().back());
+            wm_api.GetWindowListProvider()->GetCurrentWindowList().back());
   EXPECT_FALSE(second->IsVisible());
   EXPECT_TRUE(third->IsVisible());
 }
@@ -263,7 +260,7 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
   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();
+      wm_api.GetWindowListProvider()->GetCurrentWindowList();
   ASSERT_EQ(4u, windows.size());
   EXPECT_EQ(second.get(), windows[3]);
   EXPECT_EQ(third.get(), windows[2]);