diff options
| author | tengs@google.com <tengs@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 22:37:07 +0000 |
|---|---|---|
| committer | tengs@google.com <tengs@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 22:37:07 +0000 |
| commit | 5769c2430aa35b2f7bf9567bbd00528a8d292be4 (patch) | |
| tree | c9e39a8824d08c8931d7ccccefd0de53e6e563dc | |
| parent | 486d05cf480ee2ca6e3d1aad639e3c4261eb9cad (diff) | |
| download | chromium_src-5769c2430aa35b2f7bf9567bbd00528a8d292be4.zip chromium_src-5769c2430aa35b2f7bf9567bbd00528a8d292be4.tar.gz chromium_src-5769c2430aa35b2f7bf9567bbd00528a8d292be4.tar.bz2 | |
Merge user id canonicalization fix from 219364
> Lowercase generated user ids for device local accounts used in kiosk mode.
> The crash recovery process lowercases the username of the > account,
> so a comparison will fail and prevent the kiosk app from relaunching.
> BUG=277738, 279279
> TEST=manually on device
TBR=bartfab@chromium.org
Review URL: https://codereview.chromium.org/23464006
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@219847 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/policy/device_local_account.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/policy/device_local_account.cc b/chrome/browser/chromeos/policy/device_local_account.cc index 79fdf3b..18ac3b4 100644 --- a/chrome/browser/chromeos/policy/device_local_account.cc +++ b/chrome/browser/chromeos/policy/device_local_account.cc @@ -53,8 +53,9 @@ std::string GenerateDeviceLocalAccountUserId(const std::string& account_id, NOTREACHED(); break; } - return base::HexEncode(account_id.c_str(), account_id.size()) + "@" + - domain_prefix + kDeviceLocalAccountDomainSuffix; + return gaia::CanonicalizeEmail( + base::HexEncode(account_id.c_str(), account_id.size()) + "@" + + domain_prefix + kDeviceLocalAccountDomainSuffix); } bool IsDeviceLocalAccountUser(const std::string& user_id) { |