Require explicit selection of traits for LazyInstance

extensions/common/manifest_handlers/content_capabilities_handler.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 "extensions/common/manifest_handlers/content_capabilities_handler.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 14 matching lines @@
 namespace errors = manifest_errors;
 
 using api::extensions_manifest_types::ContentCapabilities;
 
 ContentCapabilitiesInfo::ContentCapabilitiesInfo() {
 }
 
 ContentCapabilitiesInfo::~ContentCapabilitiesInfo() {
 }
 
-static base::LazyInstance<ContentCapabilitiesInfo>
-g_empty_content_capabilities_info = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<ContentCapabilitiesInfo>::DestructorAtExit
+    g_empty_content_capabilities_info = LAZY_INSTANCE_INITIALIZER;
 
 // static
 const ContentCapabilitiesInfo& ContentCapabilitiesInfo::Get(
     const Extension* extension) {
   ContentCapabilitiesInfo* info = static_cast<ContentCapabilitiesInfo*>(
       extension->GetManifestData(keys::kContentCapabilities));
   return info ? *info : g_empty_content_capabilities_info.Get();
 }
 
 ContentCapabilitiesHandler::ContentCapabilitiesHandler() {
@@ skipping 62 matching lines @@
   extension->SetManifestData(keys::kContentCapabilities, std::move(info));
   return true;
 }
 
 const std::vector<std::string> ContentCapabilitiesHandler::Keys()
     const {
   return SingleKey(keys::kContentCapabilities);
 }
 
 }  // namespace extensions