Require explicit selection of traits for LazyInstance

components/proximity_auth/screenlock_bridge.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 "components/proximity_auth/screenlock_bridge.h"
 
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "components/proximity_auth/logging/logging.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #endif
 
 namespace proximity_auth {
 namespace {
 
-base::LazyInstance<ScreenlockBridge> g_screenlock_bridge_instance =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<ScreenlockBridge>::DestructorAtExit
+    g_screenlock_bridge_instance = LAZY_INSTANCE_INITIALIZER;
 
 // Ids for the icons that are supported by lock screen and signin screen
 // account picker as user pod custom icons.
 // The id's should be kept in sync with values used by user_pod_row.js.
 const char kLockedUserPodCustomIconId[] = "locked";
 const char kLockedToBeActivatedUserPodCustomIconId[] = "locked-to-be-activated";
 const char kLockedWithProximityHintUserPodCustomIconId[] =
     "locked-with-proximity-hint";
 const char kUnlockedUserPodCustomIconId[] = "unlocked";
 const char kHardlockedUserPodCustomIconId[] = "hardlocked";
@@ skipping 148 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 ScreenlockBridge::ScreenlockBridge()
     : lock_handler_(nullptr), focused_account_id_(EmptyAccountId()) {}
 
 ScreenlockBridge::~ScreenlockBridge() {
 }
 
 }  // namespace proximity_auth