| Index: components/policy/core/common/policy_service_impl.cc
|
| diff --git a/components/policy/core/common/policy_service_impl.cc b/components/policy/core/common/policy_service_impl.cc
|
| index 2820767c14358008e3c5615eb4f684ad16b8ab6f..96922ace797cebb1970bbf359acaa8f729bb74c1 100644
|
| --- a/components/policy/core/common/policy_service_impl.cc
|
| +++ b/components/policy/core/common/policy_service_impl.cc
|
| @@ -14,7 +14,6 @@
|
| #include "base/values.h"
|
| #include "components/policy/core/common/policy_bundle.h"
|
| #include "components/policy/core/common/policy_map.h"
|
| -#include "components/policy/core/common/policy_types.h"
|
| #include "policy/policy_constants.h"
|
|
|
| namespace policy {
|
| @@ -42,7 +41,6 @@
|
| // The highest (level, scope) pair for an existing proxy policy is determined
|
| // first, and then only policies with those exact attributes are merged.
|
| PolicyMap::Entry current_priority; // Defaults to the lowest priority.
|
| - PolicySource inherited_source = POLICY_SOURCE_ENTERPRISE_DEFAULT;
|
| scoped_ptr<base::DictionaryValue> proxy_settings(new base::DictionaryValue);
|
| for (size_t i = 0; i < arraysize(kProxyPolicies); ++i) {
|
| const PolicyMap::Entry* entry = policies->Get(kProxyPolicies[i]);
|
| @@ -50,8 +48,6 @@
|
| if (entry->has_higher_priority_than(current_priority)) {
|
| proxy_settings->Clear();
|
| current_priority = *entry;
|
| - if (entry->source > inherited_source) // Higher priority?
|
| - inherited_source = entry->source;
|
| }
|
| if (!entry->has_higher_priority_than(current_priority) &&
|
| !current_priority.has_higher_priority_than(*entry)) {
|
| @@ -68,7 +64,6 @@
|
| policies->Set(key::kProxySettings,
|
| current_priority.level,
|
| current_priority.scope,
|
| - inherited_source,
|
| proxy_settings.release(),
|
| NULL);
|
| }
|
|
|