Use a stable device-user identifier for CryptAuth enrollments.

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index c613faf33e7dff7e7c3c19bfdb284f987d75bec2..a5050833103739624d76841bbf42d9fce4e34abc 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1216,12 +1216,6 @@ const char kEasyUnlockAllowed[] = "easy_unlock.allowed";
 // Whether Easy Unlock is enabled.
 const char kEasyUnlockEnabled[] = "easy_unlock.enabled";
 
-// A dictionary in local state containing each user's Easy Unlock profile
-// preferences, so they can be accessed outside of the user's profile. The value
-// is a dictionary containing an entry for each user. Each user's entry mirrors
-// their profile's Easy Unlock preferences.
-const char kEasyUnlockLocalStateUserPrefs[] = "easy_unlock.user_prefs";
-
 // Preference storing Easy Unlock pairing data.
 const char kEasyUnlockPairing[] = "easy_unlock.pairing";
 
@@ -2260,6 +2254,9 @@ const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
 // Whether Adding a new Person is enabled within the user manager.
 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled";
 
+// Device ID registered with CryptAuth stored in local state.

[Ilya Sherman, 2015/02/10 01:31:05]

The device id isn't directly reported to CryptAuth -- right?  It looks like
we're going to report different id's per user -- or am I misunderstanding?

[Tim Song, 2015/02/10 22:20:33]

Done.

+extern const char kEasyUnlockDeviceId[] = "easy_unlock.device_id";
+
 // A dictionary that maps user id to hardlock state.
 const char kEasyUnlockHardlockState[] = "easy_unlock.hardlock_state";
 
@@ -2267,6 +2264,12 @@ const char kEasyUnlockHardlockState[] = "easy_unlock.hardlock_state";
 // Easy Sign-in for the user.
 const char kEasyUnlockLocalStateTpmKeys[] = "easy_unlock.public_tpm_keys";
 
+// A dictionary in local state containing each user's Easy Unlock profile
+// preferences, so they can be accessed outside of the user's profile. The value
+// is a dictionary containing an entry for each user. Each user's entry mirrors
+// their profile's Easy Unlock preferences.
+const char kEasyUnlockLocalStateUserPrefs[] = "easy_unlock.user_prefs";
+
 // The beginning of time span when we count user's "Nope" for the password
 // bubble.
 const char kPasswordBubbleTimeStamp[] = "password_bubble.timestamp";