i18n of several browser messages

chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index a2ec2588b18933ff2c733c4f240495dc717f6bbe..b3a621db861cf23456ae033ee5ebaa61c2439077 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -9,10 +9,10 @@
 #include <algorithm>
 #include <vector>
 
+#include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ -557,11 +557,11 @@ void WebsiteSettingsPopupView::SetCookieInfo(
     if (i.is_first_party) {
       first_party_label_text =
           l10n_util::GetStringFUTF16(IDS_WEBSITE_SETTINGS_FIRST_PARTY_SITE_DATA,
-                                     base::IntToString16(i.allowed));
+                                     base::FormatNumber(i.allowed));
     } else {
       third_party_label_text =
           l10n_util::GetStringFUTF16(IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA,
-                                     base::IntToString16(i.allowed));
+                                     base::FormatNumber(i.allowed));

[jungshik at Google, 2016/05/20 23:58:04]

Hmm... both message are like "<count> from this site". 
Depending on <count>, 'from'-equivalent in other languages may inflect even
though it's not '<count> cookies from this site'. 

I think the message has to be changed to '<count> cookies from this site' and
plural formatter has to be used. 

Even if we don't change, we'd better use plural formatting to be safe: 

In grd,  

{NUM_COOKIES, plural, one{# from this site}, other{# from this site}}

In the source, GetPluralStringFUTF16() has to be used. 
  

If you search for 'plural file:grd', you'll find a lot of examples. 

[Greg Levin, 2016/05/26 14:03:14]

Done.

     }
   }