Allow linker initialization of lazy instance

webkit/tools/test_shell/test_shell_mac.mm

 // 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 <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
@@ skipping 56 matching lines @@
 // Hide the window offscreen when in layout test mode.  Mac OS X limits
 // window positions to +/- 16000.
 const int kTestWindowXLocation = -14000;
 const int kTestWindowYLocation = -14000;
 
 // Data pack resource. This is a pointer to the mmapped resources file.
 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() {
   FilePath path;
   // We need to know if we're bundled or not to know which path to use.
   if (base::mac::AmIBundled()) {
     PathService::Get(base::DIR_EXE, &path);
     path = path.Append(FilePath::kParentDirectory);
     return path.AppendASCII("Resources");
   } else {
@@ skipping 602 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue