chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc - Issue 1304843004: Add source column to chrome://policy showing the origins of policies.

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/sync/test/integration/two_client_bookmarks_sync_test.cc

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed another test. Created 5 years, 3 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/sessions/restore_on_startup_policy_handler_unittest.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

index cb34e92d586e913e20f042b168377ead92211c18..13cbbc014964de810b5949196373c501cbd3b6e9 100644

--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

@@ -15,6 +15,7 @@

#include "components/bookmarks/browser/bookmark_node.h"

#include "components/policy/core/common/mock_configuration_policy_provider.h"

#include "components/policy/core/common/policy_map.h"

+#include "components/policy/core/common/policy_types.h"

#include "policy/policy_constants.h"

#include "sync/internal_api/public/sessions/sync_session_snapshot.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -2203,7 +2204,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, ManagedBookmarks) {

policy::PolicyMap policy;

policy.Set(policy::key::kManagedBookmarks,

policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,

- list, NULL);

+ policy::POLICY_SOURCE_CLOUD, list, nullptr);

policy_provider_.UpdateChromePolicy(policy);

base::RunLoop().RunUntilIdle();