Index: components/policy/core/common/policy_loader_win_unittest.cc |
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc |
index 8c0975e1f02d55a6881b7025d867cb7292cd77d4..708ef6685a4ce470ec9b5e7be2654c853e01ec23 100644 |
--- a/components/policy/core/common/policy_loader_win_unittest.cc |
+++ b/components/policy/core/common/policy_loader_win_unittest.cc |
@@ -155,7 +155,7 @@ class ScopedGroupPolicyRegistrySandbox { |
// Deletes the sandbox keys. |
void DeleteKeys(); |
- std::wstring key_name_; |
+ base::string16 key_name_; |
// Keys are created for the lifetime of a test to contain |
// the sandboxed HKCU and HKLM hives, respectively. |
@@ -296,7 +296,7 @@ ScopedGroupPolicyRegistrySandbox::ScopedGroupPolicyRegistrySandbox() { |
// Generate a unique registry key for the override for each test. This |
// makes sure that tests executing in parallel won't delete each other's |
// key, at DeleteKeys(). |
- key_name_ = base::ASCIIToWide(base::StringPrintf( |
+ key_name_ = base::ASCIIToUTF16(base::StringPrintf( |
"SOFTWARE\\chromium unittest %d", base::GetCurrentProcId())); |
std::wstring hklm_key_name = key_name_ + L"\\HKLM"; |
std::wstring hkcu_key_name = key_name_ + L"\\HKCU"; |