Require explicit selection of traits for LazyInstance

tools/json_schema_compiler/cpp_bundle_generator.py

 # 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.
 
 import code
 import cpp_util
 from model import Platforms
 from schema_util import CapitalizeFirstLetter
 from schema_util import JsFunctionNameToClassName
 
@@ skipping 342 matching lines @@
     c.Sblock('Static() {')
     for api in self._bundle._api_defs:
       namespace = self._bundle._model.namespaces[api.get('namespace')]
       c.Append('schemas["%s"] = %s;' % (namespace.name,
                                         _FormatNameAsConstant(namespace.name)))
     c.Eblock('}')
     c.Append()
     c.Append('std::map<std::string, const char*> schemas;')
     c.Eblock('};')
     c.Append()
-    c.Append('base::LazyInstance<Static> g_lazy_instance;')
+    c.Append('base::LazyInstance<Static>::DestructorAtExit g_lazy_instance;')
     c.Append()
     c.Append('}  // namespace')
     c.Append()
     c.Concat(cpp_util.OpenNamespace(self._bundle._cpp_namespace))
     c.Append()
     c.Append('// static')
     c.Sblock('base::StringPiece %s::Get(const std::string& name) {' %
              self._bundle._GenerateBundleClass('GeneratedSchemas'))
     c.Append('return IsGenerated(name) ? '
              'g_lazy_instance.Get().schemas[name] : "";')
     c.Eblock('}')
     c.Append()
     c.Append('// static')
     c.Sblock('bool %s::IsGenerated(std::string name) {' %
              self._bundle._GenerateBundleClass('GeneratedSchemas'))
     c.Append('return g_lazy_instance.Get().schemas.count(name) > 0;')
     c.Eblock('}')
     c.Append()
     c.Concat(cpp_util.CloseNamespace(self._bundle._cpp_namespace))
     c.Append()
     return c