1 files changed, 8 insertions, 8 deletions
diff --git a/sync/util/cryptographer.cc b/sync/util/cryptographer.cc
index 0fed51e..61b5e63 100644
--- a/sync/util/cryptographer.cc
+++ b/sync/util/cryptographer.cc
@@ -110,12 +110,12 @@ std::string Cryptographer::DecryptToString(
   NigoriMap::const_iterator it = nigoris_.find(encrypted.key_name());
   if (nigoris_.end() == it) {
     NOTREACHED() << "Cannot decrypt message";
-    return std::string();  // Caller should have called CanDecrypt(encrypt).
+    return std::string("");  // Caller should have called CanDecrypt(encrypt).
   }
 
   std::string plaintext;
   if (!it->second->Decrypt(encrypted.blob(), &plaintext)) {
-    return std::string();
+    return std::string("");
   }
 
   return plaintext;
@@ -271,18 +271,18 @@ bool Cryptographer::GetBootstrapToken(std::string* token) const {
 std::string Cryptographer::UnpackBootstrapToken(
     const std::string& token) const {
   if (token.empty())
-    return std::string();
+    return "";
 
   std::string encrypted_data;
   if (!base::Base64Decode(token, &encrypted_data)) {
     DLOG(WARNING) << "Could not decode token.";
-    return std::string();
+    return "";
   }
 
   std::string unencrypted_token;
   if (!encryptor_->DecryptString(encrypted_data, &unencrypted_token)) {
     DLOG(WARNING) << "Decryption of bootstrap token failed.";
-    return std::string();
+    return "";
   }
   return unencrypted_token;
 }
@@ -328,15 +328,15 @@ bool Cryptographer::KeybagIsStale(
 
 std::string Cryptographer::GetDefaultNigoriKey() const {
   if (!is_initialized())
-    return std::string();
+    return "";
   NigoriMap::const_iterator iter = nigoris_.find(default_nigori_name_);
   if (iter == nigoris_.end())
-    return std::string();
+    return "";
   sync_pb::NigoriKey key;
   if (!iter->second->ExportKeys(key.mutable_user_key(),
                                 key.mutable_encryption_key(),
                                 key.mutable_mac_key()))
-    return std::string();
+    return "";
   return key.SerializeAsString();
 }