chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc - Issue 376193002: Move UserImage to user_manager

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/chromeos/login/users/avatar/user_image_manager_browsertest.cc

Issue 376193002: Move UserImage to user_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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/chromeos/login/users/avatar/user_image_manager.h ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h » ('j') | components/user_manager/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

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 0be1fbc2b1c151850bc1fee69063ac217ceb5325..9f1105ff9722ef22a92b0c3c0c4c2ae5c9d1959e 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

@@ -28,7 +28,6 @@

#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.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"

@@ -53,6 +52,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/user_image.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/notification_source.h"

#include "content/public/test/test_utils.h"

@@ -429,7 +429,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {

run_loop_.reset(new base::RunLoop);

UserImageManager* user_image_manager =

UserManager::Get()->GetUserImageManager(kTestUser1);

- user_image_manager->SaveUserImage(UserImage::CreateAndEncode(custom_image));

+ user_image_manager->SaveUserImage(

+ user_manager::UserImage::CreateAndEncode(custom_image));

run_loop_->Run();

EXPECT_FALSE(user->HasDefaultImage());