athena: A simpler implementation of WindowListProvider.

athena/wm/split_view_controller_unittest.cc

Index: athena/wm/split_view_controller_unittest.cc
diff --git a/athena/wm/split_view_controller_unittest.cc b/athena/wm/split_view_controller_unittest.cc
index 36b244ca9299df5d75ff8643f64d790e7f60fd8b..78e44dbc6661bd998e15f0676c06b78f192078fb 100644
--- a/athena/wm/split_view_controller_unittest.cc
+++ b/athena/wm/split_view_controller_unittest.cc
@@ -7,6 +7,7 @@
 #include "athena/common/fill_layout_manager.h"
 #include "athena/test/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
+#include "athena/wm/window_list_provider_impl.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ -15,28 +16,6 @@ namespace athena {
 
 typedef test::AthenaTestBase SplitViewControllerTest;
 
-class SimpleWindowListProvider : public WindowListProvider {
- public:
-  explicit SimpleWindowListProvider(aura::Window* container)
-      : container_(container) {}
-  virtual ~SimpleWindowListProvider() {}
-
-  // WindowListProvider:
-  virtual aura::Window::Windows GetWindowList() const OVERRIDE {
-    return container_->children();
-  }
-
-  virtual void MoveToFront(aura::Window* window) OVERRIDE {
-    CHECK_EQ(container_, window->parent());
-    container_->StackChildAtTop(window);
-  }
-
- private:
-  aura::Window* container_;
-
-  DISALLOW_COPY_AND_ASSIGN(SimpleWindowListProvider);
-};
-
 // Tests that when split mode is activated, the windows on the left and right
 // are selected correctly.
 TEST_F(SplitViewControllerTest, SplitModeActivation) {
@@ -45,13 +24,15 @@ TEST_F(SplitViewControllerTest, SplitModeActivation) {
   const int kNumWindows = 6;
   for (size_t i = 0; i < kNumWindows; ++i) {
     aura::Window* window = new aura::Window(&delegate);
+    window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(aura::WINDOW_LAYER_SOLID_COLOR);
     root_window()->AddChild(window);
     windows.push_back(window);
   }
 
-  SimpleWindowListProvider list_provider(root_window());
-  SplitViewController controller(root_window(), &list_provider, NULL);
+  scoped_ptr<WindowListProvider> list_provider(
+      new WindowListProviderImpl(root_window()));
+  SplitViewController controller(root_window(), list_provider.get());
   ASSERT_FALSE(controller.IsSplitViewModeActive());
 
   controller.ActivateSplitMode(NULL, NULL);
@@ -75,18 +56,18 @@ TEST_F(SplitViewControllerTest, SplitModeActivation) {
   controller.ActivateSplitMode(NULL, windows[0]);
   EXPECT_EQ(windows[kNumWindows - 1], controller.left_window());
   EXPECT_EQ(windows[0], controller.right_window());
-  EXPECT_EQ(windows[0], *list_provider.GetWindowList().rbegin());
+  EXPECT_EQ(windows[0], *list_provider->GetWindowList().rbegin());
 
   controller.ActivateSplitMode(windows[1], NULL);
   EXPECT_EQ(windows[1], controller.left_window());
   EXPECT_EQ(windows[0], controller.right_window());
-  EXPECT_EQ(windows[1], *list_provider.GetWindowList().rbegin());
+  EXPECT_EQ(windows[1], *list_provider->GetWindowList().rbegin());
 
   controller.ActivateSplitMode(windows[4], windows[5]);
   EXPECT_EQ(windows[4], controller.left_window());
   EXPECT_EQ(windows[5], controller.right_window());
-  EXPECT_EQ(windows[4], *list_provider.GetWindowList().rbegin());
-  EXPECT_EQ(windows[5], *(list_provider.GetWindowList().rbegin() + 1));
+  EXPECT_EQ(windows[4], *list_provider->GetWindowList().rbegin());
+  EXPECT_EQ(windows[5], *(list_provider->GetWindowList().rbegin() + 1));
 }
 
 }  // namespace athena