chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc - Issue 402133003: [cros, user_manager] Move default user images constants and helper functions out of src/chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc

Issue 402133003: [cros, user_manager] Move default user images constants and helper functions out of src/chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: re-format Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_sync_service.cc ('k') | chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc

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 8cb0c70a0268464ca6e343ca9b5058c81fe3d3d6..7f60c7066e7be49c0b0dd6171b241787fc9c569d 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)