Require explicit selection of traits for LazyInstance

components/content_settings/core/browser/content_settings_registry.cc

 // Copyright 2015 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 "components/content_settings/core/browser/content_settings_registry.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/content_settings.h"
 
 namespace content_settings {
 
 namespace {
 
-base::LazyInstance<ContentSettingsRegistry> g_instance =
+base::LazyInstance<ContentSettingsRegistry>::DestructorAtExit g_instance =
     LAZY_INSTANCE_INITIALIZER;
 
 // TODO(raymes): These overloaded functions make the registration code clearer.
 // When initializer lists are available they won't be needed. The initializer
 // list can be implicitly or explicitly converted to a std::vector.
 std::vector<std::string> WhitelistedSchemes() {
   return std::vector<std::string>();
 }
 
 std::vector<std::string> WhitelistedSchemes(const char* scheme1,
@@ skipping 301 matching lines @@
   if (!website_settings_info)
     return;
 
   DCHECK(!base::ContainsKey(content_settings_info_, type));
   content_settings_info_[type] = base::MakeUnique<ContentSettingsInfo>(
       website_settings_info, whitelisted_schemes, valid_settings,
       incognito_behavior);
 }
 
 }  // namespace content_settings