| Index: components/sync/engine_impl/model_type_registry.cc
|
| diff --git a/components/sync/engine_impl/model_type_registry.cc b/components/sync/engine_impl/model_type_registry.cc
|
| index 9854d5b3d4479eb316b9a8b84a963620ccd96c1b..4517cb0eb5fa693a75d39b13a5304cd1a72a0243 100644
|
| --- a/components/sync/engine_impl/model_type_registry.cc
|
| +++ b/components/sync/engine_impl/model_type_registry.cc
|
| @@ -146,7 +146,7 @@ void ModelTypeRegistry::ConnectType(
|
|
|
| std::unique_ptr<Cryptographer> cryptographer_copy;
|
| if (encrypted_types_.Has(type))
|
| - cryptographer_copy.reset(new Cryptographer(*cryptographer_));
|
| + cryptographer_copy = base::MakeUnique<Cryptographer>(*cryptographer_);
|
|
|
| std::unique_ptr<ModelTypeWorker> worker(new ModelTypeWorker(
|
| type, activation_context->model_type_state, std::move(cryptographer_copy),
|
| @@ -276,7 +276,7 @@ void ModelTypeRegistry::OnEncryptionComplete() {}
|
|
|
| void ModelTypeRegistry::OnCryptographerStateChanged(
|
| Cryptographer* cryptographer) {
|
| - cryptographer_.reset(new Cryptographer(*cryptographer));
|
| + cryptographer_ = base::MakeUnique<Cryptographer>(*cryptographer);
|
| OnEncryptionStateChanged();
|
| }
|
|
|
|
|