summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/sync_encryption_handler_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sync/internal_api/sync_encryption_handler_impl.cc')
-rw-r--r--sync/internal_api/sync_encryption_handler_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc
index 1a645bf..655feb2 100644
--- a/sync/internal_api/sync_encryption_handler_impl.cc
+++ b/sync/internal_api/sync_encryption_handler_impl.cc
@@ -136,7 +136,7 @@ std::string PackKeystoreBootstrapToken(
const std::string& current_keystore_key,
Encryptor* encryptor) {
if (current_keystore_key.empty())
- return "";
+ return std::string();
base::ListValue keystore_key_values;
for (size_t i = 0; i < old_keystore_keys.size(); ++i)
@@ -1112,7 +1112,7 @@ void SyncEncryptionHandlerImpl::SetCustomPassphrase(
if (passphrase_type_ != KEYSTORE_PASSPHRASE) {
DVLOG(1) << "Failing to set a custom passphrase because one has already "
<< "been set.";
- FinishSetPassphrase(false, "", trans, nigori_node);
+ FinishSetPassphrase(false, std::string(), trans, nigori_node);
return;
}
@@ -1125,7 +1125,7 @@ void SyncEncryptionHandlerImpl::SetCustomPassphrase(
// if statement above. For the sake of safety though, we check for it in
// case a client is misbehaving.
LOG(ERROR) << "Failing to set custom passphrase because of pending keys.";
- FinishSetPassphrase(false, "", trans, nigori_node);
+ FinishSetPassphrase(false, std::string(), trans, nigori_node);
return;
}