Fix crash when using title drag on a window opened while split view is active

athena/wm/window_manager_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/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/split_view_controller.h"
@@ skipping 89 matching lines @@
   EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->right_window());
   EXPECT_EQ(second->bounds().size().ToString(),
             third->bounds().size().ToString());
 }
 
 TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> first(CreateWindow(&delegate));
   scoped_ptr<aura::Window> second(CreateWindow(&delegate));
   scoped_ptr<aura::Window> third(CreateWindow(&delegate));
+  first->Hide();
+  second->Hide();
 
   test::WindowManagerImplTestApi wm_api;
   aura::client::ParentWindowWithContext(
       first.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   aura::client::ParentWindowWithContext(
       second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   aura::client::ParentWindowWithContext(
       third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
 
   EXPECT_EQ(third.get(),
             wm_api.GetWindowListProvider()->GetWindowList().back());
 
   // Do a two-finger swipe from the left bezel.
   ui::test::EventGenerator generator(root_window());
   const gfx::Point left_bezel_points[2] = {
       gfx::Point(2, 10), gfx::Point(4, 20),
   };
   const int kEventTimeSepration = 16;
   int width = root_window()->bounds().width();
   generator.GestureMultiFingerScroll(
       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());
 }
 
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
   scoped_ptr<aura::Window> first(CreateWindow(&delegate));
   scoped_ptr<aura::Window> second(CreateWindow(&delegate));
   scoped_ptr<aura::Window> third(CreateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
@@ skipping 117 matching lines @@
       second.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
 
   // Get into split view.
   wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL);
   const gfx::Rect left_bounds =
       wm_api.GetSplitViewController()->left_window()->bounds();
   EXPECT_NE(work_area.ToString(),
             left_bounds.size().ToString());
 
+  // A new window should replace the left window when in split view.
   scoped_ptr<aura::Window> third(CreateWindow(&delegate));
   aura::client::ParentWindowWithContext(
       third.get(), ScreenManager::Get()->GetContext(), gfx::Rect());
-  EXPECT_NE(wm_api.GetSplitViewController()->left_window(), third.get());
+  EXPECT_EQ(wm_api.GetSplitViewController()->left_window(), third.get());
   EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
-
-  third->Hide();
-  EXPECT_EQ(
-      left_bounds.ToString(),
-      wm_api.GetSplitViewController()->left_window()->bounds().ToString());
 }
 
 TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateTestWindow(&delegate, gfx::Rect()));
   w1->Show();
 
   ui::test::EventGenerator generator(root_window());
@@ skipping 38 matching lines @@
   EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_EQ(w3.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(w2.get(), wm_api.GetSplitViewController()->right_window());
 
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
   overview_delegate->OnSelectWindow(w1.get());
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
 }
 
 }  // namespace athena