Make ui::DisplayConfigurator a singleton

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 501 matching lines @@
   // Starts the animation that occurs on first login.
   void DoInitialWorkspaceAnimation();
 
   MaximizeModeController* maximize_mode_controller() {
     return maximize_mode_controller_.get();
   }
 
 #if defined(OS_CHROMEOS)
   // TODO(oshima): Move these objects to DisplayController.
   ui::DisplayConfigurator* display_configurator() {
-    return display_configurator_.get();
+    return display_configurator_;
   }
   DisplayConfiguratorAnimation* display_configurator_animation() {
     return display_configurator_animation_.get();
   }
   DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
 
   ResolutionNotificationController* resolution_notification_controller() {
     return resolution_notification_controller_.get();
@@ skipping 184 matching lines @@
   scoped_ptr<StickyKeysController> sticky_keys_controller_;
   scoped_ptr<ResolutionNotificationController>
       resolution_notification_controller_;
   scoped_ptr<BluetoothNotificationController>
       bluetooth_notification_controller_;
   scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
   scoped_ptr<LastWindowClosedLogoutReminder>
       last_window_closed_logout_reminder_;
   scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
   // Controls video output device state.
-  scoped_ptr<ui::DisplayConfigurator> display_configurator_;
+  // Bare pointer as is a singleton.
+  ui::DisplayConfigurator* display_configurator_;
   scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
   scoped_ptr<DisplayErrorObserver> display_error_observer_;
   scoped_ptr<ProjectingObserver> projecting_observer_;
 
   // Listens for output changes and updates the display manager.
   scoped_ptr<DisplayChangeObserver> display_change_observer_;
 
   // Implements content::ScreenOrientationController for ChromeOS
   scoped_ptr<ScreenOrientationController> screen_orientation_controller_;
 
@@ skipping 26 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_