Require explicit selection of traits for LazyInstance

chrome/browser/internal_auth.cc

 // Copyright (c) 2012 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/internal_auth.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 306 matching lines @@
   // That means that we must not trust any tick less than or equal to dark tick.
   int64_t dark_tick_;
 
   DISALLOW_COPY_AND_ASSIGN(InternalAuthVerificationService);
 };
 
 }  // namespace chrome
 
 namespace {
 
-static base::LazyInstance<chrome::InternalAuthVerificationService>
-    g_verification_service = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<chrome::InternalAuthVerificationService>::
+    DestructorAtExit g_verification_service = LAZY_INSTANCE_INITIALIZER;
 static base::LazyInstance<base::Lock>::Leaky
     g_verification_service_lock = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace chrome {
 
 class InternalAuthGenerationService : public base::ThreadChecker {
  public:
   InternalAuthGenerationService() : key_regeneration_tick_(0) {
@@ skipping 86 matching lines @@
   int64_t key_regeneration_tick_;
   std::deque<int64_t> used_ticks_;
 
   DISALLOW_COPY_AND_ASSIGN(InternalAuthGenerationService);
 };
 
 }  // namespace chrome
 
 namespace {
 
-static base::LazyInstance<chrome::InternalAuthGenerationService>
-    g_generation_service = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<chrome::InternalAuthGenerationService>::
+    DestructorAtExit g_generation_service = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace chrome {
 
 // static
 bool InternalAuthVerification::VerifyPassport(
     const std::string& passport,
     const std::string& domain,
     const VarValueMap& var_value_map) {
@@ skipping 24 matching lines @@
     const std::string& domain, const VarValueMap& var_value_map) {
   return g_generation_service.Get().GeneratePassport(domain, var_value_map, 0);
 }
 
 // static
 void InternalAuthGeneration::GenerateNewKey() {
   g_generation_service.Get().GenerateNewKey();
 }
 
 }  // namespace chrome