Require explicit selection of traits for LazyInstance

chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc

 // Copyright 2015 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 "chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h"
 
 #include <stdint.h>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 // The set of blocked profiles.
 class ProfileSet : public base::NonThreadSafe, public std::set<Profile*> {
  public:
   ProfileSet() {}
 
   virtual ~ProfileSet() {}
 
   static ProfileSet* Get();
 
  private:
-  friend struct ::base::DefaultLazyInstanceTraits<ProfileSet>;
+  friend struct ::base::LazyInstanceTraitsBase<ProfileSet>;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSet);
 };
 
 // Set of all of profiles for which restore session is in progress.
 // This static member is accessible only form UI thread.
-base::LazyInstance<ProfileSet> g_blocked_profiles = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<ProfileSet>::DestructorAtExit g_blocked_profiles =
+    LAZY_INSTANCE_INITIALIZER;
 
 ProfileSet* ProfileSet::Get() {
   return g_blocked_profiles.Pointer();
 }
 
 // Global counter that keeps the track of session merge status for all
 // encountered profiles. This is used to determine if a throttle should
 // even be even added to new requests. Value of 0 (initial) means that we
 // probably have some profiles to restore, while 1 means that all known
 // profiles are restored.
@@ skipping 139 matching lines @@
 
       default:
         break;
     }
   }
 
   return pending_session_restore;
 }
 
 }  // namespace merge_session_throttling_utils