[cros] Choose initial user avatar from new stock images only.

chrome/browser/chromeos/login/user_manager_impl.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/chromeos/login/user_manager_impl.h"
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
@@ skipping 886 matching lines @@
   CrosLibrary::Get()->GetCertLibrary()->LoadKeyStore();
 
   // Schedules current user ownership check on file thread.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&UserManagerImpl::CheckOwnership,
                                      base::Unretained(this)));
 }
 
 void UserManagerImpl::SetInitialUserImage(const std::string& username) {
   // Choose a random default image.
-  int image_id = base::RandInt(0, kDefaultImagesCount - 1);
+  int image_id =
+      base::RandInt(kFirstDefaultImageIndex, kDefaultImagesCount - 1);
   SaveUserDefaultImageIndex(username, image_id);
 }
 
 void UserManagerImpl::MigrateWallpaperData() {
   PrefService* local_state = g_browser_process->local_state();
   if (local_state) {
     const DictionaryValue* user_wallpapers =
           local_state->GetDictionary(kUserWallpapers);
     int index;
     const DictionaryValue* new_user_wallpapers =
@@ skipping 452 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos