Require explicit selection of traits for LazyInstance

content/child/child_process.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/child_process.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 13 matching lines @@
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID)
 #include <signal.h>
 static void SigUSR1Handler(int signal) { }
 #endif
 
 namespace content {
 
 namespace {
-
-base::LazyInstance<base::ThreadLocalPointer<ChildProcess> > g_lazy_tls =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<base::ThreadLocalPointer<ChildProcess>>::DestructorAtExit
+    g_lazy_tls = LAZY_INSTANCE_INITIALIZER;
 }
 
 ChildProcess::ChildProcess(
     base::ThreadPriority io_thread_priority,
     const std::vector<base::SchedulerWorkerPoolParams>& worker_pool_params,
     base::TaskScheduler::WorkerPoolIndexForTraitsCallback
         worker_pool_index_for_traits_callback)
     : ref_count_(0),
       shutdown_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
@@ skipping 135 matching lines @@
   memset(&sa, 0, sizeof(sa));
   sa.sa_handler = SigUSR1Handler;
   sigaction(SIGUSR1, &sa, NULL);
 
   pause();
 #endif  // defined(OS_ANDROID)
 #endif  // defined(OS_POSIX)
 }
 
 }  // namespace content