Fixed the ScreenOrientationController so that it doesn't crash by animating

ash/content/display/screen_orientation_controller_chromeos.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/content/display/screen_orientation_controller_chromeos.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/rotator/screen_rotation_animator.h"
@@ skipping 98 matching lines @@
       &ignore_display_configuration_updates_, true);
   display_manager->RegisterDisplayRotationProperties(rotation_locked_,
                                                      current_rotation_);
 }
 
 void ScreenOrientationController::SetDisplayRotation(
     gfx::Display::Rotation rotation) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!display_manager->HasInternalDisplay())
     return;
+
   current_rotation_ = rotation;
   base::AutoReset<bool> auto_ignore_display_configuration_updates(
       &ignore_display_configuration_updates_, true);
-  ash::ScreenRotationAnimator(gfx::Display::InternalDisplayId())
-      .Rotate(rotation);
+
+  ash::ScreenRotationAnimator screen_rotation_animator(
+      gfx::Display::InternalDisplayId());
+  if (screen_rotation_animator.CanAnimate()) {
+    screen_rotation_animator.Rotate(rotation);
+  } else {
+    // TODO(bruthig): Fix the DisplayManager so that display rotations set on
+    // inactive displays are persisted.  See www.crbug.com/480703.
+    Shell::GetInstance()->display_manager()->SetDisplayRotation(

[jonross, 2015/04/24 14:18:08]

Use the display manager from 116

[bruthig, 2015/04/24 16:17:12]

display manager no longer exists.

[jonross, 2015/04/24 17:08:30]

Acknowledged.

+        gfx::Display::InternalDisplayId(), rotation);
+  }
 }
 
 void ScreenOrientationController::OnWindowActivated(aura::Window* gained_active,
                                                     aura::Window* lost_active) {
   ApplyLockForActiveWindow();
 }
 
 // Currently contents::WebContents will only be able to lock rotation while
 // fullscreen. In this state a user cannot click on the tab strip to change. If
 // this becomes supported for non-fullscreen tabs then the following interferes
@@ skipping 282 matching lines @@
 }
 
 bool ScreenOrientationController::CanRotateInLockedState() {
   return rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockLandscape ||
          rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockPortrait;
 }
 
 }  // namespace ash