Lands http://codereview.chromium.org/8801034/ in hopes of getting a

green tree. TBRing since this is a revert.

R=sail@chromium.org, jwd@chromium.org
BUG=87658
TEST=none

Review URL: http://codereview.chromium.org/8815005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113115 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 7 deletions

diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc
index 073728a..1816a44 100644
--- a/chrome/browser/profiles/profile_info_cache.cc
+++ b/chrome/browser/profiles/profile_info_cache.cc
@@ -651,22 +651,17 @@ size_t ProfileInfoCache::GetDefaultAvatarIconCount() {
 
 // static
 int ProfileInfoCache::GetDefaultAvatarIconResourceIDAtIndex(size_t index) {
-  DCHECK(IsDefaultAvatarIconIndex(index));
+  DCHECK_LT(index, GetDefaultAvatarIconCount());
   return kDefaultAvatarIconResources[index];
 }
 
 // static
 std::string ProfileInfoCache::GetDefaultAvatarIconUrl(size_t index) {
-  DCHECK(IsDefaultAvatarIconIndex(index));
+  DCHECK_LT(index, kDefaultAvatarIconsCount);
   return StringPrintf("%s%" PRIuS, kDefaultUrlPrefix, index);
 }
 
 // static
-bool ProfileInfoCache::IsDefaultAvatarIconIndex(size_t index) {
-  return index < kDefaultAvatarIconsCount;
-}
-
-// static
 bool ProfileInfoCache::IsDefaultAvatarIconUrl(const std::string& url,
                                               size_t* icon_index) {
   DCHECK(icon_index);