[cros] Display emails of users are stored in a separate dictionary in Local State.

chrome/browser/resources/options/personal_options.js

Index: chrome/browser/resources/options/personal_options.js
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 2aa626e4d8ea0f0502d210a72bafe2ad1b3470bd..3a4f0f0ae6391381df329e28c2148f3f4930dfbd 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -16,8 +16,9 @@ cr.define('options', function() {
                      templateData.personalPageTabTitle,
                      'personal-page');
     if (cr.isChromeOS) {
-      // Email of the currently logged in user (or |kGuestUser|).
-      this.userEmail_ = localStrings.getString('userEmail');
+      // Username (canonical email) of the currently logged in user or
+      // |kGuestUser| if a guest session is active.
+      this.username_ = localStrings.getString('username');
     }
   }
 
@@ -305,7 +306,7 @@ cr.define('options', function() {
      */
     updateAccountPicture_: function() {
       $('account-picture').src =
-          'chrome://userimage/' + this.userEmail_ +
+          'chrome://userimage/' + this.username_ +
           '?id=' + (new Date()).getTime();
     },
   };
@@ -329,11 +330,11 @@ cr.define('options', function() {
 
   if (cr.isChromeOS) {
     /**
-     * Returns email of the user logged in (ChromeOS only).
+     * Returns username (canonical email) of the user logged in (ChromeOS only).
      * @return {string} user email.
      */
-    PersonalOptions.getLoggedInUserEmail = function() {
-      return PersonalOptions.getInstance().userEmail_;
+    PersonalOptions.getLoggedInUsername = function() {
+      return PersonalOptions.getInstance().username_;
     };
   }