Require explicit selection of traits for LazyInstance

chrome/browser/ui/app_list/arc/arc_app_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 "chrome/browser/ui/app_list/arc/arc_app_icon.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 89 matching lines @@
   gfx::ImageSkiaRep GetImageForScale(float scale) override;
 
   // Used to load images asynchronously. NULLed out when the ArcAppIcon is
   // destroyed.
   base::WeakPtr<ArcAppIcon> host_;
 
   const int resource_size_in_dip_;
 
   // A map from a pair of a resource ID and size in DIP to an image. This
   // is a cache to avoid resizing IDR icons in GetImageForScale every time.
-  static base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>
-      default_icons_cache_;
+  static base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>::
+      DestructorAtExit default_icons_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(Source);
 };
 
-base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>
-    ArcAppIcon::Source::default_icons_cache_ = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<std::map<std::pair<int, int>, gfx::ImageSkia>>::
+    DestructorAtExit ArcAppIcon::Source::default_icons_cache_ =
+        LAZY_INSTANCE_INITIALIZER;
 
 ArcAppIcon::Source::Source(const base::WeakPtr<ArcAppIcon>& host,
                            int resource_size_in_dip)
     : host_(host),
       resource_size_in_dip_(resource_size_in_dip) {
 }
 
 ArcAppIcon::Source::~Source() {
 }
 
@@ skipping 234 matching lines @@
 void ArcAppIcon::DiscardDecodeRequest(DecodeRequest* request) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   auto it = std::find_if(decode_requests_.begin(), decode_requests_.end(),
                          [request](const std::unique_ptr<DecodeRequest>& ptr) {
                            return ptr.get() == request;
                          });
   CHECK(it != decode_requests_.end());
   decode_requests_.erase(it);
 }