chrome/browser/prefs/proxy_policy_unittest.cc - Issue 1350913006: Revert of 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/prefs/proxy_policy_unittest.cc

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

Patch Set: 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/policy/profile_policy_connector_unittest.cc ('k') | chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/proxy_policy_unittest.cc

diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc

index 650564644741c450adb389f4f511e42ba7c8e7c3..09b6d83c477878ef685603a362cb366f0b2c3ace 100644

--- a/chrome/browser/prefs/proxy_policy_unittest.cc

+++ b/chrome/browser/prefs/proxy_policy_unittest.cc

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

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

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

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

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

#include "components/pref_registry/pref_registry_syncable.h"

#include "components/proxy_config/proxy_config_dictionary.h"

#include "components/proxy_config/proxy_config_pref_names.h"

@@ -127,17 +126,15 @@

new base::StringValue(ProxyPrefs::kFixedServersProxyModeName);

PolicyMap policy;

policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD, mode_name, nullptr);

+ mode_name, NULL);

policy.Set(key::kProxyBypassList,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("abc"),

NULL);

policy.Set(key::kProxyServer,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("ghi"),

NULL);

provider_.UpdateChromePolicy(policy);

@@ -170,7 +167,7 @@

new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName);

PolicyMap policy;

policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD, mode_name, nullptr);

+ mode_name, NULL);

provider_.UpdateChromePolicy(policy);

// First verify that command-line options are set correctly when

@@ -198,7 +195,7 @@

new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName);

PolicyMap policy;

policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD, mode_name, nullptr);

+ mode_name, NULL);

provider_.UpdateChromePolicy(policy);

// First verify that command-line options are set correctly when

@@ -222,7 +219,7 @@

new base::StringValue(ProxyPrefs::kDirectProxyModeName);

PolicyMap policy;

policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD, mode_name, nullptr);

+ mode_name, NULL);

provider_.UpdateChromePolicy(policy);

// First verify that the auto-detect is set if there is no managed