Require explicit selection of traits for LazyInstance

extensions/browser/api/socket/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/socket.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "extensions/browser/api/api_resource_manager.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/socket/socket.h"
 
 namespace extensions {
 
 const char kSocketTypeNotSupported[] = "Socket type does not support this API";
 
 static base::LazyInstance<
-    BrowserContextKeyedAPIFactory<ApiResourceManager<Socket> > > g_factory =
-    LAZY_INSTANCE_INITIALIZER;
+    BrowserContextKeyedAPIFactory<ApiResourceManager<Socket>>>::DestructorAtExit
+    g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 template <>
 BrowserContextKeyedAPIFactory<ApiResourceManager<Socket> >*
 ApiResourceManager<Socket>::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 Socket::Socket(const std::string& owner_extension_id)
     : ApiResource(owner_extension_id), is_connected_(false) {}
@@ skipping 100 matching lines @@
     : io_buffer(io_buffer),
       byte_count(byte_count),
       callback(callback),
       bytes_written(0) {}
 
 Socket::WriteRequest::WriteRequest(const WriteRequest& other) = default;
 
 Socket::WriteRequest::~WriteRequest() {}
 
 }  // namespace extensions