base/test/test_reg_util_win.cc - Issue 786123002: Update from https://crrev.com/307330

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/test/test_reg_util_win.cc

Issue 786123002: Update from https://crrev.com/307330 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/test/test_reg_util_win.cc

diff --git a/base/test/test_reg_util_win.cc b/base/test/test_reg_util_win.cc

index 2cbafef105a6b5cba88c02b224bbe887a0d58b2b..e3b1ffc90b048d641b177a2ca63993aa408f5354 100644

--- a/base/test/test_reg_util_win.cc

+++ b/base/test/test_reg_util_win.cc

@@ -54,7 +54,7 @@ base::string16 GenerateTempKeyPath(const base::string16& test_key_root,

const base::Time& timestamp) {

base::string16 key_path = test_key_root;

key_path += L"\\" + base::Int64ToString16(timestamp.ToInternalValue());

- key_path += kTimestampDelimiter + base::ASCIIToWide(base::GenerateGUID());

+ key_path += kTimestampDelimiter + base::ASCIIToUTF16(base::GenerateGUID());

return key_path;

}