Replace scoped_ptr with std::unique_ptr in //ui

ui/events/x/events_x_unittest.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 <stddef.h>
-#include <stdint.h>
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XInput2.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <cstring>
+#include <memory>
 #include <set>
 #include <utility>
 
 // Generically-named #defines from Xlib that conflict with symbols in GTest.
 #undef Bool
 #undef None
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/events_test_utils.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #include "ui/events/x/events_x_utils.h"
@@ skipping 288 matching lines @@
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<Valuator> valuators;
 
   const int kTrackingId = 5;
 
   // Two touch presses with the same tracking id.
   ui::ScopedXI2Event xpress0;
   xpress0.InitTouchEvent(
       0, XI_TouchBegin, kTrackingId, gfx::Point(10, 10), valuators);
-  scoped_ptr<ui::TouchEvent> upress0(new ui::TouchEvent(xpress0));
+  std::unique_ptr<ui::TouchEvent> upress0(new ui::TouchEvent(xpress0));
   EXPECT_EQ(0, GetTouchIdForTrackingId(kTrackingId));
 
   ui::ScopedXI2Event xpress1;
   xpress1.InitTouchEvent(
       0, XI_TouchBegin, kTrackingId, gfx::Point(20, 20), valuators);
   ui::TouchEvent upress1(xpress1);
   EXPECT_EQ(0, GetTouchIdForTrackingId(kTrackingId));
 
   // The first touch release shouldn't clear the mapping from the
   // tracking id.
@@ skipping 41 matching lines @@
 // that an exception list of keys can still be processed.
 TEST_F(EventsXTest, DisableKeyboard) {
   DeviceDataManagerX11* device_data_manager =
       static_cast<DeviceDataManagerX11*>(
           DeviceDataManager::GetInstance());
   int blocked_device_id = 1;
   int other_device_id = 2;
   int master_device_id = 3;
   device_data_manager->DisableDevice(blocked_device_id);
 
-  scoped_ptr<std::set<KeyboardCode> > excepted_keys(new std::set<KeyboardCode>);
+  std::unique_ptr<std::set<KeyboardCode>> excepted_keys(
+      new std::set<KeyboardCode>);
   excepted_keys->insert(VKEY_B);
   device_data_manager->SetDisabledKeyboardAllowedKeys(std::move(excepted_keys));
 
   ScopedXI2Event xev;
   // A is not allowed on the blocked keyboard, and should return ET_UNKNOWN.
   xev.InitGenericKeyEvent(master_device_id,
                           blocked_device_id,
                           ui::ET_KEY_PRESSED,
                           ui::VKEY_A,
                           0);
@@ skipping 139 matching lines @@
             ui::EventTimeFromNative(&event).ToInternalValue());
   event.xbutton.time = 2;
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(2).ToInternalValue(),
             ui::EventTimeFromNative(&event).ToInternalValue());
   event.xbutton.time = 0xFFFFFFFF;
   EXPECT_EQ(base::TimeDelta::FromMilliseconds(0xFFFFFFFF).ToInternalValue(),
             ui::EventTimeFromNative(&event).ToInternalValue());
 }
 
 }  // namespace ui