Require explicit selection of traits for LazyInstance

ui/accelerated_widget_mac/accelerated_widget_mac.mm

 // 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 "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/accelerated_widget_mac/fullscreen_low_power_coordinator.h"
 #include "ui/base/cocoa/animation_utils.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gl/scoped_cgl.h"
 
 @interface CALayer (PrivateAPI)
 - (void)setContentsChanged;
 @end
 
 namespace ui {
 namespace {
 
 typedef std::map<gfx::AcceleratedWidget,AcceleratedWidgetMac*>
     WidgetToHelperMap;
-base::LazyInstance<WidgetToHelperMap> g_widget_to_helper_map;
-
+base::LazyInstance<WidgetToHelperMap>::DestructorAtExit g_widget_to_helper_map;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratedWidgetMac
 
 AcceleratedWidgetMac::AcceleratedWidgetMac() : view_(nullptr) {
   // Disable the fade-in animation as the layers are added.
   ScopedCAActionDisabler disabler;
 
@@ skipping 184 matching lines @@
 
   // Ensure that the content layer is removed.
   if (content_layer_) {
     [content_layer_ removeFromSuperlayer];
     content_layer_.reset();
   }
   view_->AcceleratedWidgetSwapCompleted();
 }
 
 }  // namespace ui