Require explicit selection of traits for LazyInstance

chrome/browser/extensions/chrome_extension_host_delegate.cc

 // Copyright 2014 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/extensions/chrome_extension_host_delegate.h"
 
 #include <memory>
 #include <string>
 
 #include "base/lazy_instance.h"
@@ skipping 15 matching lines @@
 namespace {
 
 // Singleton for GetExtensionHostQueue().
 struct QueueWrapper {
   QueueWrapper() {
     queue.reset(new LoadMonitoringExtensionHostQueue(
         std::unique_ptr<ExtensionHostQueue>(new SerialExtensionHostQueue())));
   }
   std::unique_ptr<ExtensionHostQueue> queue;
 };
-base::LazyInstance<QueueWrapper> g_queue = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<QueueWrapper>::DestructorAtExit g_queue =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ChromeExtensionHostDelegate::ChromeExtensionHostDelegate() {}
 
 ChromeExtensionHostDelegate::~ChromeExtensionHostDelegate() {}
 
 void ChromeExtensionHostDelegate::OnExtensionHostCreated(
     content::WebContents* web_contents) {
   ChromeExtensionWebContentsObserver::CreateForWebContents(web_contents);
@@ skipping 47 matching lines @@
   return MediaCaptureDevicesDispatcher::GetInstance()
       ->CheckMediaAccessPermission(
           web_contents, security_origin, type, extension);
 }
 
 ExtensionHostQueue* ChromeExtensionHostDelegate::GetExtensionHostQueue() const {
   return g_queue.Get().queue.get();
 }
 
 }  // namespace extensions