[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

Index: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
index b0d97ccabc0498216ec2df6ef3c152f94267bfa1..979daf8bd0c65b1e12b06393e20810f4638584f7 100644
--- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
+++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
@@ -32,6 +32,12 @@ namespace {
 using DisplayUnitInfoList = DisplayInfoProvider::DisplayUnitInfoList;
 using DisplayLayoutList = DisplayInfoProvider::DisplayLayoutList;
 
+void EnableMaximizeMode(bool enable) {
+  ash::WmShell::Get()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(enable);
+}
+
 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
  public:
   DisplayInfoProviderChromeosTest() {}
@@ -922,9 +928,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {
   EXPECT_FALSE(screen_orientation_controller->rotation_locked());
 
   // Entering maximize mode enables accelerometer screen rotations.
-  ash::WmShell::Get()
-      ->maximize_mode_controller()
-      ->EnableMaximizeModeWindowManager(true);
+  EnableMaximizeMode(true);
   // Rotation lock should not activate because DisplayInfoProvider::SetInfo()
   // was called when not in maximize mode.
   EXPECT_FALSE(screen_orientation_controller->rotation_locked());
@@ -937,23 +941,22 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {
   EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
 
   // Exiting maximize mode should restore the initial rotation
-  ash::WmShell::Get()
-      ->maximize_mode_controller()
-      ->EnableMaximizeModeWindowManager(false);
+  EnableMaximizeMode(false);
   EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
 }
 
 // Tests that rotation changes made during maximize mode lock the display
-// against accelerometer rotations.
+// against accelerometer rotations, and is set as user rotation locked.
 TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {
   // Entering maximize mode enables accelerometer screen rotations.
-  ash::WmShell::Get()
-      ->maximize_mode_controller()
-      ->EnableMaximizeModeWindowManager(true);
+  EnableMaximizeMode(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));
@@ -969,6 +972,9 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {
   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) {