| Index: ui/base/l10n/l10n_util.cc
|
| diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
|
| index ad0ad0ed9d12d175bc9660839a628ab7fe0bf234..462e7770ca78990edfc0ada664b86ba644982afe 100644
|
| --- a/ui/base/l10n/l10n_util.cc
|
| +++ b/ui/base/l10n/l10n_util.cc
|
| @@ -277,11 +277,10 @@ void AdjustParagraphDirectionality(base::string16* paragraph) {
|
| }
|
|
|
| struct AvailableLocalesTraits
|
| - : base::DefaultLazyInstanceTraits<std::vector<std::string> > {
|
| + : base::LazyInstanceTraitsBase<std::vector<std::string>> {
|
| static std::vector<std::string>* New(void* instance) {
|
| std::vector<std::string>* locales =
|
| - base::DefaultLazyInstanceTraits<std::vector<std::string> >::New(
|
| - instance);
|
| + base::LazyInstanceTraitsBase<std::vector<std::string>>::New(instance);
|
| int num_locales = uloc_countAvailable();
|
| for (int i = 0; i < num_locales; ++i) {
|
| std::string locale_name = uloc_getAvailable(i);
|
|
|