Revert of Cros Tablet Window management - Split Screen part II

ash/wm/splitview/split_view_controller_unittest.cc

 // Copyright 2017 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 "ash/wm/splitview/split_view_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "ui/aura/test/test_window_delegate.h"
 
 namespace ash {
 
 class SplitViewControllerTest : public AshTestBase {
  public:
   SplitViewControllerTest() {}
   ~SplitViewControllerTest() override {}
 
   aura::Window* CreateWindow(const gfx::Rect& bounds) {
     aura::Window* window =
         CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds);
     return window;
   }
 
   void EndSplitView() { split_view_controller()->EndSplitView(); }
 
-  void ToggleOverview() {
-    Shell::Get()->window_selector_controller()->ToggleOverview();
-  }
-
-  std::vector<aura::Window*> GetWindowsInOverviewGrids() {
-    return Shell::Get()
-        ->window_selector_controller()
-        ->GetWindowsListInOverviewGridsForTesting();
-  }
-
   SplitViewController* split_view_controller() {
     return Shell::Get()->split_view_controller();
   }
 
  private:
   aura::test::TestWindowDelegate delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SplitViewControllerTest);
 };
 
 // Tests the basic functionalities.
 TEST_F(SplitViewControllerTest, Basic) {
   const gfx::Rect bounds(0, 0, 400, 400);
   std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
   std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
 
   EXPECT_EQ(split_view_controller()->state(), SplitViewController::NO_SNAP);
   EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), false);
 
   split_view_controller()->SnapWindow(window1.get(), SplitViewController::LEFT);
   EXPECT_EQ(split_view_controller()->state(),
             SplitViewController::LEFT_SNAPPED);
   EXPECT_EQ(split_view_controller()->left_window(), window1.get());
   EXPECT_NE(split_view_controller()->left_window(), window2.get());
   EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), true);
   EXPECT_EQ(window1->GetBoundsInScreen(),
             split_view_controller()->GetSnappedWindowBoundsInScreen(
-                window1.get(), SplitViewController::LEFT));
+                window1.get(), SplitViewController::LEFT_SNAPPED));
 
   split_view_controller()->SnapWindow(window2.get(),
                                       SplitViewController::RIGHT);
   EXPECT_EQ(split_view_controller()->state(),
             SplitViewController::BOTH_SNAPPED);
   EXPECT_EQ(split_view_controller()->right_window(), window2.get());
   EXPECT_NE(split_view_controller()->right_window(), window1.get());
   EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), true);
   EXPECT_EQ(window2->GetBoundsInScreen(),
             split_view_controller()->GetSnappedWindowBoundsInScreen(
-                window2.get(), SplitViewController::RIGHT));
+                window2.get(), SplitViewController::RIGHT_SNAPPED));
 
   EndSplitView();
   EXPECT_EQ(split_view_controller()->state(), SplitViewController::NO_SNAP);
   EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), false);
 }
 
 // Tests that the default snapped window is the first window that gets snapped.
 TEST_F(SplitViewControllerTest, DefaultSnappedWindow) {
   const gfx::Rect bounds(0, 0, 400, 400);
   std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
@@ skipping 75 matching lines @@
   EXPECT_EQ(split_view_controller()->right_window(), window2.get());
   EXPECT_EQ(split_view_controller()->state(),
             SplitViewController::BOTH_SNAPPED);
 
   wm::ActivateWindow(window3.get());
   EXPECT_EQ(split_view_controller()->right_window(), window3.get());
   EXPECT_EQ(split_view_controller()->state(),
             SplitViewController::BOTH_SNAPPED);
 }
 
-// Tests that if split view mode and overview mode are active at the same time,
-// i.e., half of the screen is occupied by a snapped window and half of the
-// screen is occupied by the overview windows grid, the next activatable window
-// will be picked to snap when exiting the overview mode.
-TEST_F(SplitViewControllerTest, ExitOverviewTest) {
-  const gfx::Rect bounds(0, 0, 400, 400);
-  std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
-  std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
-  std::unique_ptr<aura::Window> window3(CreateWindow(bounds));
-  EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), false);
-
-  ToggleOverview();
-  split_view_controller()->SnapWindow(window1.get(), SplitViewController::LEFT);
-  EXPECT_EQ(split_view_controller()->IsSplitViewModeActive(), true);
-  EXPECT_EQ(split_view_controller()->state(),
-            SplitViewController::LEFT_SNAPPED);
-  EXPECT_EQ(split_view_controller()->left_window(), window1.get());
-
-  ToggleOverview();
-  EXPECT_EQ(split_view_controller()->state(),
-            SplitViewController::BOTH_SNAPPED);
-  EXPECT_EQ(split_view_controller()->right_window(), window3.get());
-}
-
-// Tests that if split view mode is active when entering overview, the overview
-// windows grid should show in the non-default side of the screen, and the
-// default snapped window should not be shown in the overview window grid.
-TEST_F(SplitViewControllerTest, EnterOverviewTest) {
-  const gfx::Rect bounds(0, 0, 400, 400);
-  std::unique_ptr<aura::Window> window1(CreateWindow(bounds));
-  std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
-  std::unique_ptr<aura::Window> window3(CreateWindow(bounds));
-
-  split_view_controller()->SnapWindow(window1.get(), SplitViewController::LEFT);
-  split_view_controller()->SnapWindow(window2.get(),
-                                      SplitViewController::RIGHT);
-  EXPECT_EQ(split_view_controller()->state(),
-            SplitViewController::BOTH_SNAPPED);
-  EXPECT_EQ(split_view_controller()->GetDefaultSnappedWindow(), window1.get());
-
-  ToggleOverview();
-  EXPECT_EQ(split_view_controller()->state(),
-            SplitViewController::LEFT_SNAPPED);
-  std::vector<aura::Window*> windows = GetWindowsInOverviewGrids();
-  auto iter = std::find(windows.begin(), windows.end(),
-                        split_view_controller()->GetDefaultSnappedWindow());
-  EXPECT_TRUE(iter == windows.end());
-}
-
 }  // namespace ash