Use plural formats and native digits

chrome/browser/profiles/profile_attributes_storage.cc

Index: chrome/browser/profiles/profile_attributes_storage.cc
diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc
index f5a718060ebfaa6b37bceb697b8da9c7921cdcbb..bdd6d47cdcaffdf3f5e5d510e3793b106ad60e15 100644
--- a/chrome/browser/profiles/profile_attributes_storage.cc
+++ b/chrome/browser/profiles/profile_attributes_storage.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/i18n/number_formatting.h"
 #include "base/i18n/string_compare.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ -120,17 +121,22 @@ base::string16 ProfileAttributesStorage::ChooseNameForNewProfile(
   base::string16 name;
   for (int name_index = 1; ; ++name_index) {
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-    name = l10n_util::GetStringFUTF16Int(IDS_NEW_NUMBERED_PROFILE_NAME,
-                                         name_index);
+    // Using native digits will break IsDefaultProfileName() below because
+    // it uses sscanf.
+    // TODO(jshin): fix IsDefaultProfileName to handle native digits.
+    name = l10n_util::GetStringFUTF16(IDS_NEW_NUMBERED_PROFILE_NAME,
+                                      base::IntToString16(name_index));
 #else
     if (icon_index < profiles::GetGenericAvatarIconCount()) {
       name = l10n_util::GetStringFUTF16Int(IDS_NUMBERED_PROFILE_NAME,
                                            name_index);
     } else {
+      // TODO(jshin): Check with UX if appending |name_index| to the default
+      // name without a space is intended.
       name = l10n_util::GetStringUTF16(
           kDefaultNames[icon_index - profiles::GetGenericAvatarIconCount()]);
       if (name_index > 1)
-        name.append(base::UTF8ToUTF16(base::IntToString(name_index)));
+        name.append(base::FormatNumber(name_index));
     }
 #endif