Require explicit selection of traits for LazyInstance

ui/gfx/icc_profile_win.cc

 // Copyright (c) 2012 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/icc_profile.h"
 
 #include <windows.h>
 #include <stddef.h>
 #include <map>
 
@@ skipping 15 matching lines @@
   ReleaseDC(NULL, screen_dc);
   if (!result)
     return;
   std::string profile_data;
   if (!base::ReadFileToString(base::FilePath(path), &profile_data))
     return;
   size_t length = profile_data.size();
   profile->assign(profile_data.data(), profile_data.data() + length);
 }
 
-base::LazyInstance<base::Lock> g_best_monitor_color_space_lock =
-    LAZY_INSTANCE_INITIALIZER;
-base::LazyInstance<gfx::ICCProfile> g_best_monitor_color_space =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<base::Lock>::DestructorAtExit
+    g_best_monitor_color_space_lock = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<gfx::ICCProfile>::DestructorAtExit
+    g_best_monitor_color_space = LAZY_INSTANCE_INITIALIZER;
 bool g_has_initialized_best_monitor_color_space = false;
 
 }  // namespace
 
 // static
 ICCProfile ICCProfile::FromBestMonitor() {
   base::AutoLock lock(g_best_monitor_color_space_lock.Get());
   return g_best_monitor_color_space.Get();
 }
 
 // static
 bool ICCProfile::CachedProfilesNeedUpdate() {
   base::AutoLock lock(g_best_monitor_color_space_lock.Get());
   return !g_has_initialized_best_monitor_color_space;
 }
 
 // static
 void ICCProfile::UpdateCachedProfilesOnBackgroundThread() {
   std::vector<char> icc_profile;
   ReadBestMonitorICCProfile(&icc_profile);
   gfx::ICCProfile color_space = FromData(
       icc_profile.data(), icc_profile.size());
 
   base::AutoLock lock(g_best_monitor_color_space_lock.Get());
   g_best_monitor_color_space.Get() = color_space;
   g_has_initialized_best_monitor_color_space = true;
 }
 
 }  // namespace gfx