Require explicit selection of traits for LazyInstance

content/utility/in_process_utility_thread.cc

 // Copyright 2013 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/utility/in_process_utility_thread.h"
 
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/child/child_process.h"
 #include "content/utility/utility_thread_impl.h"
 
 namespace content {
 
 // We want to ensure there's only one utility thread running at a time, as there
 // are many globals used in the utility process.
-static base::LazyInstance<base::Lock> g_one_utility_thread_lock;
+static base::LazyInstance<base::Lock>::DestructorAtExit
+    g_one_utility_thread_lock;
 
 InProcessUtilityThread::InProcessUtilityThread(
     const InProcessChildThreadParams& params)
     : Thread("Chrome_InProcUtilityThread"), params_(params) {
 }
 
 InProcessUtilityThread::~InProcessUtilityThread() {
   // Wait till in-process utility thread finishes clean up.
   bool previous_value = base::ThreadRestrictions::SetIOAllowed(true);
   Stop();
@@ skipping 21 matching lines @@
   child_process_.reset(new ChildProcess());
   child_process_->set_main_thread(new UtilityThreadImpl(params_));
 }
 
 base::Thread* CreateInProcessUtilityThread(
     const InProcessChildThreadParams& params) {
   return new InProcessUtilityThread(params);
 }
 
 }  // namespace content