| Index: components/policy/core/common/policy_loader_win.cc
|
| diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc
|
| index bfa675cd8270edc9824325fa7f8b3d2c49fe9436..74e18c7876d96e0eb3213bce018b878cc300d0b4 100644
|
| --- a/components/policy/core/common/policy_loader_win.cc
|
| +++ b/components/policy/core/common/policy_loader_win.cc
|
| @@ -461,9 +461,10 @@ scoped_ptr<PolicyBundle> PolicyLoaderWin::Load() {
|
| // timeout on it more aggressively. For now, there's no justification for
|
| // the additional effort this would introduce.
|
|
|
| - if (is_enterprise || !ReadPolicyFromGPO(scope, &gpo_dict, &status)) {
|
| - VLOG_IF(1, !is_enterprise) << "Failed to read GPO files for " << scope
|
| - << " falling back to registry.";
|
| + bool is_registry_forced = is_enterprise || gpo_provider_ == nullptr;
|
| + if (is_registry_forced || !ReadPolicyFromGPO(scope, &gpo_dict, &status)) {
|
| + VLOG_IF(1, !is_registry_forced) << "Failed to read GPO files for "
|
| + << scope << " falling back to registry.";
|
| gpo_dict.ReadRegistry(kScopes[i].hive, chrome_policy_key_);
|
| }
|
|
|
|
|