Introduce DisplayConfigurationController

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/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 "ash/display/display_configuration_controller.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 22 matching lines @@
 DragDropController* ShellTestApi::drag_drop_controller() {
   return shell_->drag_drop_controller_.get();
 }
 
 AppListController* ShellTestApi::app_list_controller() {
   return shell_->app_list_controller_.get();
 }
 
 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)
 }
 
 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {
   shell_->shelf_delegate_.reset(delegate);
 }
 
 void ShellTestApi::SetSessionStateDelegate(
     SessionStateDelegate* session_state_delegate) {
   shell_->session_state_delegate_.reset(session_state_delegate);
 }
 
 }  // namespace test
 }  // namespace ash