Require explicit selection of traits for LazyInstance

extensions/browser/error_map.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 "extensions/browser/error_map.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 
 namespace extensions {
 
 namespace {
 
 // The maximum number of errors to be stored per extension.
 const size_t kMaxErrorsPerExtension = 100;
 
-base::LazyInstance<ErrorList> g_empty_error_list = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<ErrorList>::DestructorAtExit g_empty_error_list =
+    LAZY_INSTANCE_INITIALIZER;
 
 // An incrementing counter for the next error id. Overflowing this is very
 // unlikely, since the number of errors per extension is capped at 100.
 int kNextErrorId = 1;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ErrorMap::Filter
 ErrorMap::Filter::Filter(const std::string& restrict_to_extension_id,
@@ skipping 169 matching lines @@
         affected_ids->insert(key_val.first);
     }
   }
 }
 
 void ErrorMap::RemoveAllErrors() {
   map_.clear();
 }
 
 }  // namespace extensions