Require explicit selection of traits for LazyInstance

chrome/browser/extensions/api/image_writer_private/removable_storage_provider.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 "base/lazy_instance.h"
 #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace extensions {
 
 // A device list to be returned when testing.
-static base::LazyInstance<scoped_refptr<StorageDeviceList> > g_test_device_list;
+static base::LazyInstance<scoped_refptr<StorageDeviceList>>::DestructorAtExit
+    g_test_device_list;

[Nico, 2017/03/07 21:43:02]

likewsie

[scottmg, 2017/03/07 21:56:30]

Done.

 
 // TODO(haven): Udev code may be duplicated in the Chrome codebase.
 // https://code.google.com/p/chromium/issues/detail?id=284898
 
 void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
   if (g_test_device_list.Get().get() != NULL) {
     content::BrowserThread::PostTask(
         content::BrowserThread::FILE,
         FROM_HERE,
         base::Bind(callback, g_test_device_list.Get(), true));
@@ skipping 13 matching lines @@
 void RemovableStorageProvider::SetDeviceListForTesting(
     scoped_refptr<StorageDeviceList> device_list) {
   g_test_device_list.Get() = device_list;
 }
 
 void RemovableStorageProvider::ClearDeviceListForTesting() {
   g_test_device_list.Get() = NULL;
 }
 
 }  // namespace extensions