Require explicit selection of traits for LazyInstance

services/catalog/catalog.cc

 // Copyright 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 "services/catalog/catalog.h"
 
 #include <memory>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 19 matching lines @@
 
 namespace catalog {
 
 namespace {
 
 const char kCatalogServicesKey[] = "services";
 const char kCatalogServiceEmbeddedKey[] = "embedded";
 const char kCatalogServiceExecutableKey[] = "executable";
 const char kCatalogServiceManifestKey[] = "manifest";
 
-base::LazyInstance<std::unique_ptr<base::Value>> g_default_static_manifest =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<std::unique_ptr<base::Value>>::DestructorAtExit
+    g_default_static_manifest = LAZY_INSTANCE_INITIALIZER;
 
 void LoadCatalogManifestIntoCache(const base::Value* root, EntryCache* cache) {
   DCHECK(root);
   const base::DictionaryValue* catalog = nullptr;
   if (!root->GetAsDictionary(&catalog)) {
     LOG(ERROR) << "Catalog manifest is not a dictionary value.";
     return;
   }
   DCHECK(catalog);
 
@@ skipping 150 matching lines @@
   if (it != instances_.end())
     return it->second.get();
 
   auto result = instances_.insert(std::make_pair(
       user_id,
       base::MakeUnique<Instance>(&system_cache_, service_manifest_provider_)));
   return result.first->second.get();
 }
 
 }  // namespace catalog