Require explicit selection of traits for LazyInstance

chrome/browser/extensions/api/easy_unlock_private/easy_unlock_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/easy_unlock_private/easy_unlock_private_api.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base64url.h"
@@ skipping 50 matching lines @@
 #endif
 
 using proximity_auth::ScreenlockState;
 
 namespace extensions {
 
 namespace easy_unlock_private = api::easy_unlock_private;
 
 namespace {
 
-static base::LazyInstance<BrowserContextKeyedAPIFactory<EasyUnlockPrivateAPI> >
-    g_factory = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<BrowserContextKeyedAPIFactory<EasyUnlockPrivateAPI>>::
+    DestructorAtExit g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // Utility method for getting the API's crypto delegate.
 EasyUnlockPrivateCryptoDelegate* GetCryptoDelegate(
     content::BrowserContext* context) {
   return BrowserContextKeyedAPIFactory<EasyUnlockPrivateAPI>::Get(context)
       ->GetCryptoDelegate();
 }
 
 EasyUnlockPrivateConnectionManager* GetConnectionManager(
     content::BrowserContext* context) {
@@ skipping 1098 matching lines @@
       GetConnectionManager(browser_context())
           ->GetDeviceAddress(extension(), params->connection_id);
   if (device_address.empty())
     return RespondNow(Error("Invalid connectionId."));
   return RespondNow(ArgumentList(
       easy_unlock_private::SetupConnectionGetDeviceAddress::Results::Create(
           device_address)));
 }
 
 }  // namespace extensions