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..f927848aeb3e62c8227b75f8d2ed0645ac91093a 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -10,7 +10,7 @@
 #include "ash/shell.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/display/display_animator.h"
+#include "ash/display/display_configuration_controller.h"
 #include "ui/display/chromeos/display_configurator.h"
 #endif
 
@@ -53,11 +53,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();
-  }
+  shell_->display_configuration_controller()->ResetAnimatorForTest();
 #endif  // defined(OS_CHROMEOS)
 }