| Index: chrome/browser/password_manager/password_store_mac.cc
|
| diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc
|
| index ae3f6db91e43e92a116ca2f6d431829a68ff23e2..22f2be4d51fd2552c4d920bb93b6cffd1a92b46f 100644
|
| --- a/chrome/browser/password_manager/password_store_mac.cc
|
| +++ b/chrome/browser/password_manager/password_store_mac.cc
|
| @@ -664,7 +664,7 @@ bool ExtractSignonRealmComponents(const std::string& signon_realm,
|
| if (security_domain) {
|
| // Strip the leading '/' off of the path to get the security domain.
|
| if (realm_as_url.path().length() > 0)
|
| - *security_domain = realm_as_url.path().substr(1);
|
| + *security_domain = realm_as_url.path().substr(1).as_string();
|
| else
|
| security_domain->clear();
|
| }
|
| @@ -794,7 +794,7 @@ bool MacKeychainPasswordFormAdapter::AddPassword(const PasswordForm& form) {
|
| std::string path;
|
| // Path doesn't make sense for Android app credentials.
|
| if (!password_manager::IsValidAndroidFacetURI(form.signon_realm))
|
| - path = form.origin.path();
|
| + path = form.origin.path().as_string();
|
| std::string username = base::UTF16ToUTF8(form.username_value);
|
| std::string password = base::UTF16ToUTF8(form.password_value);
|
| SecProtocolType protocol = is_secure ? kSecProtocolTypeHTTPS
|
| @@ -867,7 +867,7 @@ SecKeychainItemRef MacKeychainPasswordFormAdapter::KeychainItemForForm(
|
| std::string path;
|
| // Path doesn't make sense for Android app credentials.
|
| if (!password_manager::IsValidAndroidFacetURI(form.signon_realm))
|
| - path = form.origin.path();
|
| + path = form.origin.path().as_string();
|
| std::string username = base::UTF16ToUTF8(form.username_value);
|
| std::vector<SecKeychainItemRef> matches = MatchingKeychainItems(
|
| form.signon_realm, form.scheme, path.c_str(), username.c_str());
|
|
|