Handles users rotating screen too early

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index f1a1e5cbab5879a22f2323aefeea82b1fcb630db..6fe92e614f95a323b0106b426b022eab6dc10d6c 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -18,7 +18,7 @@
 #include "ash/system/chromeos/screen_layout_observer.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_views_delegate.h"
-#include "ash/test/shell_test_api.h"
+#include "ash/test/display_configuration_controller_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/memory/ptr_util.h"
@@ -158,7 +158,9 @@ void AshTestHelper::SetUp(bool start_session) {
     display::test::DisplayManagerTestApi(
         Shell::GetInstance()->display_manager())
         .DisableChangeDisplayUponHostResize();
-    ShellTestApi(shell).DisableDisplayAnimator();
+    DisplayConfigurationControllerTestApi(
+        shell->display_configuration_controller())
+        .DisableDisplayAnimator();
 
     // TODO: disabled for mash as AcceleratorControllerDelegateAura isn't
     // created in mash http://crbug.com/632111.