Re-write many calls to WrapUnique() with MakeUnique()

components/sync/protocol/proto_value_conversions.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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "components/sync/protocol/proto_value_conversions.h"
 
 #include <stdint.h>
 
@@ skipping 36 matching lines @@
 #include "components/sync/protocol/typed_url_specifics.pb.h"
 #include "components/sync/protocol/unique_position.pb.h"
 
 namespace syncer {
 
 namespace {
 
 // Basic Type -> Value functions.
 
 std::unique_ptr<base::StringValue> MakeInt64Value(int64_t x) {
-  return base::WrapUnique(new base::StringValue(base::Int64ToString(x)));
+  return base::MakeUnique<base::StringValue>(base::Int64ToString(x));
 }
 
 // TODO(akalin): Perhaps make JSONWriter support BinaryValue and use
 // that instead of a StringValue.
 std::string Base64EncodeString(const std::string& bytes) {
   std::string bytes_base64;
   base::Base64Encode(bytes, &bytes_base64);
   return bytes_base64;
 }
 
 std::unique_ptr<base::StringValue> MakeStringValue(const std::string& str) {
-  return base::WrapUnique(new base::StringValue(str));
+  return base::MakeUnique<base::StringValue>(str);
 }
 
 // T is the field type, F is either RepeatedField or RepeatedPtrField,
 // and V is a subclass of Value.
 template <class T, class F, class V>
 std::unique_ptr<base::ListValue> MakeRepeatedValue(const F& fields,
                                                    V (*converter_fn)(T)) {
   std::unique_ptr<base::ListValue> list(new base::ListValue());
   for (typename F::const_iterator it = fields.begin(); it != fields.end();
        ++it) {
@@ skipping 540 matching lines @@
 std::unique_ptr<base::DictionaryValue> PriorityPreferenceSpecificsToValue(
     const sync_pb::PriorityPreferenceSpecifics& specifics) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   SET_FIELD(preference, PreferenceSpecificsToValue);
   return value;
 }
 
 std::unique_ptr<base::DictionaryValue>
 SyncedNotificationAppInfoSpecificsToValue(
     const sync_pb::SyncedNotificationAppInfoSpecifics& proto) {
-  return base::WrapUnique(new base::DictionaryValue());
+  return base::MakeUnique<base::DictionaryValue>();
 }
 
 std::unique_ptr<base::DictionaryValue> SyncedNotificationSpecificsToValue(
     const sync_pb::SyncedNotificationSpecifics& proto) {
-  return base::WrapUnique(new base::DictionaryValue());
+  return base::MakeUnique<base::DictionaryValue>();
 }
 
 std::unique_ptr<base::DictionaryValue> SearchEngineSpecificsToValue(
     const sync_pb::SearchEngineSpecifics& proto) {
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   SET_STR(short_name);
   SET_STR(keyword);
   SET_STR(favicon_url);
   SET_STR(url);
   SET_BOOL(safe_for_autoreplace);
@@ skipping 443 matching lines @@
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 #undef SET_STR_REP
 
 #undef SET_FIELD
 
 }  // namespace syncer