Require explicit selection of traits for LazyInstance

content/child/worker_thread_registry.cc

 // Copyright 2014 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/worker_thread_registry.h"
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/observer_list.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/child/worker_thread.h"
 
 namespace content {
 
 namespace {
 
 using WorkerThreadObservers = base::ObserverList<WorkerThread::Observer>;
 using ThreadLocalWorkerThreadObservers =
     base::ThreadLocalPointer<WorkerThreadObservers>;
 
 // Stores a WorkerThreadObservers instance per thread.
-base::LazyInstance<ThreadLocalWorkerThreadObservers> g_observers_tls =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<ThreadLocalWorkerThreadObservers>::DestructorAtExit
+    g_observers_tls = LAZY_INSTANCE_INITIALIZER;
 
 // A task-runner that refuses to run any tasks.
 class DoNothingTaskRunner : public base::TaskRunner {
  public:
   DoNothingTaskRunner() {}
 
  private:
   ~DoNothingTaskRunner() override {}
 
   bool PostDelayedTask(const tracked_objects::Location& from_here,
@@ skipping 87 matching lines @@
 bool WorkerThreadRegistry::PostTask(int id, const base::Closure& closure) {
   DCHECK(id > 0);
   base::AutoLock locker(task_runner_map_lock_);
   IDToTaskRunnerMap::iterator found = task_runner_map_.find(id);
   if (found == task_runner_map_.end())
     return false;
   return found->second->PostTask(FROM_HERE, closure);
 }
 
 }  // namespace content