Don't lock and save the orientation change made not through ScreenOrientationController

ash/content/display/screen_orientation_controller_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 "ash/display/screen_orientation_controller_chromeos.h"
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 492 matching lines @@
   SetInternalDisplayRotation(display::Display::ROTATE_90);
   EnableMaximizeMode(true);
 
   TriggerLidUpdate(gfx::Vector3dF(0.0f, kMeanGravity, 0.0f));
   EXPECT_EQ(display::Display::ROTATE_180, GetCurrentInternalDisplayRotation());
 
   EnableMaximizeMode(false);
   EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
 }
 
-// Tests that if a user sets a display rotation that accelerometer rotation
-// becomes locked.
-TEST_F(ScreenOrientationControllerTest,
-       NonAccelerometerRotationChangesLockRotation) {
-  EnableMaximizeMode(true);
-  ASSERT_FALSE(RotationLocked());
-  SetInternalDisplayRotation(display::Display::ROTATE_270);
-  EXPECT_TRUE(RotationLocked());
-}
-
 // Tests that if a user changes the display rotation, while rotation is locked,
 // that the updates are recorded. Upon exiting maximize mode the latest user
 // rotation should be applied.
 TEST_F(ScreenOrientationControllerTest, UpdateUserRotationWhileRotationLocked) {
   EnableMaximizeMode(true);
   SetInternalDisplayRotation(display::Display::ROTATE_270);
   // User sets rotation to the same rotation that the display was at when
   // maximize mode was activated.
   SetInternalDisplayRotation(display::Display::ROTATE_0);
   EnableMaximizeMode(false);
@@ skipping 81 matching lines @@
 
   SetUserRotationLocked(true);
   EXPECT_TRUE(RotationLocked());
   EXPECT_TRUE(UserRotationLocked());
 
   EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
   TriggerLidUpdate(gfx::Vector3dF(0.0f, kMeanGravity, 0.0f));
   EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
 }
 
-// Tests that when MaximizeMode is triggered before the internal display is
-// ready, that ScreenOrientationController still begins listening to events,
-// which require an internal display to be acted upon.
-TEST_F(ScreenOrientationControllerTest, InternalDisplayNotAvailableAtStartup) {
-  display::test::DisplayManagerTestApi(display_manager())
-      .SetFirstDisplayAsInternalDisplay();
-
-  int64_t internal_display_id = display::Display::InternalDisplayId();
-  display::Display::SetInternalDisplayId(display::kInvalidDisplayId);
-
-  EnableMaximizeMode(true);
-
-  // Should not crash, even though there is no internal display.
-  SetDisplayRotationById(internal_display_id, display::Display::ROTATE_180);
-  EXPECT_FALSE(RotationLocked());
-
-  // Should not crash, even though the invalid display id is requested.
-  SetDisplayRotationById(display::kInvalidDisplayId,
-                         display::Display::ROTATE_180);
-  EXPECT_FALSE(RotationLocked());
-
-  // With an internal display now available, functionality should resume.
-  display::Display::SetInternalDisplayId(internal_display_id);
-  SetInternalDisplayRotation(display::Display::ROTATE_90);
-  EXPECT_TRUE(RotationLocked());
-}
-
 // Verifies rotating an inactive Display is successful.
 TEST_F(ScreenOrientationControllerTest, RotateInactiveDisplay) {
   const int64_t kInternalDisplayId = 9;
   const int64_t kExternalDisplayId = 10;
   const display::Display::Rotation kNewRotation = display::Display::ROTATE_180;
 
   const display::ManagedDisplayInfo internal_display_info =
       CreateDisplayInfo(kInternalDisplayId, gfx::Rect(0, 0, 500, 500));
   const display::ManagedDisplayInfo external_display_info =
       CreateDisplayInfo(kExternalDisplayId, gfx::Rect(1, 1, 500, 500));
@@ skipping 127 matching lines @@
   delegate()->Lock(content2.get(), blink::kWebScreenOrientationLockLandscape);
   EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
 
   delegate()->Lock(content1.get(), blink::kWebScreenOrientationLockAny);
   activation_client->ActivateWindow(focus_window1.get());
   // Switching back to any will rotate to user rotation.
   EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
 }
 
 }  // namespace ash