diff options
Diffstat (limited to 'chrome/browser/sync/sync_prefs.cc')
| -rw-r--r-- | chrome/browser/sync/sync_prefs.cc | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc index 0c7a4bd..a5c58e8 100644 --- a/chrome/browser/sync/sync_prefs.cc +++ b/chrome/browser/sync/sync_prefs.cc @@ -87,10 +87,10 @@ void SyncPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) { false, PrefRegistrySyncable::UNSYNCABLE_PREF); registry->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken, - "", + std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF); registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken, - "", + std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF); #if defined(OS_CHROMEOS) registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken, @@ -99,7 +99,7 @@ void SyncPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) { #endif registry->RegisterStringPref(prefs::kSyncSessionsGUID, - "", + std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF); // We will start prompting people about new data types after the launch of @@ -181,9 +181,9 @@ void SyncPrefs::SetStartSuppressed(bool is_suppressed) { std::string SyncPrefs::GetGoogleServicesUsername() const { DCHECK(CalledOnValidThread()); - return - pref_service_ ? - pref_service_->GetString(prefs::kGoogleServicesUsername) : ""; + return pref_service_ + ? pref_service_->GetString(prefs::kGoogleServicesUsername) + : std::string(); } base::Time SyncPrefs::GetLastSyncedTime() const { @@ -266,9 +266,9 @@ bool SyncPrefs::IsManaged() const { std::string SyncPrefs::GetEncryptionBootstrapToken() const { DCHECK(CalledOnValidThread()); - return - pref_service_ ? - pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) : ""; + return pref_service_ + ? pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken) + : std::string(); } void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) { @@ -278,10 +278,9 @@ void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) { std::string SyncPrefs::GetKeystoreEncryptionBootstrapToken() const { DCHECK(CalledOnValidThread()); - return - pref_service_ ? - pref_service_->GetString(prefs::kSyncKeystoreEncryptionBootstrapToken) : - ""; + return pref_service_ ? pref_service_->GetString( + prefs::kSyncKeystoreEncryptionBootstrapToken) + : std::string(); } void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) { @@ -291,9 +290,8 @@ void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) { std::string SyncPrefs::GetSyncSessionsGUID() const { DCHECK(CalledOnValidThread()); - return - pref_service_ ? - pref_service_->GetString(prefs::kSyncSessionsGUID) : ""; + return pref_service_ ? pref_service_->GetString(prefs::kSyncSessionsGUID) + : std::string(); } void SyncPrefs::SetSyncSessionsGUID(const std::string& guid) { |