summaryrefslogtreecommitdiffstats
path: root/chromeos/system
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 23:36:32 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 23:36:32 +0000
commit3c6b1de434f57ddffcff7bd71f141f45fc4b9bd0 (patch)
tree5a9c19693132f96cf7f36c7d86b120a82a8bb703 /chromeos/system
parent897e712dd5645f49eae7f5d4bd28866440949d30 (diff)
downloadchromium_src-3c6b1de434f57ddffcff7bd71f141f45fc4b9bd0.zip
chromium_src-3c6b1de434f57ddffcff7bd71f141f45fc4b9bd0.tar.gz
chromium_src-3c6b1de434f57ddffcff7bd71f141f45fc4b9bd0.tar.bz2
Update server-backed state key generation.
Include the disk serial number as a factor that is neither easily predictable nor known to the server side as well as a quantized time stamp, so the identifiers become invalid after a while. BUG=chromium:352599 TEST=Forced re-enrollment still works. R=joaodasilva@chromium.org, stevenjb@chromium.org, xiyuan@chromium.org Review URL: https://codereview.chromium.org/212653004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/system')
-rw-r--r--chromeos/system/statistics_provider.cc1
-rw-r--r--chromeos/system/statistics_provider.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc
index 581629b..93557b9 100644
--- a/chromeos/system/statistics_provider.cc
+++ b/chromeos/system/statistics_provider.cc
@@ -72,6 +72,7 @@ const char kHardwareClassKey[] = "hardware_class";
const char kOffersCouponCodeKey[] = "ubind_attribute";
const char kOffersGroupCodeKey[] = "gbind_attribute";
const char kRlzBrandCodeKey[] = "rlz_brand_code";
+const char kDiskSerialNumber[] = "root_disk_serial_number";
// OEM specific statistics. Must be prefixed with "oem_".
const char kOemCanExitEnterpriseEnrollmentKey[] = "oem_can_exit_enrollment";
diff --git a/chromeos/system/statistics_provider.h b/chromeos/system/statistics_provider.h
index d1dd22c..ed6699d 100644
--- a/chromeos/system/statistics_provider.h
+++ b/chromeos/system/statistics_provider.h
@@ -49,6 +49,9 @@ CHROMEOS_EXPORT extern const char kOffersGroupCodeKey[];
// Release Brand Code key.
CHROMEOS_EXPORT extern const char kRlzBrandCodeKey[];
+// The serial number of the disk the root device is on.
+CHROMEOS_EXPORT extern const char kDiskSerialNumber[];
+
// This interface provides access to Chrome OS statistics.
class CHROMEOS_EXPORT StatisticsProvider {
public: