Require explicit selection of traits for LazyInstance

extensions/browser/api/system_info/system_info_api.cc

 // Copyright 2013 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/api/system_info/system_info_api.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
@@ skipping 206 matching lines @@
 void AddEventListener(const std::string& event_name) {
   SystemInfoEventRouter::GetInstance()->AddEventListener(event_name);
 }
 
 void RemoveEventListener(const std::string& event_name) {
   SystemInfoEventRouter::GetInstance()->RemoveEventListener(event_name);
 }
 
 }  // namespace
 
-static base::LazyInstance<BrowserContextKeyedAPIFactory<SystemInfoAPI> >
-    g_factory = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<
+    BrowserContextKeyedAPIFactory<SystemInfoAPI>>::DestructorAtExit g_factory =
+    LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<SystemInfoAPI>*
 SystemInfoAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 SystemInfoAPI::SystemInfoAPI(content::BrowserContext* context)
     : browser_context_(context) {
   EventRouter* router = EventRouter::Get(browser_context_);
@@ skipping 21 matching lines @@
 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
   if (IsSystemStorageEvent(details.event_name)) {
     StorageMonitor::GetInstance()->EnsureInitialized(
         base::Bind(&RemoveEventListener, details.event_name));
   } else {
     RemoveEventListener(details.event_name);
   }
 }
 
 }  // namespace extensions