Introduce DisplayConfigurationController

ash/test/shell_test_api.cc

Index: ash/test/shell_test_api.cc
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index c9a3bf467fe67a065be042b0df5b745c4b9fb7d4..7d13801310cdd288ee684bcea0cc95df906999a2 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -4,16 +4,12 @@
 
 #include "ash/test/shell_test_api.h"
 
+#include "ash/display/display_configuration_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shell.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/display/display_animator.h"
-#include "ui/display/chromeos/display_configurator.h"
-#endif
-
 namespace ash {
 namespace test {
 
@@ -52,13 +48,7 @@ AppListController* ShellTestApi::app_list_controller() {
 }
 
 void ShellTestApi::DisableDisplayAnimator() {
-#if defined(OS_CHROMEOS)
-  if (shell_->display_animator_) {
-    shell_->display_configurator_->RemoveObserver(
-        shell_->display_animator_.get());
-    shell_->display_animator_.reset();
-  }
-#endif  // defined(OS_CHROMEOS)
+  shell_->display_configuration_controller()->ResetAnimatorForTest();
 }
 
 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {