Require explicit selection of traits for LazyInstance

chrome/common/extensions/manifest_handlers/linked_app_icons.cc

 // Copyright 2015 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 "chrome/common/extensions/manifest_handlers/linked_app_icons.h"
 
 #include <memory>
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 
 namespace extensions {
 
 namespace keys = manifest_keys;
 namespace errors = manifest_errors;
 
 namespace {
 
-static base::LazyInstance<LinkedAppIcons> g_empty_linked_app_icons =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<LinkedAppIcons>::DestructorAtExit
+    g_empty_linked_app_icons = LAZY_INSTANCE_INITIALIZER;
 
 const LinkedAppIcons& GetInfo(const Extension* extension) {
   LinkedAppIcons* info = static_cast<LinkedAppIcons*>(
       extension->GetManifestData(keys::kLinkedAppIcons));
   return info ? *info : g_empty_linked_app_icons.Get();
 }
 
 }  // namespace
 
 LinkedAppIcons::IconInfo::IconInfo() {
@@ skipping 70 matching lines @@
   extension->SetManifestData(keys::kLinkedAppIcons,
                              std::move(linked_app_icons));
   return true;
 }
 
 const std::vector<std::string> LinkedAppIconsHandler::Keys() const {
   return SingleKey(keys::kLinkedAppIcons);
 }
 
 }  // namespace extensions