Replace scoped_ptr with std::unique_ptr in //ui

ui/display/chromeos/display_configurator.h

 // Copyright 2014 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 UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
+#include <memory>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/event_types.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/display/chromeos/display_snapshot_virtual.h"
 #include "ui/display/chromeos/query_content_protection_task.h"
 #include "ui/display/display_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/display/types/native_display_observer.h"
@@ skipping 159 matching lines @@
   void set_state_controller(StateController* controller) {
     state_controller_ = controller;
   }
   void set_mirroring_controller(SoftwareMirroringController* controller) {
     mirroring_controller_ = controller;
   }
 
   // Replaces |native_display_delegate_| with the delegate passed in and sets
   // |configure_display_| to true. Should be called before Init().
   void SetDelegateForTesting(
-      scoped_ptr<NativeDisplayDelegate> display_delegate);
+      std::unique_ptr<NativeDisplayDelegate> display_delegate);
 
   // Sets the initial value of |power_state_|.  Must be called before Start().
   void SetInitialDisplayPower(chromeos::DisplayPowerState power_state);
 
   // Initialization, must be called right after constructor.
   // |is_panel_fitting_enabled| indicates hardware panel fitting support.
   void Init(bool is_panel_fitting_enabled);
 
   // Does initial configuration of displays during startup.
   // If |background_color_argb| is non zero and there are multiple displays,
@@ skipping 85 matching lines @@
                           const std::vector<float>& correction_matrix);
 
  private:
   class DisplayLayoutManagerImpl;
 
   // Mapping a client to its protection request.
   typedef std::map<ContentProtectionClientId, ContentProtections>
       ProtectionRequests;
 
   // Performs platform specific delegate initialization.
-  scoped_ptr<NativeDisplayDelegate> CreatePlatformNativeDisplayDelegate();
+  std::unique_ptr<NativeDisplayDelegate> CreatePlatformNativeDisplayDelegate();
 
   // Configures displays. Invoked by |configure_timer_|.
   void ConfigureDisplays();
 
   // Restores |requested_power_state_| after the system has resumed,
   // additionally forcing a probe. Invoked by |configure_timer_|.
   void RestoreRequestedPowerStateAfterResume();
 
   // Notifies observers about an attempted state change.
   void NotifyDisplayStateObservers(bool success,
@@ skipping 49 matching lines @@
 
   // Callbacks used to signal when the native platform has released/taken
   // display control.
   void OnDisplayControlTaken(const DisplayControlCallback& callback,
                              bool success);
   void OnDisplayControlRelinquished(const DisplayControlCallback& callback,
                                     bool success);
 
   StateController* state_controller_;
   SoftwareMirroringController* mirroring_controller_;
-  scoped_ptr<NativeDisplayDelegate> native_display_delegate_;
+  std::unique_ptr<NativeDisplayDelegate> native_display_delegate_;
 
   // Used to enable modes which rely on panel fitting.
   bool is_panel_fitting_enabled_;
 
   // This is detected by the constructor to determine whether or not we should
   // be enabled.  If we aren't running on Chrome OS, we can't assume that the
   // Xrandr X11 extension or the Ozone underlying display hotplug system are
   // supported.
   // If this flag is set to false, any attempts to change the display
   // configuration to immediately fail without changing the state.
@@ skipping 63 matching lines @@
 
   // Whether the displays are currently suspended.
   bool displays_suspended_;
 
   // Virtual display control.
   ScopedVector<DisplaySnapshot> virtual_display_snapshots_;
 
   // Last used virtual display id.
   uint8_t last_virtual_display_id_ = 0;
 
-  scoped_ptr<DisplayLayoutManager> layout_manager_;
+  std::unique_ptr<DisplayLayoutManager> layout_manager_;
 
-  scoped_ptr<UpdateDisplayConfigurationTask> configuration_task_;
+  std::unique_ptr<UpdateDisplayConfigurationTask> configuration_task_;
 
   // This must be the last variable.
   base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_