9 files changed, 28 insertions, 28 deletions
diff --git a/webkit/blob/deletable_file_reference.cc b/webkit/blob/deletable_file_reference.cc
index b795b133..4a5665d 100644
--- a/webkit/blob/deletable_file_reference.cc
+++ b/webkit/blob/deletable_file_reference.cc
@@ -15,8 +15,8 @@ namespace webkit_blob {
 namespace {
 
 typedef std::map<FilePath, DeletableFileReference*> DeleteableFileMap;
-static base::LazyInstance<DeleteableFileMap> g_deletable_file_map(
-    base::LINKER_INITIALIZED);
+static base::LazyInstance<DeleteableFileMap> g_deletable_file_map =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index eca71dc..5e47fe4 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -411,7 +411,7 @@ const std::string& UserAgentState::Get(const GURL& url) const {
   return user_agent_;
 }
 
-base::LazyInstance<UserAgentState> g_user_agent(base::LINKER_INITIALIZED);
+base::LazyInstance<UserAgentState> g_user_agent = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index b1ff0c7..42fa3ef 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -208,10 +208,10 @@ const int32 kTransferBufferSize = 1024 * 1024;
 
 static base::LazyInstance<
     std::set<WebGraphicsContext3DInProcessCommandBufferImpl*> >
-        g_all_shared_contexts(base::LINKER_INITIALIZED);
+        g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER;
 static base::LazyInstance<base::Lock,
                           base::LeakyLazyInstanceTraits<base::Lock> >
-    g_all_shared_contexts_lock(base::LINKER_INITIALIZED);
+    g_all_shared_contexts_lock = LAZY_INSTANCE_INITIALIZER;
 
 // Singleton used to initialize and terminate the gles2 library.
 class GLES2Initializer {
@@ -230,8 +230,8 @@ class GLES2Initializer {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static base::LazyInstance<GLES2Initializer> g_gles2_initializer(
-    base::LINKER_INITIALIZED);
+static base::LazyInstance<GLES2Initializer> g_gles2_initializer =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace anonymous
 
@@ -297,8 +297,8 @@ GLInProcessContext* GLInProcessContext::CreateOffscreenContext(
 // thread. In layout tests, any thread could call this function. GLES2Decoder,
 // and in particular the GL implementations behind it, are not generally
 // threadsafe, so we guard entry points with a mutex.
-static base::LazyInstance<base::Lock>
-    g_decoder_lock(base::LINKER_INITIALIZED);
+static base::LazyInstance<base::Lock> g_decoder_lock =
+    LAZY_INSTANCE_INITIALIZER;
 
 void GLInProcessContext::PumpCommands() {
   base::AutoLock lock(g_decoder_lock.Get());
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 04f635d..ef2dd7e 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -24,8 +24,8 @@ namespace {
 
 static const char kApplicationOctetStream[] = "application/octet-stream";
 
-base::LazyInstance<webkit::npapi::PluginList> g_singleton(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<webkit::npapi::PluginList> g_singleton =
+    LAZY_INSTANCE_INITIALIZER;
 
 bool AllowMimeTypeMismatch(const std::string& orig_mime_type,
                            const std::string& actual_mime_type) {
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
index a4ee57a..55fcb25 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
@@ -72,30 +72,30 @@ const int kWindowedPluginPopupTimerMs = 50;
 WebPluginDelegateImpl* g_current_plugin_instance = NULL;
 
 typedef std::deque<MSG> ThrottleQueue;
-base::LazyInstance<ThrottleQueue> g_throttle_queue(base::LINKER_INITIALIZED);
-base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<ThrottleQueue> g_throttle_queue = LAZY_INSTANCE_INITIALIZER;
 
+base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map =
+    LAZY_INSTANCE_INITIALIZER;
 
 // Helper object for patching the TrackPopupMenu API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_track_popup_menu(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_track_popup_menu =
+    LAZY_INSTANCE_INITIALIZER;
 
 // Helper object for patching the SetCursor API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_set_cursor(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_set_cursor =
+    LAZY_INSTANCE_INITIALIZER;
 
 // Helper object for patching the RegEnumKeyExW API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w =
+    LAZY_INSTANCE_INITIALIZER;
 
 // Helper object for patching the GetProcAddress API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_proc_address(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_proc_address =
+    LAZY_INSTANCE_INITIALIZER;
 
 // Helper object for patching the GetKeyState API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_key_state(
-    base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_key_state =
+    LAZY_INSTANCE_INITIALIZER;
 
 // Saved key state globals and helper access functions.
 SHORT (WINAPI *g_iat_orig_get_key_state)(int vkey);
diff --git a/webkit/plugins/npapi/webplugin_ime_win.cc b/webkit/plugins/npapi/webplugin_ime_win.cc
index e06a57f..9b92a81 100644
--- a/webkit/plugins/npapi/webplugin_ime_win.cc
+++ b/webkit/plugins/npapi/webplugin_ime_win.cc
@@ -27,7 +27,7 @@ namespace npapi {
 // WebPluginIMEWin instance through our patch function.
 base::LazyInstance<base::Lock,
                    base::LeakyLazyInstanceTraits<base::Lock> >
-    g_webplugin_ime_lock(base::LINKER_INITIALIZED);
+    g_webplugin_ime_lock = LAZY_INSTANCE_INITIALIZER;
 
 WebPluginIMEWin* WebPluginIMEWin::instance_ = NULL;
 
diff --git a/webkit/plugins/ppapi/ppapi_interface_factory.cc b/webkit/plugins/ppapi/ppapi_interface_factory.cc
index 629dca9..26df97ac0 100644
--- a/webkit/plugins/ppapi/ppapi_interface_factory.cc
+++ b/webkit/plugins/ppapi/ppapi_interface_factory.cc
@@ -12,7 +12,7 @@ namespace webkit {
 namespace ppapi {
 
 base::LazyInstance<PpapiInterfaceFactoryManager>
-    g_ppapi_interface_factory_manager(base::LINKER_INITIALIZED);
+    g_ppapi_interface_factory_manager = LAZY_INSTANCE_INITIALIZER;
 
 PpapiInterfaceFactoryManager::PpapiInterfaceFactoryManager() {
 }
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc
index 4a44a80..2b4219f 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.cc
+++ b/webkit/tools/test_shell/simple_clipboard_impl.cc
@@ -29,7 +29,7 @@ ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() {
 
 namespace webkit_glue {
 
-base::LazyInstance<ui::Clipboard> clipboard(base::LINKER_INITIALIZED);
+base::LazyInstance<ui::Clipboard> clipboard = LAZY_INSTANCE_INITIALIZER;
 
 ui::Clipboard* ClipboardGetClipboard() {
   return clipboard.Pointer();
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 35c6bfb..55748c1 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -74,7 +74,7 @@ static ui::DataPack* g_resource_data_pack = NULL;
 
 // Define static member variables
 base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> >
-    TestShell::window_map_(base::LINKER_INITIALIZED);
+    TestShell::window_map_ = LAZY_INSTANCE_INITIALIZER;
 
 // Helper method for getting the path to the test shell resources directory.
 FilePath GetResourcesFilePath() {