[Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead.

components/sync/base/cryptographer.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 "components/sync/base/cryptographer.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "components/sync/base/encryptor.h"
 #include "components/sync/protocol/nigori_specifics.pb.h"
 
 namespace syncer {
 
 const char kNigoriTag[] = "google_chrome_nigori";
 
 // We name a particular Nigori instance (ie. a triplet consisting of a hostname,
 // a username, and a password) by calling Permute on this string. Since the
 // output of Permute is always the same for a given triplet, clients will always
@@ skipping 10 matching lines @@
   for (NigoriMap::const_iterator it = other.nigoris_.begin();
        it != other.nigoris_.end(); ++it) {
     std::string user_key, encryption_key, mac_key;
     it->second->ExportKeys(&user_key, &encryption_key, &mac_key);
     linked_ptr<Nigori> nigori_copy(new Nigori());
     nigori_copy->InitByImport(user_key, encryption_key, mac_key);
     nigoris_.insert(std::make_pair(it->first, nigori_copy));
   }
 
   if (other.pending_keys_) {
-    pending_keys_.reset(new sync_pb::EncryptedData(*(other.pending_keys_)));
+    pending_keys_ =
+        base::MakeUnique<sync_pb::EncryptedData>(*(other.pending_keys_));
   }
 }
 
 Cryptographer::~Cryptographer() {}
 
 void Cryptographer::Bootstrap(const std::string& restored_bootstrap_token) {
   if (is_initialized()) {
     NOTREACHED();
     return;
   }
@@ skipping 168 matching lines @@
 }
 
 void Cryptographer::SetDefaultKey(const std::string& key_name) {
   DCHECK(nigoris_.end() != nigoris_.find(key_name));
   default_nigori_name_ = key_name;
 }
 
 void Cryptographer::SetPendingKeys(const sync_pb::EncryptedData& encrypted) {
   DCHECK(!CanDecrypt(encrypted));
   DCHECK(!encrypted.blob().empty());
-  pending_keys_.reset(new sync_pb::EncryptedData(encrypted));
+  pending_keys_ = base::MakeUnique<sync_pb::EncryptedData>(encrypted);
 }
 
 const sync_pb::EncryptedData& Cryptographer::GetPendingKeys() const {
   DCHECK(has_pending_keys());
   return *(pending_keys_.get());
 }
 
 bool Cryptographer::DecryptPendingKeys(const KeyParams& params) {
   Nigori nigori;
   if (!nigori.InitByDerivation(params.hostname, params.username,
@@ skipping 123 matching lines @@
     NOTREACHED();
     return false;
   }
 
   if (!AddKeyImpl(std::move(nigori), true))
     return false;
   return true;
 }
 
 }  // namespace syncer