Allow linker initialization of lazy instance

chrome_frame/metrics_service.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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is created at ChromeFrame startup in
@@ skipping 60 matching lines @@
 
 static const char kMetricsType[] = "application/vnd.mozilla.metrics.bz2";
 
 // The first UMA upload occurs after this interval.
 static const int kInitialUMAUploadTimeoutMilliSeconds = 30000;
 
 // Default to one UMA upload per 10 mins.
 static const int kMinMilliSecondsPerUMAUpload = 600000;
 
 base::LazyInstance<base::ThreadLocalPointer<MetricsService> >
-    MetricsService::g_metrics_instance_(base::LINKER_INITIALIZED);
+    MetricsService::g_metrics_instance_ = LAZY_INSTANCE_INITIALIZER;
 
 base::Lock MetricsService::metrics_service_lock_;
 
 // Initialize histogram statistics gathering system.
 base::LazyInstance<base::StatisticsRecorder>
-    g_statistics_recorder_(base::LINKER_INITIALIZED);
+    g_statistics_recorder_ = LAZY_INSTANCE_INITIALIZER;
 
 // This class provides functionality to upload the ChromeFrame UMA data to the
 // server. An instance of this class is created whenever we have data to be
 // uploaded to the server.
 class ChromeFrameMetricsDataUploader : public BSCBImpl {
  public:
   ChromeFrameMetricsDataUploader()
       : cache_stream_(NULL),
         upload_data_size_(0) {
     DVLOG(1) << __FUNCTION__;
@@ skipping 361 matching lines @@
     version += "-F";
     if (!version_info.IsOfficialBuild())
       version.append("-devel");
     return version;
   } else {
     NOTREACHED() << "Unable to retrieve version string.";
   }
 
   return std::string();
 }