[Athena] Fix switching activities by swiping from the right bezel

athena/wm/window_list_provider_impl_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/window_list_provider_impl.h"
 
 #include <algorithm>
 
 #include "athena/test/athena_test_base.h"
 #include "athena/wm/public/window_list_provider_observer.h"
@@ skipping 188 matching lines @@
   container->AddChild(window3.get());
   // Make a copy of the window-list in the original order.
   aura::Window::Windows original_order = list_provider->GetWindowList();
   ASSERT_EQ(3U, original_order.size());
   EXPECT_EQ(original_order[0], window1.get());
   EXPECT_EQ(original_order[1], window2.get());
   EXPECT_EQ(original_order[2], window3.get());
 
   EXPECT_EQ(0, observer.get()->calls());
 
-  // Move 2 to the front.
-  list_provider->MoveToFront(window2.get());
-  EXPECT_EQ("1 3 2", GetWindowOrder(original_order,
+  // Move 1 (from the back) in front of 2.
+  list_provider->StackWindowFrontOf(window1.get(), window2.get());
+  EXPECT_EQ("2 1 3", GetWindowOrder(original_order,
                                     list_provider->GetWindowList()));
   EXPECT_EQ(1, observer->calls());
 
-  // Move 2 to the front again. Should not change anything.
-  list_provider->MoveToFront(window2.get());
-  EXPECT_EQ("1 3 2", GetWindowOrder(original_order,
+  // Move 3 (from the front) in front of 2.
+  list_provider->StackWindowFrontOf(window3.get(), window2.get());
+  EXPECT_EQ("2 3 1", GetWindowOrder(original_order,
                                     list_provider->GetWindowList()));
-  EXPECT_EQ(1, observer->calls());
+  EXPECT_EQ(2, observer->calls());
+
+  // Move 1 (from the front) behind 2.
+  list_provider->StackWindowBehindTo(window1.get(), window2.get());
+  EXPECT_EQ("1 2 3", GetWindowOrder(original_order,
+                                    list_provider->GetWindowList()));
+  EXPECT_EQ(3, observer->calls());
 
   // Move 1 (from the back) in front of 3.
   list_provider->StackWindowFrontOf(window1.get(), window3.get());
-  EXPECT_EQ("3 1 2", GetWindowOrder(original_order,
-                                    list_provider->GetWindowList()));
-  EXPECT_EQ(2, observer->calls());
-
-  // Move 2 (from the front) in front of 3.
-  list_provider->StackWindowFrontOf(window2.get(), window3.get());
-  EXPECT_EQ("3 2 1", GetWindowOrder(original_order,
-                                    list_provider->GetWindowList()));
-  EXPECT_EQ(3, observer->calls());
-
-  // Move 1 (from the front) behind 3.
-  list_provider->StackWindowBehindTo(window1.get(), window3.get());
-  EXPECT_EQ("1 3 2", GetWindowOrder(original_order,
+  EXPECT_EQ("2 3 1", GetWindowOrder(original_order,
                                     list_provider->GetWindowList()));
   EXPECT_EQ(4, observer->calls());
 
-  // Move 1 (from the back) in front of 2.
-  list_provider->StackWindowFrontOf(window1.get(), window2.get());
-  EXPECT_EQ("3 2 1", GetWindowOrder(original_order,
+  // Test that no change should also report no call.
+  list_provider->StackWindowFrontOf(window1.get(), window3.get());
+  EXPECT_EQ("2 3 1", GetWindowOrder(original_order,
                                     list_provider->GetWindowList()));
-  EXPECT_EQ(5, observer->calls());
-
-  // Test that no change should also report no call.
-  list_provider->StackWindowFrontOf(window1.get(), window2.get());
-  EXPECT_EQ("3 2 1", GetWindowOrder(original_order,
+  EXPECT_EQ(4, observer->calls());
+  list_provider->StackWindowBehindTo(window3.get(), window1.get());
+  EXPECT_EQ("2 3 1", GetWindowOrder(original_order,
                                     list_provider->GetWindowList()));
-  EXPECT_EQ(5, observer->calls());
-  list_provider->StackWindowBehindTo(window2.get(), window1.get());
-  EXPECT_EQ("3 2 1", GetWindowOrder(original_order,
-                                    list_provider->GetWindowList()));
-  EXPECT_EQ(5, observer->calls());
+  EXPECT_EQ(4, observer->calls());
 }
 
 TEST_F(WindowListProviderImplTest, TestWindowRemovalNotification) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> container(new aura::Window(&delegate));
 
   scoped_ptr<aura::Window> window1 =
       CreateWindow(&delegate, ui::wm::WINDOW_TYPE_NORMAL);
   scoped_ptr<aura::Window> window2 =
       CreateWindow(&delegate, ui::wm::WINDOW_TYPE_NORMAL);
@@ skipping 29 matching lines @@
   window1.reset();
   ASSERT_EQ(1U, list_provider->GetWindowList().size());
   EXPECT_EQ(2, observer->window_removal_calls());
 
   window3.reset();
   ASSERT_EQ(0U, list_provider->GetWindowList().size());
   EXPECT_EQ(3, observer->window_removal_calls());
 }
 
 }  // namespace athena