Use GetDeterministicMachineSpecificId instead of RLZ for device_id

components/user_prefs/tracked/pref_hash_store_impl.cc

Index: components/user_prefs/tracked/pref_hash_store_impl.cc
diff --git a/components/user_prefs/tracked/pref_hash_store_impl.cc b/components/user_prefs/tracked/pref_hash_store_impl.cc
index 80438d6954a45c9c791a2c7d620e108fdeff3141..26a061595583a0fee662af402f1d9446d793136d 100644
--- a/components/user_prefs/tracked/pref_hash_store_impl.cc
+++ b/components/user_prefs/tracked/pref_hash_store_impl.cc
@@ -10,8 +10,20 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
+#include "components/user_prefs/tracked/device_id.h"
 #include "components/user_prefs/tracked/hash_store_contents.h"
 
+namespace {

[gab, 2017/01/17 21:03:48]

nit: empty lines after opening and before closing namespace

[proberge, 2017/01/18 16:10:58]

Done.

+// Returns a deterministic ID for this machine.
+std::string GenerateDeviceId() {
+  std::string device_id;
+  if (GetDeterministicMachineSpecificId(&device_id) == MachineIdStatus::SUCCESS)
+    return device_id;
+
+  return std::string();
+}
+}

[gab, 2017/01/17 21:03:48]

nit: }  // namespace

[proberge, 2017/01/18 16:10:58]

Done.

+
 class PrefHashStoreImpl::PrefHashStoreTransactionImpl
     : public PrefHashStoreTransaction {
  public:
@@ -49,10 +61,10 @@ class PrefHashStoreImpl::PrefHashStoreTransactionImpl
 };
 
 PrefHashStoreImpl::PrefHashStoreImpl(const std::string& seed,
-                                     const std::string& device_id,
+                                     const std::string& legacy_device_id,
                                      bool use_super_mac)
-    : pref_hash_calculator_(seed, device_id), use_super_mac_(use_super_mac) {
-}
+    : pref_hash_calculator_(seed, GenerateDeviceId(), legacy_device_id),
+      use_super_mac_(use_super_mac) {}
 
 PrefHashStoreImpl::~PrefHashStoreImpl() {
 }