Add support for localized time strings with two units, eg. "2 hours 17 minutes"

ash/system/session_length_limit/tray_session_length_limit.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/system/session_length_limit/tray_session_length_limit.h"
 
 #include <algorithm>
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
@@ skipping 53 matching lines @@
   DCHECK_LE(value, 99);
   if (value < 10)
     return base::ASCIIToUTF16("0") + base::IntToString16(value);
   return base::IntToString16(value);
 }
 
 base::string16 FormatRemainingSessionTimeNotification(
     const base::TimeDelta& remaining_session_time) {
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_REMAINING_SESSION_TIME_NOTIFICATION,
-      ui::TimeFormat::TimeDurationLong(remaining_session_time));
+      ui::TimeFormat::Simple(ui::TimeFormat::kDuration, ui::TimeFormat::kLong,
+                             remaining_session_time));
 }
 
 // Creates, or updates the notification for session length timeout with
 // |remaining_time|.  |state_changed| is true when its internal state has been
 // changed from another.
 void CreateOrUpdateNotification(const std::string& notification_id,
                                 const base::TimeDelta& remaining_time,
                                 bool state_changed) {
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
@@ skipping 295 matching lines @@
   if (tray_view_)
     tray_view_->Update();
 }
 
 bool TraySessionLengthLimit::IsTrayViewVisibleForTest() {
   return tray_view_ && tray_view_->visible();
 }
 
 }  // namespace internal
 }  // namespace ash