Require explicit selection of traits for LazyInstance

content/browser/android/java/jni_helper.cc

 // 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 "content/browser/android/java/jni_helper.h"
 
 #include <map>
 
 #include "base/android/jni_android.h"
 #include "base/lazy_instance.h"
@@ skipping 26 matching lines @@
     return strcmp(jni_signature, other.jni_signature) < 0;
   }
 };
 
 typedef std::map<MethodIdentifier, jmethodID> MethodIDMap;
 
 const base::subtle::AtomicWord kUnlocked = 0;
 const base::subtle::AtomicWord kLocked = 1;
 base::subtle::AtomicWord g_method_id_map_lock = kUnlocked;
 
-base::LazyInstance<MethodIDMap> g_method_id_map = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<MethodIDMap>::DestructorAtExit g_method_id_map =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 jmethodID GetMethodIDFromClassName(JNIEnv* env,
                                    const char* class_name,
                                    const char* method,
                                    const char* jni_signature) {
   MethodIdentifier key;
   key.class_name = class_name;
   key.method = method;
@@ skipping 32 matching lines @@
   // Another thread may have populated the map already.
   std::pair<MethodIDMap::const_iterator, bool> result =
       map->insert(std::make_pair(key, id));
   DCHECK_EQ(id, result.first->second);
   base::subtle::Release_Store(&g_method_id_map_lock, kUnlocked);
 
   return id;
 }
 
 }  // namespace content