summaryrefslogtreecommitdiffstats
path: root/net/websockets/websocket_job.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/websockets/websocket_job.cc')
-rw-r--r--net/websockets/websocket_job.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 44c944d..9adbaa3 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/lazy_instance.h"
+#include "base/singleton.h"
#include "base/string_tokenizer.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
@@ -40,23 +40,20 @@ net::SocketStreamJob* WebSocketJobFactory(
class WebSocketJobInitSingleton {
private:
- friend struct base::DefaultLazyInstanceTraits<WebSocketJobInitSingleton>;
+ friend struct DefaultSingletonTraits<WebSocketJobInitSingleton>;
WebSocketJobInitSingleton() {
net::SocketStreamJob::RegisterProtocolFactory("ws", WebSocketJobFactory);
net::SocketStreamJob::RegisterProtocolFactory("wss", WebSocketJobFactory);
}
};
-static base::LazyInstance<WebSocketJobInitSingleton> g_websocket_job_init(
- base::LINKER_INITIALIZED);
-
} // anonymous namespace
namespace net {
// static
void WebSocketJob::EnsureInit() {
- g_websocket_job_init.Get();
+ Singleton<WebSocketJobInitSingleton>::get();
}
WebSocketJob::WebSocketJob(SocketStream::Delegate* delegate)