Require explicit selection of traits for LazyInstance

chrome/browser/extensions/api/hotword_private/hotword_private_api.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/hotword_private/hotword_private_api.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 27 matching lines @@
 namespace hotword_private_constants {
 const char kHotwordServiceUnavailable[] = "Hotword Service is unavailable.";
 const char kHotwordEventServiceUnavailable[] =
     "Hotword Private Event Service is unavailable.";
 }  // hotword_private_constants
 
 namespace OnEnabledChanged =
     api::hotword_private::OnEnabledChanged;
 
 static base::LazyInstance<
-    BrowserContextKeyedAPIFactory<HotwordPrivateEventService> > g_factory =
-    LAZY_INSTANCE_INITIALIZER;
+    BrowserContextKeyedAPIFactory<HotwordPrivateEventService>>::DestructorAtExit
+    g_factory = LAZY_INSTANCE_INITIALIZER;
 
 HotwordPrivateEventService::HotwordPrivateEventService(
     content::BrowserContext* context)
     : profile_(Profile::FromBrowserContext(context)) {
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kHotwordSearchEnabled,
       base::Bind(&HotwordPrivateEventService::OnEnabledChanged,
                  base::Unretained(this)));
   pref_change_registrar_.Add(
@@ skipping 471 matching lines @@
   HotwordService* hotword_service = HotwordServiceFactory::GetForProfile(
       Profile::FromBrowserContext(browser_context()));
   if (!hotword_service)
     return RespondNow(Error(kUnknownErrorDoNotUse));
 
   hotword_service->SpeakerModelExistsComplete(params->exists);
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions