Use GetDeterministicMachineSpecificId instead of RLZ for device_id

chrome/browser/prefs/profile_pref_store_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/profile_pref_store_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 45 matching lines @@
 #else
     true;
 #endif
 
 ProfilePrefStoreManager::ProfilePrefStoreManager(
     const base::FilePath& profile_path,
     const std::vector<PrefHashFilter::TrackedPreferenceMetadata>&
         tracking_configuration,
     size_t reporting_ids_count,
     const std::string& seed,
-    const std::string& device_id,
+    const std::string& legacy_device_id,
     PrefService* local_state)
     : profile_path_(profile_path),
       tracking_configuration_(tracking_configuration),
       reporting_ids_count_(reporting_ids_count),
       seed_(seed),
-      device_id_(device_id),
+      legacy_device_id_(legacy_device_id),
       local_state_(local_state) {}
 
 ProfilePrefStoreManager::~ProfilePrefStoreManager() {}
 
 // static
 void ProfilePrefStoreManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   PrefHashFilter::RegisterProfilePrefs(registry);
 }
 
@@ skipping 120 matching lines @@
 
   UMA_HISTOGRAM_BOOLEAN("Settings.InitializedFromMasterPrefs", success);
   return success;
 }
 
 std::unique_ptr<PrefHashStore> ProfilePrefStoreManager::GetPrefHashStore(
     bool use_super_mac) {
   DCHECK(kPlatformSupportsPreferenceTracking);
 
   return std::unique_ptr<PrefHashStore>(
-      new PrefHashStoreImpl(seed_, device_id_, use_super_mac));
+      new PrefHashStoreImpl(seed_, legacy_device_id_, use_super_mac));
 }
 
 std::pair<std::unique_ptr<PrefHashStore>, std::unique_ptr<HashStoreContents>>
 ProfilePrefStoreManager::GetExternalVerificationPrefHashStorePair() {
   DCHECK(kPlatformSupportsPreferenceTracking);
 #if defined(OS_WIN)
   return std::make_pair(
       base::MakeUnique<PrefHashStoreImpl>(
-          "ChromeRegistryHashStoreValidationSeed", device_id_,
+          "ChromeRegistryHashStoreValidationSeed", legacy_device_id_,
           false /* use_super_mac */),
       g_preference_validation_registry_path_for_testing
           ? base::MakeUnique<RegistryHashStoreContentsWin>(
                 *g_preference_validation_registry_path_for_testing,
                 profile_path_.BaseName().LossyDisplayName())
           : base::MakeUnique<RegistryHashStoreContentsWin>(
                 BrowserDistribution::GetDistribution()->GetRegistryPath(),
                 profile_path_.BaseName().LossyDisplayName()));
 #else
   return std::make_pair(nullptr, nullptr);
 #endif
 }