Require explicit selection of traits for LazyInstance

extensions/browser/api/socket/tcp_socket.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 "extensions/browser/api/socket/tcp_socket.h"
 
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "extensions/browser/api/api_resource.h"
 #include "net/base/address_list.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/rand_callback.h"
 #include "net/log/net_log_source.h"
 #include "net/socket/tcp_client_socket.h"
 
 namespace extensions {
 
 const char kTCPSocketTypeInvalidError[] =
     "Cannot call both connect and listen on the same socket.";
 const char kSocketListenError[] = "Could not listen on the specified port.";
 
-static base::LazyInstance<
-    BrowserContextKeyedAPIFactory<ApiResourceManager<ResumableTCPSocket> > >
-    g_factory = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<BrowserContextKeyedAPIFactory<
+    ApiResourceManager<ResumableTCPSocket>>>::DestructorAtExit g_factory =
+    LAZY_INSTANCE_INITIALIZER;
 
 // static
 template <>
 BrowserContextKeyedAPIFactory<ApiResourceManager<ResumableTCPSocket> >*
 ApiResourceManager<ResumableTCPSocket>::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<
-    ApiResourceManager<ResumableTCPServerSocket> > > g_server_factory =
-    LAZY_INSTANCE_INITIALIZER;
+    ApiResourceManager<ResumableTCPServerSocket>>>::DestructorAtExit
+    g_server_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 template <>
 BrowserContextKeyedAPIFactory<ApiResourceManager<ResumableTCPServerSocket> >*
 ApiResourceManager<ResumableTCPServerSocket>::GetFactoryInstance() {
   return g_server_factory.Pointer();
 }
 
 TCPSocket::TCPSocket(const std::string& owner_extension_id)
     : Socket(owner_extension_id), socket_mode_(UNKNOWN) {}
@@ skipping 323 matching lines @@
 
 bool ResumableTCPSocket::IsPersistent() const { return persistent(); }
 
 ResumableTCPServerSocket::ResumableTCPServerSocket(
     const std::string& owner_extension_id)
     : TCPSocket(owner_extension_id), persistent_(false), paused_(false) {}
 
 bool ResumableTCPServerSocket::IsPersistent() const { return persistent(); }
 
 }  // namespace extensions