Require explicit selection of traits for LazyInstance

ui/gfx/paint_vector_icon.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 "ui/gfx/paint_vector_icon.h"
 
 #include <map>
 #include <tuple>
 
 #include "base/i18n/rtl.h"
@@ skipping 462 matching lines @@
     int dip_size;
     SkColor color;
     const gfx::VectorIcon* badge_icon;
   };
 
   std::map<IconDescription, ImageSkia> images_;
 
   DISALLOW_COPY_AND_ASSIGN(VectorIconCache);
 };
 
-static base::LazyInstance<VectorIconCache> g_icon_cache =
+static base::LazyInstance<VectorIconCache>::DestructorAtExit g_icon_cache =
     LAZY_INSTANCE_INITIALIZER;
 
 class VectorIconCacheLegacy {
  public:
   VectorIconCacheLegacy() {}
   ~VectorIconCacheLegacy() {}
 
   ImageSkia GetOrCreateIcon(VectorIconId id,
                             int dip_size,
                             SkColor color,
@@ skipping 26 matching lines @@
     int dip_size;
     SkColor color;
     VectorIconId badge_id;
   };
 
   std::map<IconDescription, ImageSkia> images_;
 
   DISALLOW_COPY_AND_ASSIGN(VectorIconCacheLegacy);
 };
 
-static base::LazyInstance<VectorIconCacheLegacy> g_icon_cache_legacy =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<VectorIconCacheLegacy>::DestructorAtExit
+    g_icon_cache_legacy = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 const VectorIcon kNoneIcon = {};
 
 void PaintVectorIcon(Canvas* canvas,
                      VectorIconId id,
                      int dip_size,
                      SkColor color) {
   DCHECK(VectorIconId::VECTOR_ICON_NONE != id);
@@ skipping 60 matching lines @@
 }
 
 ImageSkia CreateVectorIconFromSource(const std::string& source,
                                      int dip_size,
                                      SkColor color) {
   return CanvasImageSource::MakeImageSkia<VectorIconSourceLegacy>(
       source, dip_size, color);
 }
 
 }  // namespace gfx