Require explicit selection of traits for LazyInstance

ui/base/l10n/time_format.cc

 // Copyright (c) 2011 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 "ui/base/l10n/time_format.h"
 
 #include <limits>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "third_party/icu/source/common/unicode/unistr.h"
 #include "ui/base/l10n/formatter.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_export.h"
 #include "ui/strings/grit/ui_strings.h"
 
 using base::Time;
 using base::TimeDelta;
 using ui::TimeFormat;
 
 namespace ui {
 
-UI_BASE_EXPORT base::LazyInstance<FormatterContainer> g_container =
-    LAZY_INSTANCE_INITIALIZER;
+UI_BASE_EXPORT base::LazyInstance<FormatterContainer>::DestructorAtExit
+    g_container = LAZY_INSTANCE_INITIALIZER;
 
 // static
 base::string16 TimeFormat::Simple(TimeFormat::Format format,
                                   TimeFormat::Length length,
                                   const base::TimeDelta& delta) {
   return Detailed(format, length, 0, delta);
 }
 
 // static
 base::string16 TimeFormat::Detailed(TimeFormat::Format format,
@@ skipping 90 matching lines @@
   if (time >= tomorrow)
     return base::string16();
   else if (time >= midnight_today)
     return l10n_util::GetStringUTF16(IDS_PAST_TIME_TODAY);
   else if (time >= yesterday)
     return l10n_util::GetStringUTF16(IDS_PAST_TIME_YESTERDAY);
   return base::string16();
 }
 
 }  // namespace ui