Require explicit selection of traits for LazyInstance

chrome/browser/usb/usb_blocklist.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_USB_USB_BLOCKLIST_H_
 #define CHROME_BROWSER_USB_USB_BLOCKLIST_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 48 matching lines @@
   bool IsExcluded(scoped_refptr<const device::UsbDevice>);
 
   // Size of the blocklist.
   size_t size() { return blocklisted_devices_.size(); }
 
   // Reload the blocklist for testing purposes.
   void ResetToDefaultValuesForTest();
 
  private:
   // friend LazyInstance to permit access to private constructor.
-  friend base::DefaultLazyInstanceTraits<UsbBlocklist>;
+  friend base::LazyInstanceTraitsBase<UsbBlocklist>;
 
   UsbBlocklist();
 
   void PopulateWithDefaultValues();
 
   // Populates the blocklist with values obtained dynamically from a server,
   // able to be updated without shipping new executable versions.
   void PopulateWithServerProvidedValues();
 
   // Set of blocklist entries.
   std::set<Entry> blocklisted_devices_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbBlocklist);
 };
 
 #endif  // CHROME_BROWSER_USB_USB_BLOCKLIST_H_