Index: chrome/browser/extensions/api/music_manager_private/device_id_win.cc |
diff --git a/chrome/browser/extensions/api/music_manager_private/device_id_win.cc b/chrome/browser/extensions/api/music_manager_private/device_id_win.cc |
index 90814d7f8f59943747c718898b43c17c512c97e4..6455e9a8f867a704c3f278d2b76437938f48ebb2 100644 |
--- a/chrome/browser/extensions/api/music_manager_private/device_id_win.cc |
+++ b/chrome/browser/extensions/api/music_manager_private/device_id_win.cc |
@@ -25,8 +25,9 @@ |
#include "base/threading/thread_restrictions.h" |
#include "base/win/windows_version.h" |
#include "content/public/browser/browser_thread.h" |
+#include "rlz/features/features.h" |
-#if defined(ENABLE_RLZ) |
+#if BUILDFLAG(ENABLE_RLZ) |
#include "rlz/lib/machine_id.h" |
#endif |
@@ -183,13 +184,13 @@ void GetMacAddress(const IsValidMacAddressCallback& is_valid_mac_address, |
} |
std::string GetRlzMachineId() { |
-#if defined(ENABLE_RLZ) |
+#if BUILDFLAG(ENABLE_RLZ) |
std::string machine_id; |
if (!rlz_lib::GetMachineId(&machine_id)) |
- return ""; |
+ return std::string(); |
return machine_id; |
#else |
- return ""; |
+ return std::string(); |
#endif |
} |