chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc - Issue 1658793002: Update chrome for new prefs location.

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 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/ui/user_adding_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | no next file with comments »
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 b258212cda0416ee9dfc7e78ff8ca116bcea78c6..a08a650144985376c21e06fcec5ff54896bb4fa0 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

@@ -18,9 +18,6 @@

#include "base/memory/ref_counted_memory.h"

#include "base/memory/scoped_ptr.h"

#include "base/path_service.h"

-#include "base/prefs/pref_change_registrar.h"

-#include "base/prefs/pref_service.h"

-#include "base/prefs/scoped_user_pref_update.h"

#include "base/run_loop.h"

#include "base/thread_task_runner_handle.h"

#include "base/time/time.h"

@@ -54,6 +51,9 @@

#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/prefs/pref_change_registrar.h"

+#include "components/prefs/pref_service.h"

+#include "components/prefs/scoped_user_pref_update.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_image/user_image.h"

#include "components/user_manager/user_manager.h"