summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/web_socket_proxy_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/web_socket_proxy_controller.cc')
-rw-r--r--chrome/browser/chromeos/web_socket_proxy_controller.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc
index 9a494e3..c431b7f 100644
--- a/chrome/browser/chromeos/web_socket_proxy_controller.cc
+++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc
@@ -96,7 +96,7 @@ class OriginValidator {
std::vector<std::string> allowed_origins_;
};
-base::LazyInstance<OriginValidator> g_validator(base::LINKER_INITIALIZED);
+base::LazyInstance<OriginValidator> g_validator = LAZY_INSTANCE_INITIALIZER;
class ProxyTask : public Task {
virtual void Run() OVERRIDE;
@@ -154,7 +154,7 @@ class ProxyLifetime
friend class chromeos::WebSocketProxyController;
};
-base::LazyInstance<ProxyLifetime> g_proxy_lifetime(base::LINKER_INITIALIZED);
+base::LazyInstance<ProxyLifetime> g_proxy_lifetime = LAZY_INSTANCE_INITIALIZER;
void ProxyTask::Run() {
LOG(INFO) << "Attempt to run web socket proxy task";