Require explicit selection of traits for LazyInstance

components/proximity_auth/screenlock_bridge.h

 // 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.
 
 #ifndef COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_
 #define COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 153 matching lines @@
   void Unlock(const AccountId& account_id);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   LockHandler* lock_handler() { return lock_handler_; }
 
   const AccountId& focused_account_id() const { return focused_account_id_; }
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<ScreenlockBridge>;
+  friend struct base::LazyInstanceTraitsBase<ScreenlockBridge>;
   friend std::default_delete<ScreenlockBridge>;
 
   ScreenlockBridge();
   ~ScreenlockBridge();
 
   LockHandler* lock_handler_;  // Not owned
 
   // The last focused user's id.
   AccountId focused_account_id_;
   base::ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenlockBridge);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_SCREENLOCK_BRIDGE_H_