Allow linker initialization of lazy instance

chrome/browser/chromeos/login/user_manager.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/login/user_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 65 matching lines @@
 const char kImagePathNodeName[] = "path";
 const char kImageIndexNodeName[] = "index";
 
 // Index of the default image used as stub while the real user image is loading
 // from file and for the |kStubUser| user.
 const int kStubDefaultImageIndex = 0;
 
 // Delay betweeen user login and attempt to update user's profile image.
 const long kProfileImageDownloadDelayMs = 10000;
 
-base::LazyInstance<UserManager> g_user_manager(base::LINKER_INITIALIZED);
+base::LazyInstance<UserManager> g_user_manager = LAZY_INSTANCE_INITIALIZER;
 
 // Used to handle the asynchronous response of deleting a cryptohome directory.
 class RemoveAttempt : public CryptohomeLibrary::Delegate {
  public:
   // Creates new remove attempt for the given user. Note, |delegate| can
   // be NULL.
   RemoveAttempt(const std::string& user_email,
                 chromeos::RemoveUserDelegate* delegate)
       : user_email_(user_email),
         delegate_(delegate),
@@ skipping 760 matching lines @@
 
 User* UserManager::CreateUser(const std::string& email) const {
   User* user = new User(email);
   user->set_oauth_token_status(GetUserOAuthStatus(email));
   // Used to determine whether user's display name is unique.
   ++display_name_count_[user->GetDisplayName()];
   return user;
 }
 
 }  // namespace chromeos