Require explicit selection of traits for LazyInstance

chrome/browser/chromeos/extensions/gfx_utils.cc

 // Copyright 2016 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/browser/chromeos/extensions/gfx_utils.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
@@ skipping 117 matching lines @@
     return iter->second;
   }
 
  private:
   ArcAppToExtensionsMap arc_app_to_extensions_map_;
   ExtensionToArcAppMap extension_to_arc_app_map_;
 
   DISALLOW_COPY_AND_ASSIGN(AppDualBadgeMap);
 };
 
-base::LazyInstance<AppDualBadgeMap> g_dual_badge_map =
+base::LazyInstance<AppDualBadgeMap>::DestructorAtExit g_dual_badge_map =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace util {
 
 bool HasEquivalentInstalledArcApp(content::BrowserContext* context,
                                   const std::string& extension_id) {
   const std::string arc_package_name =
       g_dual_badge_map.Get().GetArcPackageNameFromExtensionId(extension_id);
@@ skipping 60 matching lines @@
     resized_badge_image = gfx::ImageSkiaOperations::CreateResizedImage(
         *badge_image, skia::ImageOperations::RESIZE_BEST, icon_out->size());
   }
   *icon_out = gfx::ImageSkiaOperations::CreateSuperimposedImage(
       *icon_out, resized_badge_image);
   return;
 }
 
 }  // namespace util
 }  // namespace extensions