Require explicit selection of traits for LazyInstance

content/common/plugin_list.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/common/plugin_list.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/mime_util.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
-base::LazyInstance<PluginList> g_singleton = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<PluginList>::DestructorAtExit g_singleton =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // static
 PluginList* PluginList::Singleton() {
   return g_singleton.Pointer();
 }
 
 void PluginList::RefreshPlugins() {
   base::AutoLock lock(lock_);
@@ skipping 259 matching lines @@
                 plugin_path);
   if (it != extra_plugin_paths_.end())
     extra_plugin_paths_.erase(it);
 }
 
 PluginList::~PluginList() {
 }
 
 
 }  // namespace content