Fix crash when dragging a half width window to split view from overivew mode

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 268a3acf1d24e29ea391720991f10ac70ae26164..04eddc5e10b00e5f192fb5b31084f357029f5b58 100644
--- a/athena/wm/split_view_controller_unittest.cc
+++ b/athena/wm/split_view_controller_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "athena/wm/split_view_controller.h"
 
-#include "athena/common/fill_layout_manager.h"
 #include "athena/test/athena_test_base.h"
-#include "athena/wm/window_list_provider_impl.h"
+#include "athena/wm/public/window_list_provider.h"
+#include "athena/wm/test/window_manager_impl_test_api.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
@@ -22,49 +22,46 @@ TEST_F(SplitViewControllerTest, SplitModeActivation) {
   ScopedVector<aura::Window> windows;
   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);
+    scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());
+    windows.push_back(window.release());
   }
 
-  scoped_ptr<WindowListProvider> list_provider(
-      new WindowListProviderImpl(root_window()));
-  SplitViewController controller(root_window(), list_provider.get());
-  ASSERT_FALSE(controller.IsSplitViewModeActive());
+  test::WindowManagerImplTestApi api;
+  SplitViewController* controller = api.GetSplitViewController();
+  WindowListProvider* list_provider = api.GetWindowListProvider();
+  ASSERT_FALSE(controller->IsSplitViewModeActive());
 
-  controller.ActivateSplitMode(NULL, NULL);
-  ASSERT_TRUE(controller.IsSplitViewModeActive());
+  controller->ActivateSplitMode(NULL, NULL);
+  ASSERT_TRUE(controller->IsSplitViewModeActive());
   // The last two windows should be on the left and right, respectively.
-  EXPECT_EQ(windows[kNumWindows - 1], controller.left_window());
-  EXPECT_EQ(windows[kNumWindows - 2], controller.right_window());
+  EXPECT_EQ(windows[kNumWindows - 1], controller->left_window());
+  EXPECT_EQ(windows[kNumWindows - 2], controller->right_window());
 
   // Select the window that is currently on the left for the right panel. The
   // windows should switch.
-  controller.ActivateSplitMode(NULL, windows[kNumWindows - 1]);
-  EXPECT_EQ(windows[kNumWindows - 2], controller.left_window());
-  EXPECT_EQ(windows[kNumWindows - 1], controller.right_window());
+  controller->ActivateSplitMode(NULL, windows[kNumWindows - 1]);
+  EXPECT_EQ(windows[kNumWindows - 2], controller->left_window());
+  EXPECT_EQ(windows[kNumWindows - 1], controller->right_window());
 
-  controller.ActivateSplitMode(windows[kNumWindows - 1], NULL);
-  EXPECT_EQ(windows[kNumWindows - 1], controller.left_window());
-  EXPECT_EQ(windows[kNumWindows - 2], controller.right_window());
+  controller->ActivateSplitMode(windows[kNumWindows - 1], NULL);
+  EXPECT_EQ(windows[kNumWindows - 1], controller->left_window());
+  EXPECT_EQ(windows[kNumWindows - 2], controller->right_window());
 
   // Select one of the windows behind the stacks for the right panel. The window
   // on the left should remain unchanged.
-  controller.ActivateSplitMode(NULL, windows[0]);
-  EXPECT_EQ(windows[kNumWindows - 1], controller.left_window());
-  EXPECT_EQ(windows[0], controller.right_window());
+  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());
 
-  controller.ActivateSplitMode(windows[1], NULL);
-  EXPECT_EQ(windows[1], controller.left_window());
-  EXPECT_EQ(windows[0], controller.right_window());
+  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());
 
-  controller.ActivateSplitMode(windows[4], windows[5]);
-  EXPECT_EQ(windows[4], controller.left_window());
-  EXPECT_EQ(windows[5], controller.right_window());
+  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));
 }