Require explicit selection of traits for LazyInstance

chrome/browser/extensions/api/content_settings/content_settings_service.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 "chrome/browser/extensions/api/content_settings/content_settings_service.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_scope.h"
 #include "extensions/browser/pref_names.h"
 
 namespace extensions {
 
 ContentSettingsService::ContentSettingsService(content::BrowserContext* context)
     : content_settings_store_(new ContentSettingsStore()) {}
 
 ContentSettingsService::~ContentSettingsService() {}
 
 // static
 ContentSettingsService* ContentSettingsService::Get(
     content::BrowserContext* context) {
   return BrowserContextKeyedAPIFactory<ContentSettingsService>::Get(context);
 }
 
 // BrowserContextKeyedAPI implementation.
 BrowserContextKeyedAPIFactory<ContentSettingsService>*
 ContentSettingsService::GetFactoryInstance() {
   static base::LazyInstance<
-      BrowserContextKeyedAPIFactory<ContentSettingsService> > factory =
-      LAZY_INSTANCE_INITIALIZER;
+      BrowserContextKeyedAPIFactory<ContentSettingsService>>::DestructorAtExit
+      factory = LAZY_INSTANCE_INITIALIZER;
   return factory.Pointer();
 }
 
 void ContentSettingsService::OnExtensionRegistered(
     const std::string& extension_id,
     const base::Time& install_time,
     bool is_enabled) {
   content_settings_store_->RegisterExtension(
       extension_id, install_time, is_enabled);
 }
@@ skipping 22 matching lines @@
   content_settings_store_->UnregisterExtension(extension_id);
 }
 
 void ContentSettingsService::OnExtensionStateChanged(
     const std::string& extension_id,
     bool state) {
   content_settings_store_->SetExtensionState(extension_id, state);
 }
 
 }  // namespace extensions