Use plural formats and native digits

chrome/browser/profiles/profile_attributes_storage.cc

 // Copyright 2016 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/profiles/profile_attributes_storage.h"
 
 #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"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ skipping 94 matching lines @@
   std::sort(ret.begin(), ret.end(),
             ProfileAttributesSortComparator(collator.get()));
   return ret;
 }
 
 base::string16 ProfileAttributesStorage::ChooseNameForNewProfile(
     size_t icon_index) const {
   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
 
     // Loop through previously named profiles to ensure we're not duplicating.
     std::vector<ProfileAttributesEntry*> entries =
         const_cast<ProfileAttributesStorage*>(this)->GetAllProfilesAttributes();
 
     if (std::none_of(entries.begin(), entries.end(),
                      [name](ProfileAttributesEntry* entry) {
                        return entry->GetName() == name;
@@ skipping 47 matching lines @@
   if (GetRandomAvatarIconIndex(true, true, used_icon_indices, &icon_index))
     return icon_index;
 
   // Settle for any random icon, even if it's not already used.
   if (GetRandomAvatarIconIndex(true, false, used_icon_indices, &icon_index))
     return icon_index;
 
   NOTREACHED();
   return 0;
 }