Replace scoped_ptr with std::unique_ptr in //ui

ui/display/chromeos/update_display_configuration_task_unittest.cc

 // 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.
 
 #include "ui/display/chromeos/update_display_configuration_task.h"
 
 #include <stddef.h>
+
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_layout_manager.h"
 #include "ui/display/chromeos/test/action_logger_util.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
 #include "ui/display/chromeos/test/test_native_display_delegate.h"
 
 namespace ui {
 namespace test {
@@ skipping 26 matching lines @@
 
   void set_should_mirror(bool should_mirror) { should_mirror_ = should_mirror; }
 
   void set_display_state(MultipleDisplayState state) { display_state_ = state; }
 
   void set_power_state(chromeos::DisplayPowerState state) {
     power_state_ = state;
   }
 
   void set_software_mirroring_controller(
-      scoped_ptr<DisplayConfigurator::SoftwareMirroringController>
+      std::unique_ptr<DisplayConfigurator::SoftwareMirroringController>
           software_mirroring_controller) {
     software_mirroring_controller_ = std::move(software_mirroring_controller);
   }
 
   // DisplayConfigurator::DisplayLayoutManager:
   DisplayConfigurator::SoftwareMirroringController*
   GetSoftwareMirroringController() const override {
     return software_mirroring_controller_.get();
   }
 
@@ skipping 60 matching lines @@
 
     return mode;
   }
 
   bool should_mirror_;
 
   MultipleDisplayState display_state_;
 
   chromeos::DisplayPowerState power_state_;
 
-  scoped_ptr<DisplayConfigurator::SoftwareMirroringController>
+  std::unique_ptr<DisplayConfigurator::SoftwareMirroringController>
       software_mirroring_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayLayoutManager);
 };
 
 class UpdateDisplayConfigurationTaskTest : public testing::Test {
  public:
   UpdateDisplayConfigurationTaskTest()
       : delegate_(&log_),
         small_mode_(gfx::Size(1366, 768), false, 60.0f),
@@ skipping 247 matching lines @@
       JoinActions(kGrab, GetFramebufferAction(small_mode_.size(), &displays_[0],
                                               nullptr).c_str(),
                   GetCrtcAction(displays_[0], nullptr, gfx::Point()).c_str(),
                   kUngrab, NULL),
       log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, NoopSoftwareMirrorConfiguration) {
   layout_manager_.set_should_mirror(false);
   layout_manager_.set_software_mirroring_controller(
-      make_scoped_ptr(new TestSoftwareMirroringController()));
+      base::WrapUnique(new TestSoftwareMirroringController()));
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
@@ skipping 13 matching lines @@
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED, display_state_);
   EXPECT_TRUE(layout_manager_.GetSoftwareMirroringController()
               ->SoftwareMirroringEnabled());
   EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL), log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest,
        ForceConfigurationWhileGoingToSoftwareMirror) {
   layout_manager_.set_should_mirror(false);
   layout_manager_.set_software_mirroring_controller(
-      make_scoped_ptr(new TestSoftwareMirroringController()));
+      base::WrapUnique(new TestSoftwareMirroringController()));
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
@@ skipping 21 matching lines @@
                                       &displays_[0], &displays_[1]).c_str(),
           GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
           GetCrtcAction(displays_[1], &big_mode_,
                         gfx::Point(0, small_mode_.size().height())).c_str(),
           kUngrab, NULL),
       log_.GetActionsAndClear());
 }
 
 }  // namespace test
 }  // namespace ui