Require explicit selection of traits for LazyInstance

extensions/common/manifest_handlers/icons_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/icons_handler.h"
 
 #include <memory>
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handler_helpers.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace extensions {
 
 namespace keys = manifest_keys;
 
-static base::LazyInstance<ExtensionIconSet> g_empty_icon_set =
+static base::LazyInstance<ExtensionIconSet>::DestructorAtExit g_empty_icon_set =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) {
   IconsInfo* info = static_cast<IconsInfo*>(
       extension->GetManifestData(keys::kIcons));
   return info ? info->icons : g_empty_icon_set.Get();
 }
 
 // static
@@ skipping 43 matching lines @@
                                              extension,
                                              IDS_EXTENSION_LOAD_ICON_FAILED,
                                              error);
 }
 
 const std::vector<std::string> IconsHandler::Keys() const {
   return SingleKey(keys::kIcons);
 }
 
 }  // namespace extensions