Require explicit selection of traits for LazyInstance

chrome/browser/extensions/extension_commands_global_registry.cc

 // Copyright (c) 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 "chrome/browser/extensions/extension_commands_global_registry.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/global_shortcut_listener.h"
 #include "extensions/common/extension.h"
@@ skipping 17 matching lines @@
 
     // Resume GlobalShortcutListener before we clean up if the shortcut handling
     // is currently suspended.
     if (global_shortcut_listener->IsShortcutHandlingSuspended())
       global_shortcut_listener->SetShortcutHandlingSuspended(false);
 
     global_shortcut_listener->UnregisterAccelerators(this);
   }
 }
 
-static base::LazyInstance<
-    BrowserContextKeyedAPIFactory<ExtensionCommandsGlobalRegistry> > g_factory =
+static base::LazyInstance<BrowserContextKeyedAPIFactory<
+    ExtensionCommandsGlobalRegistry>>::DestructorAtExit g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<ExtensionCommandsGlobalRegistry>*
 ExtensionCommandsGlobalRegistry::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 // static
 ExtensionCommandsGlobalRegistry* ExtensionCommandsGlobalRegistry::Get(
@@ skipping 57 matching lines @@
   if (registry_for_active_window())
     registry_for_active_window()->SetShortcutHandlingSuspended(suspended);
 }
 
 void ExtensionCommandsGlobalRegistry::OnKeyPressed(
     const ui::Accelerator& accelerator) {
   ExtensionKeybindingRegistry::NotifyEventTargets(accelerator);
 }
 
 }  // namespace extensions