Require explicit selection of traits for LazyInstance

chrome/browser/extensions/api/screenlock_private/screenlock_private_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 "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 128 matching lines @@
     const std::string& event_name,
     std::unique_ptr<base::Value> arg) {
   std::unique_ptr<base::ListValue> args(new base::ListValue());
   if (arg)
     args->Append(std::move(arg));
   std::unique_ptr<Event> event(
       new Event(histogram_value, event_name, std::move(args)));
   EventRouter::Get(browser_context_)->BroadcastEvent(std::move(event));
 }
 
-static base::LazyInstance<
-    BrowserContextKeyedAPIFactory<ScreenlockPrivateEventRouter>> g_factory =
+static base::LazyInstance<BrowserContextKeyedAPIFactory<
+    ScreenlockPrivateEventRouter>>::DestructorAtExit g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<ScreenlockPrivateEventRouter>*
 ScreenlockPrivateEventRouter::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 void ScreenlockPrivateEventRouter::Shutdown() {
   proximity_auth::ScreenlockBridge::Get()->RemoveObserver(this);
@@ skipping 11 matching lines @@
   args->AppendString(value);
 
   std::unique_ptr<Event> event(
       new Event(events::SCREENLOCK_PRIVATE_ON_AUTH_ATTEMPTED,
                 screenlock::OnAuthAttempted::kEventName, std::move(args)));
   router->BroadcastEvent(std::move(event));
   return true;
 }
 
 }  // namespace extensions