Use GetDeterministicMachineSpecificId instead of RLZ for device_id

chrome/browser/prefs/chrome_pref_service_factory.cc

Index: chrome/browser/prefs/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index b15a2f10fde75db9eba75ea7a4f3c59de0fe115f..9214f353174d9f0038dcc7d0f372d7cf68a08998 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -380,7 +380,7 @@ void HandleReadError(const base::FilePath& pref_filename,
 
 std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
     const base::FilePath& profile_path) {
-  std::string device_id;
+  std::string rlz_device_id;

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

Call this |legacy_device_id| here as well (i.e. on Windows legacy device ID is
RLZ and on other platforms it's empty string)

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

Done.

 #if defined(OS_WIN) && BUILDFLAG(ENABLE_RLZ)
   // This is used by
   // chrome/browser/extensions/api/music_manager_private/device_id_win.cc
@@ -388,7 +388,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
   // not available synchronously.
   // As part of improving pref metrics on other platforms we may want to find
   // ways to defer preference loading until the device ID can be used.
-  rlz_lib::GetMachineId(&device_id);
+  rlz_lib::GetMachineId(&rlz_device_id);
 #endif
   std::string seed;
 #if defined(GOOGLE_CHROME_BUILD)
@@ -397,7 +397,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
 #endif
   return base::MakeUnique<ProfilePrefStoreManager>(
       profile_path, GetTrackingConfiguration(), kTrackedPrefsReportingIDsCount,
-      seed, device_id, g_browser_process->local_state());
+      seed, rlz_device_id, g_browser_process->local_state());
 }
 
 void PrepareFactory(sync_preferences::PrefServiceSyncableFactory* factory,