diff --git a/DEPS b/DEPS index 470d029d..33d9fddc 100644 --- a/DEPS +++ b/DEPS @@ -28,7 +28,7 @@ deps = { '32ca1cd8e010d013a606a752fb49a603a3598071', # svn r2015 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - '597e041ee33d5c27574a78cfd256d3a70e8c1fe1', + '98264cf63f22c80ba4ea33405adcc0ddcb8ce0bf', } hooks = [ diff --git a/util/thread/thread_log_messages.cc b/util/thread/thread_log_messages.cc index f3af8a83..bada15a2 100644 --- a/util/thread/thread_log_messages.cc +++ b/util/thread/thread_log_messages.cc @@ -36,7 +36,8 @@ class ThreadLogMessagesMaster { public: ThreadLogMessagesMaster() { DCHECK(!tls_.initialized()); - CHECK(tls_.Initialize(nullptr)); + tls_.Initialize(nullptr); + DCHECK(tls_.initialized()); DCHECK(!logging::GetLogMessageHandler()); logging::SetLogMessageHandler(LogMessageHandler);