chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/wallpaper/wallpaper_manager_policy_browsertest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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

« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

index 88fe5811bdb1fdf3086ae9194add5033074e58d0..781d1479ede9964264cd7e42ca1c71b5f4b5fe61 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

@@ -20,7 +20,6 @@

#include "chrome/browser/chromeos/login/login_manager_test.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

#include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

@@ -40,6 +39,7 @@

#include "components/policy/core/common/cloud/cloud_policy_validator.h"

#include "components/policy/core/common/cloud/policy_builder.h"

#include "components/user_manager/user.h"

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

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

#include "crypto/rsa_private_key.h"

#include "net/test/embedded_test_server/embedded_test_server.h"

@@ -245,7 +245,8 @@ class WallpaperManagerPolicyTest

}

builder->Build();

fake_session_manager_client_->set_user_policy(user_id, builder->GetBlob());

- const user_manager::User* user = UserManager::Get()->FindUser(user_id);

+ const user_manager::User* user =

+ user_manager::UserManager::Get()->FindUser(user_id);

ASSERT_TRUE(user);

policy::CloudPolicyStore* store = GetStoreForUser(user);

ASSERT_TRUE(store);