Index: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
index 53649bf65acb0984c0828ce3106727fd38a3bad2..3185d501a5dc701b8f90c67e8719e11934764ba4 100644 |
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc |
@@ -38,6 +38,7 @@ |
#include "components/policy/core/common/mock_configuration_policy_provider.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 "components/policy/core/common/schema_registry.h" |
#include "net/url_request/url_request_context_getter.h" |
#include "net/url_request/url_request_test_util.h" |
@@ -143,6 +144,7 @@ void DeviceLocalAccountPolicyServiceTestBase::SetUp() { |
expected_policy_map_.Set(key::kDisableSpdy, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_USER, |
+ POLICY_SOURCE_CLOUD, |
new base::FundamentalValue(true), |
NULL); |
@@ -802,10 +804,18 @@ void DeviceLocalAccountPolicyProviderTest::SetUp() { |
provider_->Init(&schema_registry_); |
provider_->AddObserver(&provider_observer_); |
+ expected_policy_map_.Set(key::kDisableSpdy, |
bartfab (slow)
2015/09/16 15:58:41
How come you expect a policy to be set that was no
fhorschig
2015/09/17 11:20:41
Removed. It's exactly what was set in line 144. I
|
+ POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_USER, |
+ POLICY_SOURCE_CLOUD, |
+ new base::FundamentalValue(true), |
+ nullptr); |
+ |
// Values implicitly enforced for public accounts. |
expected_policy_map_.Set(key::kLidCloseAction, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
+ POLICY_SOURCE_BUILT_IN, |
new base::FundamentalValue( |
chromeos::PowerPolicyController:: |
ACTION_STOP_SESSION), |
@@ -813,16 +823,19 @@ void DeviceLocalAccountPolicyProviderTest::SetUp() { |
expected_policy_map_.Set(key::kShelfAutoHideBehavior, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
+ POLICY_SOURCE_BUILT_IN, |
new base::StringValue("Never"), |
NULL); |
expected_policy_map_.Set(key::kShowLogoutButtonInTray, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
+ POLICY_SOURCE_BUILT_IN, |
new base::FundamentalValue(true), |
NULL); |
expected_policy_map_.Set(key::kFullscreenAllowed, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
+ POLICY_SOURCE_BUILT_IN, |
new base::FundamentalValue(false), |
NULL); |
} |
@@ -889,6 +902,7 @@ TEST_F(DeviceLocalAccountPolicyProviderTest, Policy) { |
.Set(key::kDisableSpdy, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_USER, |
+ POLICY_SOURCE_CLOUD, |
new base::FundamentalValue(false), |
NULL); |
EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); |