ICU msg format support with more than one arguments

chrome/browser/ssl/ssl_error_info.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 "chrome/browser/ssl/ssl_error_info.h"
 
-#include "base/i18n/time_formatting.h"
-#include "base/strings/string_number_conversions.h"
+#include "base/i18n/message_formatter.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/cert_store.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/ssl/ssl_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
@@ skipping 37 matching lines @@
       short_description = l10n_util::GetStringUTF16(
           IDS_CERT_ERROR_COMMON_NAME_INVALID_DESCRIPTION);
       break;
     }
     case CERT_DATE_INVALID:
       if (cert->HasExpired()) {
         // Make sure to round up to the smallest integer value not less than
         // the expiration value (https://crbug.com/476758).
         int expiration_value =
             (base::Time::Now() - cert->valid_expiry()).InDays() + 1;
-        details = l10n_util::GetStringFUTF16(
-            IDS_CERT_ERROR_EXPIRED_DETAILS, UTF8ToUTF16(request_url.host()),
-            base::IntToString16(expiration_value),
-            base::TimeFormatFriendlyDate(base::Time::Now()));
+        details = base::i18n::MessageFormatter::FormatWithNumberedArgs(
+            l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXPIRED_DETAILS),
+            request_url.host(), expiration_value, base::Time::Now());
         short_description =
             l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXPIRED_DESCRIPTION);
       } else if (base::Time::Now() < cert->valid_start()) {
-        details = l10n_util::GetStringFUTF16(
-            IDS_CERT_ERROR_NOT_YET_VALID_DETAILS,
-            UTF8ToUTF16(request_url.host()),
-            base::IntToString16(
-                (cert->valid_start() - base::Time::Now()).InDays()));
+        details = base::i18n::MessageFormatter::FormatWithNumberedArgs(
+            l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_YET_VALID_DETAILS),
+            request_url.host(),
+            (cert->valid_start() - base::Time::Now()).InDays());
         short_description =
             l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_YET_VALID_DESCRIPTION);
       } else {
         // Two possibilities: (1) an intermediate or root certificate has
         // expired, or (2) the certificate has become valid since the error
         // occurred. Both are probably rare cases. To avoid giving the wrong
         // date, remove the information.
         details = l10n_util::GetStringFUTF16(
             IDS_CERT_ERROR_NOT_VALID_AT_THIS_TIME_DETAILS,
             UTF8ToUTF16(request_url.host()));
@@ skipping 166 matching lines @@
             cert_id, &cert);
         DCHECK(r);
       }
       if (errors) {
         errors->push_back(
             SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url));
       }
     }
   }
 }