Replace scoped_ptr with std::unique_ptr in //ui

ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc

Index: ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc
index ac50504dcb7298eb87e95eb0daaef928d854d231..cde379153b64eb4c48f5599d39809f0ec5588cbb 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc
@@ -4,12 +4,12 @@
 
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
 
+#include <fnmatch.h>
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
-
-#include <fnmatch.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <algorithm>
 
 #include "base/containers/hash_tables.h"
@@ -17,6 +17,7 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
@@ -611,7 +612,7 @@ namespace internal {
 // Mapping table from a property name to its corresponding GesturesProp
 // object pointer.
 typedef base::hash_map<std::string, GesturesProp*> PropertiesMap;
-typedef base::ScopedPtrHashMap<std::string, scoped_ptr<GesturesProp>>
+typedef base::ScopedPtrHashMap<std::string, std::unique_ptr<GesturesProp>>
     ScopedPropertiesMap;
 
 // Struct holding properties of a device.
@@ -716,8 +717,8 @@ struct ConfigurationSection {
   ConfigurationSection() {}
   bool Match(const DevicePtr device);
   std::string identifier;
-  std::vector<scoped_ptr<MatchCriteria>> criterias;
-  std::vector<scoped_ptr<GesturesProp>> properties;
+  std::vector<std::unique_ptr<MatchCriteria>> criterias;
+  std::vector<std::unique_ptr<GesturesProp>> properties;
 };
 
 MatchCriteria::MatchCriteria(const std::string& arg) {
@@ -932,9 +933,8 @@ void GesturePropertyProvider::RegisterDevice(const DeviceId id,
 
   // Setup data-structures.
   device_map_[id] = device;
-  device_data_map_.set(id,
-                       scoped_ptr<internal::GestureDevicePropertyData>(
-                           new internal::GestureDevicePropertyData));
+  device_data_map_.set(id, std::unique_ptr<internal::GestureDevicePropertyData>(
+                               new internal::GestureDevicePropertyData));
 
   // Gather default property values for the device from the parsed conf files.
   SetupDefaultProperties(id, device);
@@ -949,9 +949,10 @@ void GesturePropertyProvider::UnregisterDevice(const DeviceId id) {
   device_map_.erase(it);
 }
 
-void GesturePropertyProvider::AddProperty(const DeviceId device_id,
-                                          const std::string& name,
-                                          scoped_ptr<GesturesProp> property) {
+void GesturePropertyProvider::AddProperty(
+    const DeviceId device_id,
+    const std::string& name,
+    std::unique_ptr<GesturesProp> property) {
   // The look-up should never fail because ideally a property can only be
   // created with GesturesPropCreate* functions from the gesture lib side.
   // Therefore, we simply return on failure.
@@ -1040,7 +1041,7 @@ void GesturePropertyProvider::ParseXorgConfFile(const std::string& content) {
   for (size_t i = 0; i < sections.size(); ++i) {
     // Create a new configuration section.
     configurations_.push_back(
-        make_scoped_ptr(new internal::ConfigurationSection()));
+        base::WrapUnique(new internal::ConfigurationSection()));
     internal::ConfigurationSection* config = configurations_.back().get();
 
     // Break the section into lines.
@@ -1113,7 +1114,7 @@ void GesturePropertyProvider::ParseXorgConfFile(const std::string& content) {
             next_is_option_value = true;
             next_is_option_name = false;
           } else if (next_is_option_value) {
-            scoped_ptr<GesturesProp> property =
+            std::unique_ptr<GesturesProp> property =
                 CreateDefaultProperty(option_name, arg);
             if (property)
               config->properties.push_back(std::move(property));
@@ -1122,7 +1123,7 @@ void GesturePropertyProvider::ParseXorgConfFile(const std::string& content) {
           } else if (next_is_match_criteria) {
             // Skip all match types that are not supported.
             if (IsMatchTypeSupported(match_type)) {
-              scoped_ptr<internal::MatchCriteria> criteria =
+              std::unique_ptr<internal::MatchCriteria> criteria =
                   CreateMatchCriteria(match_type, arg);
               if (criteria)
                 config->criterias.push_back(std::move(criteria));
@@ -1170,13 +1171,13 @@ void GesturePropertyProvider::ParseXorgConfFile(const std::string& content) {
       // The value of a boolean option is skipped (default is true).
       if (!has_error && (next_is_option_value || next_is_match_criteria)) {
         if (next_is_option_value) {
-          scoped_ptr<GesturesProp> property =
+          std::unique_ptr<GesturesProp> property =
               CreateDefaultProperty(option_name, "on");
           if (property)
             config->properties.push_back(std::move(property));
         } else if (IsMatchTypeSupported(match_type) &&
                    IsMatchDeviceType(match_type)) {
-          scoped_ptr<internal::MatchCriteria> criteria =
+          std::unique_ptr<internal::MatchCriteria> criteria =
               CreateMatchCriteria(match_type, "on");
           if (criteria)
             config->criterias.push_back(std::move(criteria));
@@ -1192,27 +1193,27 @@ void GesturePropertyProvider::ParseXorgConfFile(const std::string& content) {
   }
 }
 
-scoped_ptr<internal::MatchCriteria>
+std::unique_ptr<internal::MatchCriteria>
 GesturePropertyProvider::CreateMatchCriteria(const std::string& match_type,
                                              const std::string& arg) {
   DVLOG(2) << "Creating match criteria: (" << match_type << ", " << arg << ")";
   if (match_type == "MatchProduct")
-    return make_scoped_ptr(new internal::MatchProduct(arg));
+    return base::WrapUnique(new internal::MatchProduct(arg));
   if (match_type == "MatchDevicePath")
-    return make_scoped_ptr(new internal::MatchDevicePath(arg));
+    return base::WrapUnique(new internal::MatchDevicePath(arg));
   if (match_type == "MatchUSBID")
-    return make_scoped_ptr(new internal::MatchUSBID(arg));
+    return base::WrapUnique(new internal::MatchUSBID(arg));
   if (match_type == "MatchIsPointer")
-    return make_scoped_ptr(new internal::MatchIsPointer(arg));
+    return base::WrapUnique(new internal::MatchIsPointer(arg));
   if (match_type == "MatchIsTouchpad")
-    return make_scoped_ptr(new internal::MatchIsTouchpad(arg));
+    return base::WrapUnique(new internal::MatchIsTouchpad(arg));
   if (match_type == "MatchIsTouchscreen")
-    return make_scoped_ptr(new internal::MatchIsTouchscreen(arg));
+    return base::WrapUnique(new internal::MatchIsTouchscreen(arg));
   NOTREACHED();
   return NULL;
 }
 
-scoped_ptr<GesturesProp> GesturePropertyProvider::CreateDefaultProperty(
+std::unique_ptr<GesturesProp> GesturePropertyProvider::CreateDefaultProperty(
     const std::string& name,
     const std::string& value) {
   // Our parsing rule:
@@ -1258,7 +1259,7 @@ scoped_ptr<GesturesProp> GesturePropertyProvider::CreateDefaultProperty(
 
   // Create the GesturesProp. Array properties need to contain at least one
   // number and may contain numbers only.
-  scoped_ptr<GesturesProp> property;
+  std::unique_ptr<GesturesProp> property;
   if (is_all_numeric && numbers.size()) {
     property.reset(new GesturesDoubleProp(name, numbers.size(), NULL,
                                           numbers.data(), NULL));
@@ -1339,7 +1340,7 @@ GesturesProp* GesturesPropFunctionsWrapper::CreateString(void* device_data,
     return NULL;
   GesturesProp* property =
       new GesturesStringProp(name, value, init, default_property);
-  PostCreateProperty(device_data, name, make_scoped_ptr(property));
+  PostCreateProperty(device_data, name, base::WrapUnique(property));
   return property;
 }
 
@@ -1461,7 +1462,7 @@ GesturesProp* GesturesPropFunctionsWrapper::CreateProperty(void* device_data,
       new PROPTYPE(name, count, value, init, default_property);
 
   // Start tracking the property in the provider.
-  PostCreateProperty(device_data, name, make_scoped_ptr(property));
+  PostCreateProperty(device_data, name, base::WrapUnique(property));
   return property;
 }
 
@@ -1496,7 +1497,7 @@ bool GesturesPropFunctionsWrapper::PreCreateProperty(
 void GesturesPropFunctionsWrapper::PostCreateProperty(
     void* device_data,
     const char* name,
-    scoped_ptr<GesturesProp> property) {
+    std::unique_ptr<GesturesProp> property) {
   // Log the creation.
   DVLOG(3) << "Created active prop: " << *property;