diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/base/syslog_logging.cc | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) | |
download | qtwebengine-chromium-c551f43206405019121bd2b2c93714319a0a3300.tar.gz |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/syslog_logging.cc')
-rw-r--r-- | chromium/base/syslog_logging.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/base/syslog_logging.cc b/chromium/base/syslog_logging.cc index 68483efccd5..6b7280dbc41 100644 --- a/chromium/base/syslog_logging.cc +++ b/chromium/base/syslog_logging.cc @@ -34,7 +34,7 @@ namespace { std::string* g_event_source_name = nullptr; uint16_t g_category = 0; uint32_t g_event_id = 0; -base::string16* g_user_sid = nullptr; +std::wstring* g_user_sid = nullptr; } // namespace @@ -46,7 +46,7 @@ void SetEventSource(const std::string& name, g_category = category; g_event_id = event_id; DCHECK_EQ(nullptr, g_user_sid); - g_user_sid = new base::string16(); + g_user_sid = new std::wstring(); base::win::GetUserSidString(g_user_sid); } @@ -102,7 +102,7 @@ EventLogMessage::~EventLogMessage() { } LPCSTR strings[1] = {message.data()}; PSID user_sid = nullptr; - if (!::ConvertStringSidToSid(base::as_wcstr(*g_user_sid), &user_sid)) { + if (!::ConvertStringSidToSid(g_user_sid->c_str(), &user_sid)) { stream() << " !!ERROR GETTING USER SID!!"; } |