Refactor ProfileInfoCache in c/b/ui/app_list

chrome/browser/profiles/profile_attributes_entry.cc

 // Copyright 2015 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_entry.h"
+
+#include "base/i18n/string_compare.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 
+ProfileAttributesEntry::SortComparator::SortComparator() {
+  UErrorCode error_code = U_ZERO_ERROR;
+  // Use the default collator. The default locale should have been properly
+  // set by the time this constructor is called.
+  collator_.reset(icu::Collator::createInstance(error_code));
+  DCHECK(U_SUCCESS(error_code));

[tapted, 2016/02/04 23:10:35]

After looking at SortVectorWithStringKey from ui/base/l10n/l10n_util_collator.h
I think you really do need to handle this case.

The strategy in SortVectorWithStringKey is to collator_.reset() on failure here
and do an ASCII string comparison in operator()(..) if the collator is null.

+}
+
+bool ProfileAttributesEntry::SortComparator::operator()(
+    const ProfileAttributesEntry* const a,
+    const ProfileAttributesEntry* const b) const {
+  UCollationResult result = base::i18n::CompareString16WithCollator(
+      *collator_, a->GetName(), b->GetName());
+  if (result != UCOL_EQUAL)
+    return result == UCOL_LESS;
+
+  // Compare the profile paths. Since the paths are "[userdir]\Profile #", so
+  // comparisons take care of the numbers represented by # only.
+  base::FilePath::StringType a_path = a->GetPath().value();
+  base::FilePath::StringType b_path = b->GetPath().value();
+  if (a_path.length() != b_path.length())
+    return a_path.length() < b_path.length();
+  return a_path < b_path;
+}
+
 ProfileAttributesEntry::ProfileAttributesEntry()
     : profile_info_cache_(nullptr),
       profile_path_(base::FilePath()) {}
 
 void ProfileAttributesEntry::Initialize(
     ProfileInfoCache* cache, const base::FilePath& path) {
   DCHECK(!profile_info_cache_);
   DCHECK(cache);
   profile_info_cache_ = cache;
   DCHECK(profile_path_.empty());
@@ skipping 14 matching lines @@
 }
 
 base::Time ProfileAttributesEntry::GetActiveTime() const {
   return profile_info_cache_->GetProfileActiveTimeAtIndex(profile_index());
 }
 
 base::string16 ProfileAttributesEntry::GetUserName() const {
   return profile_info_cache_->GetUserNameOfProfileAtIndex(profile_index());
 }
 
-const gfx::Image& ProfileAttributesEntry::GetAvatarIcon() {
+const gfx::Image& ProfileAttributesEntry::GetAvatarIcon() const {
   return profile_info_cache_->GetAvatarIconOfProfileAtIndex(profile_index());
 }
 
 std::string ProfileAttributesEntry::GetLocalAuthCredentials() const {
   return profile_info_cache_->GetLocalAuthCredentialsOfProfileAtIndex(
       profile_index());
 }
 
 std::string ProfileAttributesEntry::GetPasswordChangeDetectionToken() const {
   return profile_info_cache_->GetPasswordChangeDetectionTokenAtIndex(
@@ skipping 214 matching lines @@
     const std::string& gaia_id, const base::string16& user_name) {
   profile_info_cache_->SetAuthInfoOfProfileAtIndex(
       profile_index(), gaia_id, user_name);
 }
 
 size_t ProfileAttributesEntry::profile_index() const {
   size_t index = profile_info_cache_->GetIndexOfProfileWithPath(profile_path_);
   DCHECK(index < profile_info_cache_->GetNumberOfProfiles());
   return index;
 }