Prepare Chromium and Blink for ICU 59

ash/common/system/date/date_view.cc

 // Copyright (c) 2012 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 "ash/common/system/date/date_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
@@ skipping 39 matching lines @@
 const int kVerticalClockMinutesTopOffsetMD = -2;
 
 // Leading padding used to draw the tray background to the left of the clock
 // when the shelf is vertically aligned.
 const int kClockLeadingPadding = 8;
 
 bool UseMd() {
   return MaterialDesignController::IsSystemTrayMenuMaterial();
 }
 
-base::string16 FormatDateWithPattern(const base::Time& time,
-                                     const char* pattern) {
-  UErrorCode status = U_ZERO_ERROR;
-  std::unique_ptr<icu::DateTimePatternGenerator> generator(
-      icu::DateTimePatternGenerator::createInstance(status));
-  DCHECK(U_SUCCESS(status));
-  icu::UnicodeString generated_pattern =
-      generator->getBestPattern(icu::UnicodeString(pattern), status);
-  DCHECK(U_SUCCESS(status));
-  icu::SimpleDateFormat simple_formatter(generated_pattern, status);
-  DCHECK(U_SUCCESS(status));
-  icu::UnicodeString date_string;
-  simple_formatter.format(static_cast<UDate>(time.ToDoubleT() * 1000),
-                          date_string, status);
-  DCHECK(U_SUCCESS(status));
-  return base::string16(date_string.getBuffer(),
-                        static_cast<size_t>(date_string.length()));
-}
-
 base::string16 FormatDate(const base::Time& time) {
   if (UseMd()) {
     // Use 'short' month format (e.g., "Oct") followed by non-padded day of
     // month (e.g., "2", "10").
-    return FormatDateWithPattern(time, "LLLd");
+    return base::TimeFormatWithPattern(time, "LLLd");
   } else {
-    icu::UnicodeString date_string;
-    std::unique_ptr<icu::DateFormat> formatter(
-        icu::DateFormat::createDateInstance(icu::DateFormat::kMedium));
-    formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string);
-    return base::string16(date_string.getBuffer(),
-                          static_cast<size_t>(date_string.length()));
+    return base::TimeFormatShortDate(time);
   }
 }
 
 base::string16 FormatDayOfWeek(const base::Time& time) {
   // Use 'short' day of week format (e.g., "Wed").
-  return FormatDateWithPattern(time, "EEE");
+  return base::TimeFormatWithPattern(time, "EEE");
 }
 
 }  // namespace
 
 BaseDateTimeView::~BaseDateTimeView() {
   timer_.Stop();
 }
 
 void BaseDateTimeView::UpdateText() {
   base::Time now = base::Time::Now();
@@ skipping 292 matching lines @@
 }
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   label->SetElideBehavior(gfx::NO_ELIDE);
 }
 
 }  // namespace tray
 }  // namespace ash