Revert of [Merge to M58] cros: Treat set rotation for chrome.system.display API in touchview mode as if user …

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/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
@@ skipping 14 matching lines @@
 #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 EnableMaximizeMode(bool enable) {
-  ash::Shell::GetInstance()
-      ->maximize_mode_controller()
-      ->EnableMaximizeModeWindowManager(enable);
-}
-
 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
  public:
   DisplayInfoProviderChromeosTest() {}
 
   ~DisplayInfoProviderChromeosTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFirstDisplayAsInternal);
     ash::test::AshTestBase::SetUp();
@@ skipping 870 matching lines @@
   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 maximize mode enables accelerometer screen rotations.
-  EnableMaximizeMode(true);
+  ash::WmShell::Get()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(true);
   // Rotation lock should not activate because DisplayInfoProvider::SetInfo()
   // 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 maximize mode should restore the initial rotation
-  EnableMaximizeMode(false);
+  ash::WmShell::Get()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(false);
   EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
 }
 
 // Tests that rotation changes made during maximize mode lock the display
-// against accelerometer rotations, and is set as user rotation locked.
+// against accelerometer rotations.
 TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {
   // Entering maximize mode enables accelerometer screen rotations.
-  EnableMaximizeMode(true);
+  ash::WmShell::Get()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(true);
 
   ASSERT_FALSE(ash::Shell::GetInstance()
                    ->screen_orientation_controller()
                    ->rotation_locked());
-  ASSERT_FALSE(ash::Shell::GetInstance()
-                   ->screen_orientation_controller()
-                   ->user_rotation_locked());
 
   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_TRUE(ash::Shell::GetInstance()
                   ->screen_orientation_controller()
                   ->rotation_locked());
-  EXPECT_TRUE(ash::Shell::GetInstance()
-                  ->screen_orientation_controller()
-                  ->user_rotation_locked());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetInvalidRotation) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const display::Display& secondary = display_manager()->GetSecondaryDisplay();
   api::system_display::DisplayProperties info;
   info.rotation.reset(new int(91));
 
   bool success = false;
@@ skipping 462 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