Require explicit selection of traits for LazyInstance

device/bluetooth/bluetooth_adapter_factory_wrapper.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 DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_
 
 #include <unordered_set>
 
 #include "base/lazy_instance.h"
@@ skipping 38 matching lines @@
   BluetoothAdapter* GetAdapter(BluetoothAdapter::Observer* observer);
 
   // Sets a new BluetoothAdapter to be returned by GetAdapter. When setting
   // a new adapter all observers from the old adapter are removed and added
   // to |mock_adapter|.
   void SetBluetoothAdapterForTesting(
       scoped_refptr<BluetoothAdapter> mock_adapter);
 
  private:
   // friend LazyInstance to permit access to private constructor.
-  friend base::DefaultLazyInstanceTraits<BluetoothAdapterFactoryWrapper>;
+  friend base::LazyInstanceTraitsBase<BluetoothAdapterFactoryWrapper>;
 
   BluetoothAdapterFactoryWrapper();
 
   void OnGetAdapter(const AcquireAdapterCallback& continuation,
                     scoped_refptr<BluetoothAdapter> adapter);
 
   bool HasAdapter(BluetoothAdapter::Observer* observer);
   void AddAdapterObserver(BluetoothAdapter::Observer* observer);
   void RemoveAdapterObserver(BluetoothAdapter::Observer* observer);
 
@@ skipping 17 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothAdapterFactoryWrapper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterFactoryWrapper);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_WRAPPER_H_