Revert "Speculative revert by sheriff"

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/ash_switches.h"
 #include "ash/content/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 571 matching lines @@
   delegate()->Unlock(content.get());
 
   SetRotationLocked(true);
   EXPECT_TRUE(RotationLocked());
   EXPECT_EQ(gfx::Display::ROTATE_0, Rotation());
 
   TriggerLidUpdate(gfx::Vector3dF(0.0f, kMeanGravity, 0.0f));
   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