Require explicit selection of traits for LazyInstance

ui/events/keycodes/platform_key_map_win.cc

 // Copyright (c) 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 "ui/events/keycodes/platform_key_map_win.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 244 matching lines @@
 
   return DomKey::NONE;
 }
 
 void CleanupKeyMapTls(void* data) {
   PlatformKeyMap* key_map = reinterpret_cast<PlatformKeyMap*>(data);
   delete key_map;
 }
 
 struct PlatformKeyMapInstanceTlsTraits
-    : public base::DefaultLazyInstanceTraits<base::ThreadLocalStorage::Slot> {
+    : public base::LazyInstanceTraitsBase<base::ThreadLocalStorage::Slot> {

[Nico, 2017/03/07 21:43:02]

same question as the other "wait" comment

[scottmg, 2017/03/07 21:56:30]

Done.

   static base::ThreadLocalStorage::Slot* New(void* instance) {
     // Use placement new to initialize our instance in our preallocated space.
     // TODO(chongz): Use std::default_delete instead of providing own function.
     return new (instance) base::ThreadLocalStorage::Slot(CleanupKeyMapTls);
   }
 };
 
 base::LazyInstance<base::ThreadLocalStorage::Slot,
                    PlatformKeyMapInstanceTlsTraits>
     g_platform_key_map_tls_lazy = LAZY_INSTANCE_INITIALIZER;
@@ skipping 126 matching lines @@
         }
       } else {
         // TODO(chongz): Handle rv <= -2 and rv >= 2.
       }
     }
   }
   ::SetKeyboardState(keyboard_state_to_restore);
 }
 
 }  // namespace ui