chrome/browser/net/proxy_policy_handler_unittest.cc - Issue 1350913006: Revert of Add source column to chrome://policy showing the origins of policies.

Unified Diff: chrome/browser/net/proxy_policy_handler_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/net/disk_cache_dir_policy_handler_unittest.cc ('k') | chrome/browser/policy/cloud/cloud_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/proxy_policy_handler_unittest.cc

diff --git a/chrome/browser/net/proxy_policy_handler_unittest.cc b/chrome/browser/net/proxy_policy_handler_unittest.cc

index 823101b348b1fa2ccb0d6a74227a4d5004d43538..570bf01dc45a97169b7ada77ea17aa8f20d4b135 100644

--- a/chrome/browser/net/proxy_policy_handler_unittest.cc

+++ b/chrome/browser/net/proxy_policy_handler_unittest.cc

@@ -10,7 +10,6 @@

#include "components/policy/core/browser/configuration_policy_pref_store.h"

#include "components/policy/core/browser/configuration_policy_pref_store_test.h"

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

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

#include "components/proxy_config/proxy_config_dictionary.h"

#include "components/proxy_config/proxy_config_pref_names.h"

#include "policy/policy_constants.h"

@@ -77,20 +76,17 @@

policy.Set(key::kProxyBypassList,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("http://chromium.org/override"),

NULL);

policy.Set(key::kProxyServer,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("chromium.org"),

NULL);

policy.Set(

key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(

ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),

NULL);

@@ -108,20 +104,17 @@

key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(

ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),

NULL);

policy.Set(key::kProxyBypassList,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("http://chromium.org/override"),

NULL);

policy.Set(key::kProxyServer,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("chromium.org"),

NULL);

UpdateProviderPolicy(policy);

@@ -138,7 +131,6 @@

key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(

ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),

NULL);

@@ -153,7 +145,6 @@

policy.Set(key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(ProxyPolicyHandler::PROXY_SERVER_MODE),

NULL);

UpdateProviderPolicy(policy);

@@ -166,7 +157,6 @@

policy.Set(key::kProxyMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

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

NULL);

UpdateProviderPolicy(policy);

@@ -179,7 +169,6 @@

policy.Set(key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(

ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE),

NULL);

@@ -195,7 +184,6 @@

policy.Set(key::kProxyMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

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

NULL);

UpdateProviderPolicy(policy);

@@ -210,13 +198,11 @@

policy.Set(key::kProxyPacUrl,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("http://short.org/proxy.pac"),

NULL);

policy.Set(key::kProxyMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(ProxyPrefs::kPacScriptProxyModeName),

NULL);

UpdateProviderPolicy(policy);

@@ -231,7 +217,6 @@

policy.Set(key::kProxyMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(ProxyPrefs::kPacScriptProxyModeName),

NULL);

UpdateProviderPolicy(policy);

@@ -246,19 +231,16 @@

policy.Set(key::kProxyServer,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(std::string()),

NULL);

policy.Set(key::kProxyPacUrl,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("http://short.org/proxy.pac"),

NULL);

policy.Set(key::kProxyMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(ProxyPrefs::kPacScriptProxyModeName),

NULL);

UpdateProviderPolicy(policy);

@@ -273,7 +255,6 @@

policy.Set(key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(

ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE),

NULL);

@@ -287,7 +268,6 @@

policy.Set(key::kProxyMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(ProxyPrefs::kSystemProxyModeName),

NULL);

UpdateProviderPolicy(policy);

@@ -301,13 +281,11 @@

policy.Set(key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(ProxyPolicyHandler::PROXY_SERVER_MODE),

NULL);

policy.Set(key::kProxyMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

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

NULL);

UpdateProviderPolicy(policy);

@@ -323,26 +301,22 @@

policy.Set(key::kProxyPacUrl,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("http://short.org/proxy.pac"),

NULL);

policy.Set(key::kProxyBypassList,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("http://chromium.org/override"),

NULL);

policy.Set(key::kProxyServer,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue("chromium.org"),

NULL);

for (int i = 0; i < ProxyPolicyHandler::MODE_COUNT; ++i) {

policy.Set(key::kProxyServerMode,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(i),

NULL);

UpdateProviderPolicy(policy);