Require explicit selection of traits for LazyInstance

chrome/common/extensions/chrome_extensions_client.cc

 // Copyright 2013 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/common/extensions/chrome_extensions_client.h"
 
 #include <memory>
 #include <set>
 #include <string>
 
@@ skipping 76 matching lines @@
       return CHANNEL_BETA;
     case version_info::Channel::STABLE:
       return CHANNEL_STABLE;
   }
   NOTREACHED() << static_cast<int>(channel);
   return CHANNEL_UNKNOWN;
 }
 
 }  // namespace
 
-static base::LazyInstance<ChromeExtensionsClient> g_client =
+static base::LazyInstance<ChromeExtensionsClient>::DestructorAtExit g_client =
     LAZY_INSTANCE_INITIALIZER;
 
 ChromeExtensionsClient::ChromeExtensionsClient() {}
 
 ChromeExtensionsClient::~ChromeExtensionsClient() {
 }
 
 void ChromeExtensionsClient::Initialize() {
   // Registration could already be finalized in unit tests, where the utility
   // thread runs in-process.
@@ skipping 228 matching lines @@
     const {
   return GetCurrentChannel() == version_info::Channel::UNKNOWN;
 }
 
 // static
 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() {
   return g_client.Pointer();
 }
 
 }  // namespace extensions