Require explicit selection of traits for LazyInstance

third_party/libaddressinput/chromium/string_compare.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 "third_party/libaddressinput/src/cpp/src/util/string_compare.h"
 
 #include <memory>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
     DCHECK(U_SUCCESS(error_code));
     return result;
   }
 
  private:
   std::unique_ptr<icu::Collator> collator_;
 
   DISALLOW_COPY_AND_ASSIGN(IcuStringComparer);
 };
 
-static base::LazyInstance<IcuStringComparer> g_comparer =
+static base::LazyInstance<IcuStringComparer>::DestructorAtExit g_comparer =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // Dummy required for std::unique_ptr<Impl>.
 class StringCompare::Impl {};
 
 StringCompare::StringCompare() {}
 
 StringCompare::~StringCompare() {}
 
 bool StringCompare::NaturalEquals(const std::string& a,
                                   const std::string& b) const {
   return g_comparer.Get().Compare(a, b) == 0;
 }
 
 bool StringCompare::NaturalLess(const std::string& a,
                                 const std::string& b) const {
   return g_comparer.Get().Compare(a, b) < 0;
 }
 
 }  // namespace addressinput
 }  // namespace i18n