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

athena/wm/split_view_controller_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/split_view_controller.h"
 
-#include "athena/common/fill_layout_manager.h"
+#include "athena/screen/public/screen_manager.h"
 #include "athena/test/athena_test_base.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"
 
 namespace athena {
 
 typedef test::AthenaTestBase SplitViewControllerTest;
 
 // Tests that when split mode is activated, the windows on the left and right
 // are selected correctly.
 TEST_F(SplitViewControllerTest, SplitModeActivation) {
+  aura::Window* container = ScreenManager::Get()->CreateContainer(
+      ScreenManager::ContainerParams("Test", 0));
+
   aura::test::TestWindowDelegate delegate;
   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);
+    container->AddChild(window);

[sadrul, 2014/08/21 16:04:04]

There's now a AthenaTestBase::CreateTestWindow(). Can you use that instead to
create+parent the window?

     windows.push_back(window);
   }
 
   scoped_ptr<WindowListProvider> list_provider(
-      new WindowListProviderImpl(root_window()));
-  SplitViewController controller(root_window(), list_provider.get());
+      new WindowListProviderImpl(container));
+  SplitViewController controller(container, list_provider.get());

[sadrul, 2014/08/21 16:04:04]

Instead of creating this new SVC here, perhaps you could expose
WindowManagerImplTestApi (from window_manager_unittest.cc) and use that to get
the SVC of the WMImpl instead (next patch, perhaps).

   ASSERT_FALSE(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());
 
   // Select the window that is currently on the left for the right panel. The
   // windows should switch.
@@ skipping 18 matching lines @@
   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));
 }
 
 }  // namespace athena