diff options
Diffstat (limited to 'chrome/browser/managed_mode/managed_user_service.cc')
| -rw-r--r-- | chrome/browser/managed_mode/managed_user_service.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index 0cc29f5..80b2bc8 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -154,10 +154,10 @@ void ManagedUserService::RegisterUserPrefs(PrefRegistrySyncable* registry) { ManagedModeURLFilter::BLOCK, PrefRegistrySyncable::UNSYNCABLE_PREF); registry->RegisterStringPref(prefs::kManagedModeLocalPassphrase, - "", + std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF); registry->RegisterStringPref(prefs::kManagedModeLocalSalt, - "", + std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF); } @@ -203,7 +203,7 @@ bool ManagedUserService::UserMayLoad(const extensions::Extension* extension, string16* error) const { string16 tmp_error; // |extension| can be NULL in unit tests. - if (ExtensionManagementPolicyImpl(extension ? extension->id() : "", + if (ExtensionManagementPolicyImpl(extension ? extension->id() : std::string(), &tmp_error)) return true; @@ -244,7 +244,8 @@ bool ManagedUserService::UserMayModifySettings( const extensions::Extension* extension, string16* error) const { // |extension| can be NULL in unit tests. - return ExtensionManagementPolicyImpl(extension ? extension->id() : "", error); + return ExtensionManagementPolicyImpl( + extension ? extension->id() : std::string(), error); } void ManagedUserService::Observe(int type, |