Handles users rotating screen too early

ash/test/ash_test_helper.cc

 // Copyright 2013 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/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/test/wm_shell_test_api.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #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"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
@@ skipping 119 matching lines @@
     // ScreenLayoutObserver is specific to classic-ash.
     // Tests that change the display configuration generally don't care about
     // the notifications and the popup UI can interfere with things like
     // cursors.
     shell->screen_layout_observer()->set_show_notifications_for_testing(false);
 
     // DisplayManager is specific to classic-ash.
     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.
     test_screenshot_delegate_ = new TestScreenshotDelegate();
     shell->accelerator_controller_delegate()->SetScreenshotDelegate(
         std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
   }
 }
 
 void AshTestHelper::TearDown() {
@@ skipping 192 matching lines @@
   std::set<RootWindowController*> roots =
       window_manager_app_->window_manager()->GetRootWindowControllers();
   std::vector<RootWindowController*> ordered_roots;
   ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
   std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
   return ordered_roots;
 }
 
 }  // namespace test
 }  // namespace ash