Update naming from OutputConfiguratorAnimation to DisplayConfiguratorAnimation

BUG=333413

Review URL: https://codereview.chromium.org/250163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266034 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 7 deletions

diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index f9e812c..5787568 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -98,7 +98,7 @@ void AshTestHelper::SetUp(bool start_session) {
 
   test::DisplayManagerTestApi(shell->display_manager()).
       DisableChangeDisplayUponHostResize();
-  ShellTestApi(shell).DisableOutputConfiguratorAnimation();
+  ShellTestApi(shell).DisableDisplayConfiguratorAnimation();
 
   test_screenshot_delegate_ = new TestScreenshotDelegate();
   shell->accelerator_controller()->SetScreenshotDelegate(
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index d44a137..0a7d4fd 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -9,7 +9,7 @@
 #include "ash/shell.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/display/output_configurator_animation.h"
+#include "ash/display/display_configurator_animation.h"
 #include "ui/display/chromeos/display_configurator.h"
 #endif
 
@@ -59,12 +59,12 @@ MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() {
   return shell_->maximize_mode_window_manager_.get();
 }
 
-void ShellTestApi::DisableOutputConfiguratorAnimation() {
+void ShellTestApi::DisableDisplayConfiguratorAnimation() {
 #if defined(OS_CHROMEOS)
-  if (shell_->output_configurator_animation_) {
+  if (shell_->display_configurator_animation_) {
     shell_->display_configurator_->RemoveObserver(
-        shell_->output_configurator_animation_.get());
-    shell_->output_configurator_animation_.reset();
+        shell_->display_configurator_animation_.get());
+    shell_->display_configurator_animation_.reset();
   }
 #endif  // defined(OS_CHROMEOS)
 }
diff --git a/ash/test/shell_test_api.h b/ash/test/shell_test_api.h
index 68c3749..7364397 100644
--- a/ash/test/shell_test_api.h
+++ b/ash/test/shell_test_api.h
@@ -41,7 +41,7 @@ public:
   DragDropController* drag_drop_controller();
   AppListController* app_list_controller();
   MaximizeModeWindowManager* maximize_mode_window_manager();
-  void DisableOutputConfiguratorAnimation();
+  void DisableDisplayConfiguratorAnimation();
 
   // Set ShelfDelegate.
   void SetShelfDelegate(ShelfDelegate* delegate);