Renamed OutputConfigurator to DisplayConfigurator

ash/test/shell_test_api.cc

 // Copyright (c) 2012 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/shell_test_api.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shell.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/output_configurator_animation.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace ash {
 namespace test {
 
 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
 
 RootWindowLayoutManager* ShellTestApi::root_window_layout() {
   return shell_->GetPrimaryRootWindowController()->root_window_layout();
 }
@@ skipping 31 matching lines @@
   return shell_->app_list_controller_.get();
 }
 
 MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() {
   return shell_->maximize_mode_window_manager_.get();
 }
 
 void ShellTestApi::DisableOutputConfiguratorAnimation() {
 #if defined(OS_CHROMEOS)
   if (shell_->output_configurator_animation_) {
-    shell_->output_configurator_->RemoveObserver(
+    shell_->display_configurator_->RemoveObserver(
         shell_->output_configurator_animation_.get());
     shell_->output_configurator_animation_.reset();
   }
 #endif  // defined(OS_CHROMEOS)
 }
 
 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {
   shell_->shelf_delegate_.reset(delegate);
 }
 
 }  // namespace test
 }  // namespace ash