Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1486)

Unified Diff: ash/content/display/screen_orientation_controller_chromeos_unittest.cc

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/content/display/screen_orientation_controller_chromeos_unittest.cc
diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
index 342e9585b8e2a104d96fbf366eb3bcf35735a74e..ca02ca3a1b6e0a37b3745fe0401b1679ca6f210c 100644
--- a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
+++ b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
@@ -589,23 +589,4 @@ TEST_F(ScreenOrientationControllerTest, UserRotationLockDisallowsRotation) {
EXPECT_EQ(gfx::Display::ROTATE_0, GetInternalDisplayRotation());
}
-// 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) {
- int64 internal_display_id = gfx::Display::InternalDisplayId();
- gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
-
- EnableMaximizeMode(true);
-
- // Should not crash, even thought there is no internal display.
- SetInternalDisplayRotation(gfx::Display::ROTATE_180);
- EXPECT_FALSE(RotationLocked());
-
- // With an internal display now available, functionality should resume.
- gfx::Display::SetInternalDisplayId(internal_display_id);
- SetInternalDisplayRotation(gfx::Display::ROTATE_90);
- EXPECT_TRUE(RotationLocked());
-}
-
} // namespace ash
« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos.cc ('k') | build/android/buildbot/bb_host_steps.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698