Revert of Rename MaximizeMode to TabletMode

chrome/browser/extensions/display_info_provider_chromeos_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 "extensions/browser/api/system_display/display_info_provider.h"
 
 #include <stdint.h>
 
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/screen_orientation_controller_test_api.h"
-#include "ash/wm/tablet_mode/tablet_mode_controller.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/display_info_provider_chromeos.h"
 #include "extensions/common/api/system_display.h"
 #include "ui/display/display.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace extensions {
 namespace {
 
 using DisplayUnitInfoList = DisplayInfoProvider::DisplayUnitInfoList;
 using DisplayLayoutList = DisplayInfoProvider::DisplayLayoutList;
 
-void EnableTabletMode(bool enable) {
-  ash::Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(
-      enable);
+void EnableMaximizeMode(bool enable) {
+  ash::Shell::Get()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(enable);
 }
 
 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
  public:
   DisplayInfoProviderChromeosTest() {}
 
   ~DisplayInfoProviderChromeosTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 969 matching lines @@
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
 
   EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
   EXPECT_EQ(display::Display::ROTATE_0, secondary.rotation());
   EXPECT_EQ(display::Screen::GetScreen()->GetPrimaryDisplay().id(),
             secondary.id());
 }
 
-// Tests that rotation changes made before entering tablet mode are restored
-// upon exiting tablet mode, and that a rotation lock is not set.
-TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeTabletMode) {
+// Tests that rotation changes made before entering maximize mode are restored
+// upon exiting maximize mode, and that a rotation lock is not set.
+TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {
   ash::ScreenOrientationController* screen_orientation_controller =
       ash::Shell::Get()->screen_orientation_controller();
   api::system_display::DisplayProperties info;
   info.rotation.reset(new int(90));
 
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(
       base::Int64ToString(display::Display::InternalDisplayId()), info,
       &success, &error);
 
   ASSERT_TRUE(success);
   EXPECT_TRUE(error.empty());
   EXPECT_FALSE(screen_orientation_controller->rotation_locked());
 
-  // Entering tablet mode enables accelerometer screen rotations.
-  EnableTabletMode(true);
+  // Entering maximize mode enables accelerometer screen rotations.
+  EnableMaximizeMode(true);
   // Rotation lock should not activate because DisplayInfoProvider::SetInfo()
-  // was called when not in tablet mode.
+  // was called when not in maximize mode.
   EXPECT_FALSE(screen_orientation_controller->rotation_locked());
 
   // ScreenOrientationController rotations override display info.
   ash::test::ScreenOrientationControllerTestApi test_api(
       screen_orientation_controller);
   test_api.SetDisplayRotation(display::Display::ROTATE_0,
                               display::Display::ROTATION_SOURCE_ACTIVE);
   EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
 
-  // Exiting tablet mode should restore the initial rotation
-  EnableTabletMode(false);
+  // Exiting maximize mode should restore the initial rotation
+  EnableMaximizeMode(false);
   EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
 }
 
-// Tests that rotation changes made during tablet mode lock the display
+// Tests that rotation changes made during maximize mode lock the display
 // against accelerometer rotations, and is set as user rotation locked.
-TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringTabletMode) {
-  // Entering tablet mode enables accelerometer screen rotations.
-  EnableTabletMode(true);
+TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {
+  // Entering maximize mode enables accelerometer screen rotations.
+  EnableMaximizeMode(true);
 
   ASSERT_FALSE(
       ash::Shell::Get()->screen_orientation_controller()->rotation_locked());
   ASSERT_FALSE(ash::Shell::Get()
                    ->screen_orientation_controller()
                    ->user_rotation_locked());
 
   api::system_display::DisplayProperties info;
   info.rotation.reset(new int(90));
 
@@ skipping 481 matching lines @@
   EXPECT_EQ(pairs.pair1.touch_point.y, data.point_pairs[0].second.y());
   EXPECT_EQ(pairs.pair2.touch_point.y, data.point_pairs[1].second.y());
   EXPECT_EQ(pairs.pair3.touch_point.y, data.point_pairs[2].second.y());
   EXPECT_EQ(pairs.pair4.touch_point.y, data.point_pairs[3].second.y());
 
   EXPECT_EQ(bounds.width, data.bounds.width());
   EXPECT_EQ(bounds.height, data.bounds.height());
 }
 }  // namespace
 }  // namespace extensions