| Index: components/sync/engine/engine_util.cc
|
| diff --git a/components/sync/engine/engine_util.cc b/components/sync/engine/engine_util.cc
|
| index e66bf130917d1fdaa595684ee58329f94c88ab5a..6852be191f89cbe8cbe8ce8aff176ed447f9820d 100644
|
| --- a/components/sync/engine/engine_util.cc
|
| +++ b/components/sync/engine/engine_util.cc
|
| @@ -27,17 +27,17 @@ sync_pb::PasswordSpecificsData* DecryptPasswordSpecifics(
|
| const sync_pb::EntitySpecifics& specifics,
|
| Cryptographer* crypto) {
|
| if (!specifics.has_password())
|
| - return NULL;
|
| + return nullptr;
|
| const sync_pb::PasswordSpecifics& password_specifics = specifics.password();
|
| if (!password_specifics.has_encrypted())
|
| - return NULL;
|
| + return nullptr;
|
| const sync_pb::EncryptedData& encrypted = password_specifics.encrypted();
|
| std::unique_ptr<sync_pb::PasswordSpecificsData> data(
|
| new sync_pb::PasswordSpecificsData);
|
| if (!crypto->CanDecrypt(encrypted))
|
| - return NULL;
|
| + return nullptr;
|
| if (!crypto->Decrypt(encrypted, data.get()))
|
| - return NULL;
|
| + return nullptr;
|
| return data.release();
|
| }
|
|
|
|
|