diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/base/threading/thread_id_name_manager.cc | |
parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/base/threading/thread_id_name_manager.cc')
-rw-r--r-- | chromium/base/threading/thread_id_name_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/base/threading/thread_id_name_manager.cc b/chromium/base/threading/thread_id_name_manager.cc index ef08548f2ed..7c85c1b5e99 100644 --- a/chromium/base/threading/thread_id_name_manager.cc +++ b/chromium/base/threading/thread_id_name_manager.cc @@ -20,7 +20,8 @@ static std::string* g_default_name; } ThreadIdNameManager::ThreadIdNameManager() - : main_process_id_(kInvalidThreadId) { + : main_process_name_(NULL), + main_process_id_(kInvalidThreadId) { g_default_name = new std::string(kDefaultName); AutoLock locked(lock_); |