chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc - Issue 2606773002: Setup Chromad user policy plumbing

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 2606773002: Setup Chromad user policy plumbing (Closed)

Patch Set: Rebase Created 4 years 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_browsertest.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h » ('j') | no next file with comments »
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 2c02afa619d93353581f7eae733ae416abcff5e5..ea0f0c47e53b0358b485adc574b4f21b3b85ad94 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

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

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.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"

-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"

+#include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/stub_install_attributes.h"

#include "chrome/browser/profiles/profile.h"

@@ -75,7 +75,8 @@ policy::CloudPolicyStore* GetStoreForUser(const user_manager::User* user) {

return NULL;

}

policy::UserCloudPolicyManagerChromeOS* policy_manager =

- policy::UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile);

+ policy::UserPolicyManagerFactoryChromeOS::GetCloudPolicyManagerForProfile(

+ profile);

if (!policy_manager) {

ADD_FAILURE();

return NULL;