Allow linker initialization of lazy instance

chrome/browser/chromeos/web_socket_proxy_controller.cc

 // Copyright (c) 2011 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/chromeos/web_socket_proxy_controller.h"
 
 #include <algorithm>
 
 #include <netinet/in.h>
 #include <sys/wait.h>
@@ skipping 78 matching lines @@
         allowed_ids_.begin(), allowed_ids_.end(), extension_id);
   }
 
   const std::vector<std::string>& allowed_origins() { return allowed_origins_; }
 
  private:
   std::vector<std::string> allowed_ids_;
   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;
 };
 
 class ProxyLifetime
     : public net::NetworkChangeNotifier::OnlineStateObserver,
       public content::NotificationObserver {
  public:
   ProxyLifetime() : delay_ms_(1000), port_(-1), shutdown_requested_(false) {
@@ skipping 37 matching lines @@
   int volatile port_;
 
   chromeos::WebSocketProxy* volatile server_;
   volatile bool shutdown_requested_;
   base::Lock lock_;
   content::NotificationRegistrar registrar_;
   friend class ProxyTask;
   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";
   chromeos::WebSocketProxy* server = new chromeos::WebSocketProxy(
       g_validator.Get().allowed_origins());
   {
     base::AutoLock alk(g_proxy_lifetime.Get().lock_);
     if (g_proxy_lifetime.Get().shutdown_requested_)
       return;
     delete g_proxy_lifetime.Get().server_;
@@ skipping 58 matching lines @@
 bool WebSocketProxyController::CheckCredentials(
     const std::string& extension_id,
     const std::string& hostname,
     unsigned short port,
     ConnectionFlags flags) {
   return g_validator.Get().CheckCredentials(
       extension_id, hostname, port, flags);
 }
 
 }  // namespace chromeos