Revert 263262 "Newly created profiles should have the grey silho..."

trunk/src/chrome/browser/profiles/profile_info_cache.cc

 // Copyright (c) 2012 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_info_cache.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
@@ skipping 58 matching lines @@
   IDS_DEFAULT_AVATAR_NAME_15,
   IDS_DEFAULT_AVATAR_NAME_16,
   IDS_DEFAULT_AVATAR_NAME_17,
   IDS_DEFAULT_AVATAR_NAME_18,
   IDS_DEFAULT_AVATAR_NAME_19,
   IDS_DEFAULT_AVATAR_NAME_20,
   IDS_DEFAULT_AVATAR_NAME_21,
   IDS_DEFAULT_AVATAR_NAME_22,
   IDS_DEFAULT_AVATAR_NAME_23,
   IDS_DEFAULT_AVATAR_NAME_24,
-  IDS_DEFAULT_AVATAR_NAME_25,
-  IDS_DEFAULT_AVATAR_NAME_26
+  IDS_DEFAULT_AVATAR_NAME_25
 };
 
 typedef std::vector<unsigned char> ImageData;
 
 // Writes |data| to disk and takes ownership of the pointer. On completion
 // |success| is set to true on success and false on failure.
 void SaveBitmap(ImageData* data,
                 const base::FilePath& image_path,
                 bool* success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 298 matching lines @@
 
   base::FilePath image_path = path.AppendASCII(file_name);
   return LoadAvatarPictureFromPath(key, image_path);
 }
 
 const gfx::Image* ProfileInfoCache::GetHighResAvatarOfProfileAtIndex(
     size_t index) const {
   int avatar_index = GetAvatarIconIndexOfProfileAtIndex(index);
   std::string key = profiles::GetDefaultAvatarIconFileNameAtIndex(avatar_index);
 
-  if (!strcmp(key.c_str(), profiles::GetNoHighResAvatarFileName()))
-    return NULL;
-
   base::FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   base::FilePath image_path = user_data_dir.
       AppendASCII(profiles::kHighResAvatarFolderName).AppendASCII(key);
   return LoadAvatarPictureFromPath(key, image_path);
 }
 
 const gfx::Image* ProfileInfoCache::LoadAvatarPictureFromPath(
     const std::string& key,
     const base::FilePath& image_path) const {
@@ skipping 533 matching lines @@
     info->GetString(kNameKey, &name);
     names.push_back(name);
   }
   return names;
 }
 
 // static
 void ProfileInfoCache::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }