[cros, user_manager] Move default user images constants and helper functions out of src/chrome.

BUG=387614
TBR=bauerb@chromium.org, tony@chromium.org, oshima@chromium.org

Review URL: https://codereview.chromium.org/402133003

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

19 files changed, 168 insertions, 488 deletions

diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc
index 502024b..cc67f0f 100644
--- a/chrome/browser/chromeos/login/screens/user_image_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -32,6 +31,7 @@
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_service.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -167,7 +167,7 @@ void UserImageScreen::OnImageSelected(const std::string& image_type,
     return;
   int user_image_index = User::kInvalidImageIndex;
   if (image_type == "default" &&
-      IsDefaultImageUrl(image_url, &user_image_index)) {
+      user_manager::IsDefaultImageUrl(image_url, &user_image_index)) {
     selected_image_ = user_image_index;
   } else if (image_type == "camera") {
     selected_image_ = User::kExternalImageIndex;
@@ -190,22 +190,23 @@ void UserImageScreen::OnImageAccepted() {
       }
       image_manager->SaveUserImage(
           user_manager::UserImage::CreateAndEncode(user_photo_));
-      uma_index = kHistogramImageFromCamera;
+      uma_index = user_manager::kHistogramImageFromCamera;
       break;
     case User::kProfileImageIndex:
       image_manager->SaveUserImageFromProfileImage();
-      uma_index = kHistogramImageFromProfile;
+      uma_index = user_manager::kHistogramImageFromProfile;
       break;
     default:
-      DCHECK(selected_image_ >= 0 && selected_image_ < kDefaultImagesCount);
+      DCHECK(selected_image_ >= 0 &&
+             selected_image_ < user_manager::kDefaultImagesCount);
       image_manager->SaveUserDefaultImageIndex(selected_image_);
-      uma_index = GetDefaultImageHistogramValue(selected_image_);
+      uma_index = user_manager::GetDefaultImageHistogramValue(selected_image_);
       break;
   }
   if (user_has_selected_image_) {
     UMA_HISTOGRAM_ENUMERATION("UserImage.FirstTimeChoice",
                               uma_index,
-                              kHistogramImagesCount);
+                              user_manager::kHistogramImagesCount);
   }
   ExitScreen();
 }
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
index 1c519d4..e8d4c24 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
@@ -458,7 +458,8 @@ void SupervisedUserCreationScreen::ApplyPicture() {
       NOTREACHED() << "Supervised users have no profile pictures";
       break;
     default:
-      DCHECK(selected_image_ >= 0 && selected_image_ < kDefaultImagesCount);
+      DCHECK(selected_image_ >= 0 &&
+             selected_image_ < user_manager::kDefaultImagesCount);
       image_manager->SaveUserDefaultImageIndex(selected_image_);
       break;
   }
@@ -502,14 +503,16 @@ void SupervisedUserCreationScreen::OnGetSupervisedUsers(
         !chromeos_avatar.empty() &&
         SupervisedUserSyncService::GetAvatarIndex(
             chromeos_avatar, &avatar_index)) {
-      ui_copy->SetString(kAvatarURLKey, GetDefaultImageUrl(avatar_index));
+      ui_copy->SetString(kAvatarURLKey,
+                         user_manager::GetDefaultImageUrl(avatar_index));
     } else {
-      int i = base::RandInt(kFirstDefaultImageIndex, kDefaultImagesCount - 1);
+      int i = base::RandInt(user_manager::kFirstDefaultImageIndex,
+                            user_manager::kDefaultImagesCount - 1);
       local_copy->SetString(
           SupervisedUserSyncService::kChromeOsAvatar,
           SupervisedUserSyncService::BuildAvatarString(i));
       local_copy->SetBoolean(kRandomAvatarKey, true);
-      ui_copy->SetString(kAvatarURLKey, GetDefaultImageUrl(i));
+      ui_copy->SetString(kAvatarURLKey, user_manager::GetDefaultImageUrl(i));
     }
 
     local_copy->SetBoolean(kUserExists, false);
@@ -581,7 +584,7 @@ void SupervisedUserCreationScreen::OnImageSelected(
     return;
   int user_image_index = User::kInvalidImageIndex;
   if (image_type == "default" &&
-      IsDefaultImageUrl(image_url, &user_image_index)) {
+      user_manager::IsDefaultImageUrl(image_url, &user_image_index)) {
     selected_image_ = user_image_index;
   } else if (image_type == "camera") {
     selected_image_ = User::kExternalImageIndex;
diff --git a/chrome/browser/chromeos/login/users/avatar/default_user_images.cc b/chrome/browser/chromeos/login/users/avatar/default_user_images.cc
deleted file mode 100644
index 31ab4d7..0000000
--- a/chrome/browser/chromeos/login/users/avatar/default_user_images.cc
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright 2014 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/users/avatar/default_user_images.h"
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
-#include "base/sys_info.h"
-#include "grit/ui_chromeos_resources.h"
-#include "grit/ui_chromeos_strings.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/image/image_skia.h"
-
-namespace chromeos {
-
-namespace {
-
-const char kDefaultPathPrefix[] = "default:";
-const char kDefaultUrlPrefix[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER_";
-const char kZeroDefaultUrl[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER";
-
-const char* kOldDefaultImageNames[] = {
-  "default:gray",
-  "default:green",
-  "default:blue",
-  "default:yellow",
-  "default:red",
-};
-
-// IDs of default user image descriptions.
-const int kDefaultImageDescriptions[] = {
-  0,  // No description for deprecated user image 0.
-  0,  // No description for deprecated user image 1.
-  0,  // No description for deprecated user image 2.
-  0,  // No description for deprecated user image 3.
-  0,  // No description for deprecated user image 4.
-  0,  // No description for deprecated user image 5.
-  0,  // No description for deprecated user image 6.
-  0,  // No description for deprecated user image 7.
-  0,  // No description for deprecated user image 8.
-  0,  // No description for deprecated user image 9.
-  0,  // No description for deprecated user image 10.
-  0,  // No description for deprecated user image 11.
-  0,  // No description for deprecated user image 12.
-  0,  // No description for deprecated user image 13.
-  0,  // No description for deprecated user image 14.
-  0,  // No description for deprecated user image 15.
-  0,  // No description for deprecated user image 16.
-  0,  // No description for deprecated user image 17.
-  0,  // No description for deprecated user image 18.
-  IDS_LOGIN_DEFAULT_USER_DESC_19,
-  IDS_LOGIN_DEFAULT_USER_DESC_20,
-  IDS_LOGIN_DEFAULT_USER_DESC_21,
-  IDS_LOGIN_DEFAULT_USER_DESC_22,
-  IDS_LOGIN_DEFAULT_USER_DESC_23,
-  IDS_LOGIN_DEFAULT_USER_DESC_24,
-  IDS_LOGIN_DEFAULT_USER_DESC_25,
-  IDS_LOGIN_DEFAULT_USER_DESC_26,
-  IDS_LOGIN_DEFAULT_USER_DESC_27,
-  IDS_LOGIN_DEFAULT_USER_DESC_28,
-  IDS_LOGIN_DEFAULT_USER_DESC_29,
-  IDS_LOGIN_DEFAULT_USER_DESC_30,
-  IDS_LOGIN_DEFAULT_USER_DESC_31,
-  IDS_LOGIN_DEFAULT_USER_DESC_32,
-};
-
-// Returns a string consisting of the prefix specified and the index of the
-// image if its valid.
-std::string GetDefaultImageString(int index, const std::string& prefix) {
-  if (index < 0 || index >= kDefaultImagesCount) {
-    DCHECK(!base::SysInfo::IsRunningOnChromeOS());
-    return std::string();
-  }
-  return base::StringPrintf("%s%d", prefix.c_str(), index);
-}
-
-// Returns true if the string specified consists of the prefix and one of
-// the default images indices. Returns the index of the image in |image_id|
-// variable.
-bool IsDefaultImageString(const std::string& s,
-                          const std::string& prefix,
-                          int* image_id) {
-  DCHECK(image_id);
-  if (!StartsWithASCII(s, prefix, true))
-    return false;
-
-  int image_index = -1;
-  if (base::StringToInt(base::StringPiece(s.begin() + prefix.length(),
-                                          s.end()),
-                        &image_index)) {
-    if (image_index < 0 || image_index >= kDefaultImagesCount)
-      return false;
-    *image_id = image_index;
-    return true;
-  }
-
-  return false;
-}
-}  // namespace
-
-std::string GetDefaultImagePath(int index) {
-  return GetDefaultImageString(index, kDefaultPathPrefix);
-}
-
-bool IsDefaultImagePath(const std::string& path, int* image_id) {
-  if (IsDefaultImageString(path, kDefaultPathPrefix, image_id))
-    return true;
-
-  // Check old default image names for back-compatibility.
-  for (size_t i = 0; i < arraysize(kOldDefaultImageNames); ++i) {
-    if (path == kOldDefaultImageNames[i]) {
-      *image_id = static_cast<int>(i);
-      return true;
-    }
-  }
-  return false;
-}
-
-std::string GetDefaultImageUrl(int index) {
-  if (index == 0)
-    return kZeroDefaultUrl;
-  return GetDefaultImageString(index, kDefaultUrlPrefix);
-}
-
-bool IsDefaultImageUrl(const std::string& url, int* image_id) {
-  if (url == kZeroDefaultUrl) {
-    *image_id = 0;
-    return true;
-  }
-  return IsDefaultImageString(url, kDefaultUrlPrefix, image_id);
-}
-
-const gfx::ImageSkia& GetDefaultImage(int index) {
-  DCHECK(index >= 0 && index < kDefaultImagesCount);
-  return *ResourceBundle::GetSharedInstance().
-      GetImageSkiaNamed(kDefaultImageResourceIDs[index]);
-}
-
-base::string16 GetDefaultImageDescription(int index) {
-  DCHECK(index >= 0 && index < kDefaultImagesCount);
-  int string_id = kDefaultImageDescriptions[index];
-  if (string_id)
-    return l10n_util::GetStringUTF16(string_id);
-  else
-    return base::string16();
-}
-
-// Resource IDs of default user images.
-const int kDefaultImageResourceIDs[] = {
-  IDR_LOGIN_DEFAULT_USER,
-  IDR_LOGIN_DEFAULT_USER_1,
-  IDR_LOGIN_DEFAULT_USER_2,
-  IDR_LOGIN_DEFAULT_USER_3,
-  IDR_LOGIN_DEFAULT_USER_4,
-  IDR_LOGIN_DEFAULT_USER_5,
-  IDR_LOGIN_DEFAULT_USER_6,
-  IDR_LOGIN_DEFAULT_USER_7,
-  IDR_LOGIN_DEFAULT_USER_8,
-  IDR_LOGIN_DEFAULT_USER_9,
-  IDR_LOGIN_DEFAULT_USER_10,
-  IDR_LOGIN_DEFAULT_USER_11,
-  IDR_LOGIN_DEFAULT_USER_12,
-  IDR_LOGIN_DEFAULT_USER_13,
-  IDR_LOGIN_DEFAULT_USER_14,
-  IDR_LOGIN_DEFAULT_USER_15,
-  IDR_LOGIN_DEFAULT_USER_16,
-  IDR_LOGIN_DEFAULT_USER_17,
-  IDR_LOGIN_DEFAULT_USER_18,
-  IDR_LOGIN_DEFAULT_USER_19,
-  IDR_LOGIN_DEFAULT_USER_20,
-  IDR_LOGIN_DEFAULT_USER_21,
-  IDR_LOGIN_DEFAULT_USER_22,
-  IDR_LOGIN_DEFAULT_USER_23,
-  IDR_LOGIN_DEFAULT_USER_24,
-  IDR_LOGIN_DEFAULT_USER_25,
-  IDR_LOGIN_DEFAULT_USER_26,
-  IDR_LOGIN_DEFAULT_USER_27,
-  IDR_LOGIN_DEFAULT_USER_28,
-  IDR_LOGIN_DEFAULT_USER_29,
-  IDR_LOGIN_DEFAULT_USER_30,
-  IDR_LOGIN_DEFAULT_USER_31,
-  IDR_LOGIN_DEFAULT_USER_32,
-};
-
-const int kDefaultImageAuthorIDs[] = {
-  IDS_LOGIN_DEFAULT_USER_AUTHOR,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_1,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_2,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_3,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_4,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_5,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_6,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_7,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_8,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_9,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_10,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_11,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_12,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_13,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_14,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_15,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_16,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_17,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_18,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_19,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_20,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_21,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_22,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_23,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_24,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_25,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_26,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_27,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_28,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_29,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_30,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_31,
-  IDS_LOGIN_DEFAULT_USER_AUTHOR_32,
-};
-
-const int kDefaultImageWebsiteIDs[] = {
-  IDS_LOGIN_DEFAULT_USER_WEBSITE,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_1,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_2,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_3,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_4,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_5,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_6,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_7,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_8,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_9,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_10,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_11,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_12,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_13,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_14,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_15,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_16,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_17,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_18,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_19,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_20,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_21,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_22,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_23,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_24,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_25,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_26,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_27,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_28,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_29,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_30,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_31,
-  IDS_LOGIN_DEFAULT_USER_WEBSITE_32,
-};
-
-const int kDefaultImagesCount = arraysize(kDefaultImageResourceIDs);
-
-const int kFirstDefaultImageIndex = 19;
-
-// The order and the values of these constants are important for histograms
-// of different Chrome OS versions to be merged smoothly.
-const int kHistogramImageFromCamera = 19;
-const int kHistogramImageFromFile = 20;
-const int kHistogramImageOld = 21;
-const int kHistogramImageFromProfile = 22;
-const int kHistogramVideoFromCamera = 23;
-const int kHistogramVideoFromFile = 24;
-const int kHistogramImagesCount = kDefaultImagesCount + 6;
-
-int GetDefaultImageHistogramValue(int index) {
-  DCHECK(index >= 0 && index < kDefaultImagesCount);
-  // Create a gap in histogram values for
-  // [kHistogramImageFromCamera..kHistogramImageFromProfile] block to fit.
-  if (index < kHistogramImageFromCamera)
-    return index;
-  return index + 6;
-}
-
-}  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/users/avatar/default_user_images.h b/chrome/browser/chromeos/login/users/avatar/default_user_images.h
deleted file mode 100644
index 41e04de..0000000
--- a/chrome/browser/chromeos/login/users/avatar/default_user_images.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_DEFAULT_USER_IMAGES_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_DEFAULT_USER_IMAGES_H_
-
-#include <cstddef>  // for size_t
-#include <string>
-
-#include "base/strings/string16.h"
-
-namespace gfx {
-class ImageSkia;
-}
-
-namespace chromeos {
-
-// Returns path to default user image with specified index.
-// The path is used in Local State to distinguish default images.
-// This function is obsolete and is preserved only for compatibility with older
-// profiles which don't user separate image index and path.
-std::string GetDefaultImagePath(int index);
-
-// Checks if given path is one of the default ones. If it is, returns true
-// and its index through |image_id|. If not, returns false.
-bool IsDefaultImagePath(const std::string& path, int* image_id);
-
-// Returns URL to default user image with specified index.
-std::string GetDefaultImageUrl(int index);
-
-// Checks if the given URL points to one of the default images. If it is,
-// returns true and its index through |image_id|. If not, returns false.
-bool IsDefaultImageUrl(const std::string& url, int* image_id);
-
-// Returns bitmap of default user image with specified index.
-const gfx::ImageSkia& GetDefaultImage(int index);
-
-// Returns a description of a default user image with specified index.
-base::string16 GetDefaultImageDescription(int index);
-
-// Resource IDs of default user images.
-extern const int kDefaultImageResourceIDs[];
-
-// String IDs of author names for default user images.
-extern const int kDefaultImageAuthorIDs[];
-
-// String IDs of websites for default user images.
-extern const int kDefaultImageWebsiteIDs[];
-
-// Number of default images.
-extern const int kDefaultImagesCount;
-
-// The starting index of default images available for selection. Note that
-// existing users may have images with smaller indices.
-extern const int kFirstDefaultImageIndex;
-
-/// Histogram values. ////////////////////////////////////////////////////////
-
-// Histogram value for user image taken from file.
-extern const int kHistogramImageFromFile;
-
-// Histogram value for user image taken from camera.
-extern const int kHistogramImageFromCamera;
-
-// Histogram value a previously used image from camera/file.
-extern const int kHistogramImageOld;
-
-// Histogram value for user image from G+ profile.
-extern const int kHistogramImageFromProfile;
-
-// Histogram value for user video (animated avatar) from camera.
-extern const int kHistogramVideoFromCamera;
-
-// Histogram value for user video from file.
-extern const int kHistogramVideoFromFile;
-
-// Number of possible histogram values for user images.
-extern const int kHistogramImagesCount;
-
-// Returns the histogram value corresponding to the given default image index.
-int GetDefaultImageHistogramValue(int index);
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_DEFAULT_USER_IMAGES_H_
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
index 9f1105f..30a0145 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h"
@@ -52,6 +51,7 @@
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ -300,44 +300,51 @@ class UserImageManagerTest : public LoginManagerTest,
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_DefaultUserImagePreserved) {
   // Setup an old default (stock) user image.
   ScopedUserManagerEnabler(new MockUserManager);
-  SetOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+  SetOldUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, DefaultUserImagePreserved) {
   UserManager::Get()->GetUsers();  // Load users.
   // Old info preserved.
-  ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+  ExpectOldUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
   LogIn(kTestUser1);
   // Image info is migrated now.
-  ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+  ExpectNewUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_OtherUsersUnaffected) {
   // Setup two users with stock images.
   ScopedUserManagerEnabler(new MockUserManager);
-  SetOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
-  SetOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
-                      base::FilePath());
+  SetOldUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+  SetOldUserImageInfo(
+      kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, OtherUsersUnaffected) {
   UserManager::Get()->GetUsers();  // Load users.
   // Old info preserved.
-  ExpectOldUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
-  ExpectOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
-                         base::FilePath());
+  ExpectOldUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+  ExpectOldUserImageInfo(
+      kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
   LogIn(kTestUser1);
   // Image info is migrated for the first user and unaffected for the rest.
-  ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
-  ExpectOldUserImageInfo(kTestUser2, kFirstDefaultImageIndex + 1,
-                         base::FilePath());
+  ExpectNewUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+  ExpectOldUserImageInfo(
+      kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_PRE_NonJPEGImageFromFile) {
   // Setup a user with non-JPEG image.
   ScopedUserManagerEnabler(new MockUserManager);
-  SaveUserImagePNG(
-      kTestUser1, kDefaultImageResourceIDs[kFirstDefaultImageIndex]);
+  SaveUserImagePNG(kTestUser1,
+                   user_manager::kDefaultImageResourceIDs
+                       [user_manager::kFirstDefaultImageIndex]);
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
@@ -364,7 +371,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
   ASSERT_TRUE(user);
   EXPECT_FALSE(user->image_is_safe_format());
   // Check image dimensions.
-  const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
+  const gfx::ImageSkia& saved_image =
+      user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
   EXPECT_EQ(saved_image.width(), user->GetImage().width());
   EXPECT_EQ(saved_image.height(), user->GetImage().height());
 }
@@ -382,7 +390,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
   // Now the migrated image is used.
   EXPECT_TRUE(user->image_is_safe_format());
   // Check image dimensions. Images can't be compared since JPEG is lossy.
-  const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
+  const gfx::ImageSkia& saved_image =
+      user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
   EXPECT_EQ(saved_image.width(), user->GetImage().width());
   EXPECT_EQ(saved_image.height(), user->GetImage().height());
 }
@@ -398,16 +407,18 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserDefaultImageIndex) {
   ASSERT_TRUE(user);
 
   const gfx::ImageSkia& default_image =
-      GetDefaultImage(kFirstDefaultImageIndex);
+      user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
 
   UserImageManager* user_image_manager =
       UserManager::Get()->GetUserImageManager(kTestUser1);
-  user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+  user_image_manager->SaveUserDefaultImageIndex(
+      user_manager::kFirstDefaultImageIndex);
 
   EXPECT_TRUE(user->HasDefaultImage());
-  EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
+  EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
   EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
-  ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+  ExpectNewUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImage) {
@@ -547,7 +558,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
   ASSERT_TRUE(user);
 
   const gfx::ImageSkia& default_image =
-      GetDefaultImage(kFirstDefaultImageIndex);
+      user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
 
   UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
   LoginUser(kTestUser1);
@@ -561,14 +572,16 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
   net::TestURLFetcherFactory url_fetcher_factory;
   CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);
 
-  user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+  user_image_manager->SaveUserDefaultImageIndex(
+      user_manager::kFirstDefaultImageIndex);
 
   CompleteProfileImageDownload(&url_fetcher_factory);
 
   EXPECT_TRUE(user->HasDefaultImage());
-  EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
+  EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
   EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
-  ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+  ExpectNewUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
 }
 
 class UserImageManagerPolicyTest : public UserImageManagerTest,
@@ -710,17 +723,23 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
 
   const int default_image_index = user->image_index();
   EXPECT_TRUE(user->HasDefaultImage());
-  ASSERT_LE(kFirstDefaultImageIndex, default_image_index);
-  ASSERT_GT(kFirstDefaultImageIndex + kDefaultImagesCount, default_image_index);
-  const gfx::ImageSkia& default_image = GetDefaultImage(default_image_index);
+  ASSERT_LE(user_manager::kFirstDefaultImageIndex, default_image_index);
+  ASSERT_GT(
+      user_manager::kFirstDefaultImageIndex + user_manager::kDefaultImagesCount,
+      default_image_index);
+  const gfx::ImageSkia& default_image =
+      user_manager::GetDefaultImage(default_image_index);
   EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
   ExpectNewUserImageInfo(kTestUser1, default_image_index, base::FilePath());
 
   // Choose a different user image. Verify that the chosen user image is set and
   // persisted.
-  const int user_image_index = kFirstDefaultImageIndex +
-      (default_image_index - kFirstDefaultImageIndex + 1) % kDefaultImagesCount;
-  const gfx::ImageSkia& user_image = GetDefaultImage(user_image_index);
+  const int user_image_index =
+      user_manager::kFirstDefaultImageIndex +
+      (default_image_index - user_manager::kFirstDefaultImageIndex + 1) %
+          user_manager::kDefaultImagesCount;
+  const gfx::ImageSkia& user_image =
+      user_manager::GetDefaultImage(user_image_index);
 
   UserImageManager* user_image_manager =
       UserManager::Get()->GetUserImageManager(kTestUser1);
@@ -753,16 +772,18 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
   // Choose a user image. Verify that the chosen user image is set and
   // persisted.
   const gfx::ImageSkia& default_image =
-      GetDefaultImage(kFirstDefaultImageIndex);
+      user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
 
   UserImageManager* user_image_manager =
       UserManager::Get()->GetUserImageManager(kTestUser1);
-  user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+  user_image_manager->SaveUserDefaultImageIndex(
+      user_manager::kFirstDefaultImageIndex);
 
   EXPECT_TRUE(user->HasDefaultImage());
-  EXPECT_EQ(kFirstDefaultImageIndex, user->image_index());
+  EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
   EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
-  ExpectNewUserImageInfo(kTestUser1, kFirstDefaultImageIndex, base::FilePath());
+  ExpectNewUserImageInfo(
+      kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
 
   // Set policy. Verify that the policy-provided user image is downloaded, set
   // and persisted, overriding the previously set image.
@@ -840,7 +861,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
   // as policy takes precedence.
   UserImageManager* user_image_manager =
       UserManager::Get()->GetUserImageManager(kTestUser1);
-  user_image_manager->SaveUserDefaultImageIndex(kFirstDefaultImageIndex);
+  user_image_manager->SaveUserDefaultImageIndex(
+      user_manager::kFirstDefaultImageIndex);
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(User::kExternalImageIndex, user->image_index());
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
index 2ff9d0a..7544099 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
@@ -24,13 +24,13 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/helper.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
@@ -147,9 +147,9 @@ int ImageIndexToHistogramIndex(int image_index) {
   switch (image_index) {
     case User::kExternalImageIndex:
       // TODO(ivankr): Distinguish this from selected from file.
-      return kHistogramImageFromCamera;
+      return user_manager::kHistogramImageFromCamera;
     case User::kProfileImageIndex:
-      return kHistogramImageFromProfile;
+      return user_manager::kHistogramImageFromProfile;
     default:
       return image_index;
   }
@@ -299,9 +299,10 @@ void UserImageManagerImpl::Job::LoadImage(base::FilePath image_path,
   image_url_ = image_url;
   image_path_ = image_path;
 
-  if (image_index_ >= 0 && image_index_ < kDefaultImagesCount) {
+  if (image_index_ >= 0 && image_index_ < user_manager::kDefaultImagesCount) {
     // Load one of the default images. This happens synchronously.
-    user_image_ = user_manager::UserImage(GetDefaultImage(image_index_));
+    user_image_ =
+        user_manager::UserImage(user_manager::GetDefaultImage(image_index_));
     UpdateUser();
     NotifyJobDone();
   } else if (image_index_ == User::kExternalImageIndex ||
@@ -327,10 +328,11 @@ void UserImageManagerImpl::Job::SetToDefaultImage(int default_image_index) {
   run_ = true;
 
   DCHECK_LE(0, default_image_index);
-  DCHECK_GT(kDefaultImagesCount, default_image_index);
+  DCHECK_GT(user_manager::kDefaultImagesCount, default_image_index);
 
   image_index_ = default_image_index;
-  user_image_ = user_manager::UserImage(GetDefaultImage(image_index_));
+  user_image_ =
+      user_manager::UserImage(user_manager::GetDefaultImage(image_index_));
 
   UpdateUser();
   UpdateLocalState();
@@ -521,9 +523,10 @@ void UserImageManagerImpl::LoadUserImage() {
 
   int image_index = User::kInvalidImageIndex;
   image_properties->GetInteger(kImageIndexNodeName, &image_index);
-  if (image_index >= 0 && image_index < kDefaultImagesCount) {
-    user->SetImage(user_manager::UserImage(GetDefaultImage(image_index)),
-                   image_index);
+  if (image_index >= 0 && image_index < user_manager::kDefaultImagesCount) {
+    user->SetImage(
+        user_manager::UserImage(user_manager::GetDefaultImage(image_index)),
+        image_index);
     return;
   }
 
@@ -563,7 +566,7 @@ void UserImageManagerImpl::UserLoggedIn(bool user_is_new,
   } else {
     UMA_HISTOGRAM_ENUMERATION("UserImage.LoggedIn",
                               ImageIndexToHistogramIndex(user->image_index()),
-                              kHistogramImagesCount);
+                              user_manager::kHistogramImagesCount);
 
     if (!IsUserImageManaged() && user_needs_migration_) {
       const base::DictionaryValue* prefs_images_unsafe =
@@ -852,8 +855,9 @@ bool UserImageManagerImpl::IsUserImageManaged() const {
 
 void UserImageManagerImpl::SetInitialUserImage() {
   // Choose a random default image.
-  SaveUserDefaultImageIndex(base::RandInt(kFirstDefaultImageIndex,
-                                          kDefaultImagesCount - 1));
+  SaveUserDefaultImageIndex(
+      base::RandInt(user_manager::kFirstDefaultImageIndex,
+                    user_manager::kDefaultImagesCount - 1));
 }
 
 void UserImageManagerImpl::TryToInitDownloadedProfileImage() {
@@ -952,7 +956,7 @@ void UserImageManagerImpl::OnJobDone() {
   image_properties->GetInteger(kImageIndexNodeName, &image_index);
   UMA_HISTOGRAM_ENUMERATION("UserImage.Migration",
                             ImageIndexToHistogramIndex(image_index),
-                            kHistogramImagesCount);
+                            user_manager::kHistogramImagesCount);
 
   std::string image_path;
   image_properties->GetString(kImagePathNodeName, &image_path);
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
index 259af05..846a08d 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
@@ -31,8 +31,9 @@ const char kUserImageInfo[] = "user_image_info";
 const char kImageIndex[] = "image_index";
 
 bool IsIndexSupported(int index) {
-  return (index >= kFirstDefaultImageIndex && index < kDefaultImagesCount) ||
-      (index == User::kProfileImageIndex);
+  return (index >= user_manager::kFirstDefaultImageIndex &&
+          index < user_manager::kDefaultImagesCount) ||
+         (index == User::kProfileImageIndex);
 }
 
 Profile* GetUserProfile() {
diff --git a/chrome/browser/chromeos/login/users/user.cc b/chrome/browser/chromeos/login/users/user.cc
index 66e12ca..a515465 100644
--- a/chrome/browser/chromeos/login/users/user.cc
+++ b/chrome/browser/chromeos/login/users/user.cc
@@ -8,9 +8,9 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chromeos/login/user_names.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -139,7 +139,7 @@ std::string User::GetAccountName(bool use_display_email) const {
 }
 
 bool User::HasDefaultImage() const {
-  return image_index_ >= 0 && image_index_ < kDefaultImagesCount;
+  return image_index_ >= 0 && image_index_ < user_manager::kDefaultImagesCount;
 }
 
 bool User::CanSyncImage() const {
diff --git a/chrome/browser/chromeos/login/users/user.h b/chrome/browser/chromeos/login/users/user.h
index 9a9f54f..edc66ba 100644
--- a/chrome/browser/chromeos/login/users/user.h
+++ b/chrome/browser/chromeos/login/users/user.h
@@ -18,8 +18,6 @@
 
 namespace chromeos {
 
-extern const int kDefaultImagesCount;
-
 // A class representing information about a previously logged in user.
 // Each user has a canonical email (username), returned by |email()| and
 // may have a different displayed email (in the raw form as entered by user),
diff --git a/chrome/browser/supervised_user/DEPS b/chrome/browser/supervised_user/DEPS
new file mode 100644
index 0000000..e2928d9
--- /dev/null
+++ b/chrome/browser/supervised_user/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+"+components/user_manager",
+]
diff --git a/chrome/browser/supervised_user/supervised_user_sync_service.cc b/chrome/browser/supervised_user/supervised_user_sync_service.cc
index 4402415..13caa52 100644
--- a/chrome/browser/supervised_user/supervised_user_sync_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_sync_service.cc
@@ -21,7 +21,7 @@
 #include "sync/protocol/sync.pb.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #endif
 
 using base::DictionaryValue;
@@ -166,8 +166,8 @@ bool SupervisedUserSyncService::GetAvatarIndex(const std::string& avatar_str,
 
 #if defined(OS_CHROMEOS)
   return (*avatar_index == kChromeOSDummyAvatarIndex ||
-          (*avatar_index >= chromeos::kFirstDefaultImageIndex &&
-           *avatar_index < chromeos::kDefaultImagesCount));
+          (*avatar_index >= user_manager::kFirstDefaultImageIndex &&
+           *avatar_index < user_manager::kDefaultImagesCount));
 #else
   // Check if the Chrome avatar index is set to a dummy value. Some early
   // supervised user profiles on ChromeOS stored a dummy avatar index as a
diff --git a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
index 8cb0c70..7f60c70 100644
--- a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
@@ -22,7 +22,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #endif
 
 using sync_pb::ManagedUserSpecifics;
@@ -295,7 +295,7 @@ TEST_F(SupervisedUserSyncServiceTest, GetAvatarIndex) {
 
   int avatar_index = 4;
 #if defined(OS_CHROMEOS)
-  avatar_index += chromeos::kFirstDefaultImageIndex;
+  avatar_index += user_manager::kFirstDefaultImageIndex;
 #endif
   std::string avatar_str =
       SupervisedUserSyncService::BuildAvatarString(avatar_index);
@@ -311,7 +311,7 @@ TEST_F(SupervisedUserSyncServiceTest, GetAvatarIndex) {
 
   avatar_index = 0;
 #if defined(OS_CHROMEOS)
-  avatar_index += chromeos::kFirstDefaultImageIndex;
+  avatar_index += user_manager::kFirstDefaultImageIndex;
 #endif
   avatar_str = SupervisedUserSyncService::BuildAvatarString(avatar_index);
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
index 5f3d36b..60ffdaf 100644
--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
@@ -390,14 +390,18 @@ void SupervisedUserCreationScreenHandler::HandleAuthenticateManager(
 // It should be removed by issue 251179.
 void SupervisedUserCreationScreenHandler::HandleGetImages() {
   base::ListValue image_urls;
-  for (int i = kFirstDefaultImageIndex; i < kDefaultImagesCount; ++i) {
+  for (int i = user_manager::kFirstDefaultImageIndex;
+       i < user_manager::kDefaultImagesCount;
+       ++i) {
     scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);
-    image_data->SetString("url", GetDefaultImageUrl(i));
+    image_data->SetString("url", user_manager::GetDefaultImageUrl(i));
     image_data->SetString(
-        "author", l10n_util::GetStringUTF16(kDefaultImageAuthorIDs[i]));
+        "author",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageAuthorIDs[i]));
     image_data->SetString(
-        "website", l10n_util::GetStringUTF16(kDefaultImageWebsiteIDs[i]));
-    image_data->SetString("title", GetDefaultImageDescription(i));
+        "website",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageWebsiteIDs[i]));
+    image_data->SetString("title", user_manager::GetDefaultImageDescription(i));
     image_urls.Append(image_data.release());
   }
   CallJS("setDefaultImages", image_urls);
diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h
index 171c71b..76eba00 100644
--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h
@@ -9,8 +9,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "content/public/browser/web_ui.h"
 
 namespace base {
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index b7b7863..119ab44 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -11,12 +11,12 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/audio/chromeos_sounds.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/data_url.h"
@@ -124,7 +124,7 @@ void UserImageScreenHandler::RegisterMessages() {
 
 void UserImageScreenHandler::SelectImage(int index) {
   if (page_is_ready())
-    CallJS("setSelectedImage", GetDefaultImageUrl(index));
+    CallJS("setSelectedImage", user_manager::GetDefaultImageUrl(index));
 }
 
 void UserImageScreenHandler::SendProfileImage(const std::string& data_url) {
@@ -142,14 +142,18 @@ void UserImageScreenHandler::OnProfileImageAbsent() {
 // TODO(antrim) : It looks more like parameters for "Init" rather than callback.
 void UserImageScreenHandler::HandleGetImages() {
   base::ListValue image_urls;
-  for (int i = kFirstDefaultImageIndex; i < kDefaultImagesCount; ++i) {
+  for (int i = user_manager::kFirstDefaultImageIndex;
+       i < user_manager::kDefaultImagesCount;
+       ++i) {
     scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);
-    image_data->SetString("url", GetDefaultImageUrl(i));
+    image_data->SetString("url", user_manager::GetDefaultImageUrl(i));
     image_data->SetString(
-        "author", l10n_util::GetStringUTF16(kDefaultImageAuthorIDs[i]));
+        "author",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageAuthorIDs[i]));
     image_data->SetString(
-        "website", l10n_util::GetStringUTF16(kDefaultImageWebsiteIDs[i]));
-    image_data->SetString("title", GetDefaultImageDescription(i));
+        "website",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageWebsiteIDs[i]));
+    image_data->SetString("title", user_manager::GetDefaultImageDescription(i));
     image_urls.Append(image_data.release());
   }
   CallJS("setDefaultImages", image_urls);
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index 61f420c..53e91c2 100644
--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
@@ -15,7 +15,6 @@
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/camera_presence_notifier.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -26,6 +25,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/audio/chromeos_sounds.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -166,14 +166,18 @@ void ChangePictureOptionsHandler::RegisterMessages() {
 
 void ChangePictureOptionsHandler::SendDefaultImages() {
   base::ListValue image_urls;
-  for (int i = kFirstDefaultImageIndex; i < kDefaultImagesCount; ++i) {
+  for (int i = user_manager::kFirstDefaultImageIndex;
+       i < user_manager::kDefaultImagesCount;
+       ++i) {
     scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);
-    image_data->SetString("url", GetDefaultImageUrl(i));
+    image_data->SetString("url", user_manager::GetDefaultImageUrl(i));
     image_data->SetString(
-        "author", l10n_util::GetStringUTF16(kDefaultImageAuthorIDs[i]));
+        "author",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageAuthorIDs[i]));
     image_data->SetString(
-        "website", l10n_util::GetStringUTF16(kDefaultImageWebsiteIDs[i]));
-    image_data->SetString("title", GetDefaultImageDescription(i));
+        "website",
+        l10n_util::GetStringUTF16(user_manager::kDefaultImageWebsiteIDs[i]));
+    image_data->SetString("title", user_manager::GetDefaultImageDescription(i));
     image_urls.Append(image_data.release());
   }
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setDefaultImages",
@@ -281,16 +285,17 @@ void ChangePictureOptionsHandler::SendSelectedImage() {
     }
     default: {
       DCHECK(previous_image_index_ >= 0 &&
-             previous_image_index_ < kDefaultImagesCount);
-      if (previous_image_index_ >= kFirstDefaultImageIndex) {
+             previous_image_index_ < user_manager::kDefaultImagesCount);
+      if (previous_image_index_ >= user_manager::kFirstDefaultImageIndex) {
         // User has image from the current set of default images.
-        base::StringValue image_url(GetDefaultImageUrl(previous_image_index_));
+        base::StringValue image_url(
+            user_manager::GetDefaultImageUrl(previous_image_index_));
         web_ui()->CallJavascriptFunction(
             "ChangePictureOptions.setSelectedImage", image_url);
       } else {
         // User has an old default image, so present it in the same manner as a
         // previous image from file.
-        SendOldImage(GetDefaultImageUrl(previous_image_index_));
+        SendOldImage(user_manager::GetDefaultImageUrl(previous_image_index_));
       }
     }
   }
@@ -348,17 +353,18 @@ void ChangePictureOptionsHandler::HandleSelectImage(
         user_manager::UserImage::CreateAndEncode(previous_image_));
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                              kHistogramImageOld,
-                              kHistogramImagesCount);
+                              user_manager::kHistogramImageOld,
+                              user_manager::kHistogramImagesCount);
     VLOG(1) << "Selected old user image";
   } else if (image_type == "default" &&
-             IsDefaultImageUrl(image_url, &image_index)) {
+             user_manager::IsDefaultImageUrl(image_url, &image_index)) {
     // One of the default user images.
     user_image_manager->SaveUserDefaultImageIndex(image_index);
 
-    UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                              GetDefaultImageHistogramValue(image_index),
-                              kHistogramImagesCount);
+    UMA_HISTOGRAM_ENUMERATION(
+        "UserImage.ChangeChoice",
+        user_manager::GetDefaultImageHistogramValue(image_index),
+        user_manager::kHistogramImagesCount);
     VLOG(1) << "Selected default user image: " << image_index;
   } else if (image_type == "camera") {
     // Camera image is selected.
@@ -375,13 +381,13 @@ void ChangePictureOptionsHandler::HandleSelectImage(
 
     if (previous_image_index_ == User::kProfileImageIndex) {
       UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                                kHistogramImageOld,
-                                kHistogramImagesCount);
+                                user_manager::kHistogramImageOld,
+                                user_manager::kHistogramImagesCount);
       VLOG(1) << "Selected old (profile) user image";
     } else {
       UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                                kHistogramImageFromProfile,
-                                kHistogramImagesCount);
+                                user_manager::kHistogramImageFromProfile,
+                                user_manager::kHistogramImagesCount);
       VLOG(1) << "Selected profile image";
     }
   } else {
@@ -399,8 +405,9 @@ void ChangePictureOptionsHandler::FileSelected(const base::FilePath& path,
   UserManager* user_manager = UserManager::Get();
   user_manager->GetUserImageManager(GetUser()->email())->
       SaveUserImageFromFile(path);
-  UMA_HISTOGRAM_ENUMERATION(
-      "UserImage.ChangeChoice", kHistogramImageFromFile, kHistogramImagesCount);
+  UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
+                            user_manager::kHistogramImageFromFile,
+                            user_manager::kHistogramImagesCount);
   VLOG(1) << "Selected image from file";
 }
 
@@ -410,8 +417,8 @@ void ChangePictureOptionsHandler::SetImageFromCamera(
   user_manager->GetUserImageManager(GetUser()->email())
       ->SaveUserImage(user_manager::UserImage::CreateAndEncode(photo));
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
-                            kHistogramImageFromCamera,
-                            kHistogramImagesCount);
+                            user_manager::kHistogramImageFromCamera,
+                            user_manager::kHistogramImagesCount);
   VLOG(1) << "Selected camera photo";
 }
 
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index c47f5fb..6ad87bee 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
@@ -7,9 +7,9 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
-#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/common/url_constants.h"
+#include "components/user_manager/user_image/default_user_images.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_chromeos_resources.h"
 #include "net/base/escape.h"
@@ -68,7 +68,7 @@ base::RefCountedMemory* UserImageSource::GetUserImage(
     } else if (user->HasDefaultImage()) {
       return ResourceBundle::GetSharedInstance().
           LoadDataResourceBytesForScale(
-              kDefaultImageResourceIDs[user->image_index()],
+              user_manager::kDefaultImageResourceIDs[user->image_index()],
               scale_factor);
     } else {
       NOTREACHED() << "User with custom image missing raw data";
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a52f072..641db2c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3378,6 +3378,13 @@
         }],
         ['enable_managed_users==1', {
           'sources': [ '<@(chrome_browser_supervised_user_sources)' ],
+          'conditions' : [
+            [ 'chromeos==1', {
+              'dependencies': [
+                '<(DEPTH)/components/components.gyp:user_manager',
+              ]
+            }]
+          ]
         }],
         ['enable_webrtc==1', {
           'sources': [ '<@(chrome_browser_webrtc_sources)' ]
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 69110b7..82ac1376 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -715,8 +715,6 @@
         'browser/chromeos/login/ui/webui_login_view.h',
         'browser/chromeos/login/user_flow.cc',
         'browser/chromeos/login/user_flow.h',
-        'browser/chromeos/login/users/avatar/default_user_images.cc',
-        'browser/chromeos/login/users/avatar/default_user_images.h',
         'browser/chromeos/login/users/avatar/user_image_loader.cc',
         'browser/chromeos/login/users/avatar/user_image_loader.h',
         'browser/chromeos/login/users/avatar/user_image_manager.cc',