diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 19:21:49 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 19:21:49 +0000 |
| commit | 3cbae79b076f6cff6fcacbae93e87f5872a11c58 (patch) | |
| tree | ce03cf4a293e7bb31f1fa93cf3176f0f4ada9cef /chrome/browser/policy | |
| parent | 13f3f595723af07d2de2fb184157fffaefa5a438 (diff) | |
| download | chromium_src-3cbae79b076f6cff6fcacbae93e87f5872a11c58.zip chromium_src-3cbae79b076f6cff6fcacbae93e87f5872a11c58.tar.gz chromium_src-3cbae79b076f6cff6fcacbae93e87f5872a11c58.tar.bz2 | |
Add gdata-related enterprise policy preferences.
* Add preferences kDisableGData, kDisableGDataOverCellular, kDisableGDataHostedFiles, and register/handle these.
* CommandLinePrefStore is used to set kDisableGData preference based on switch.
* Add GDataDisabled and GDataDisabledOverCellular to policy template, add to simple pref-policy handler list.
* Cros specific tests for new gdata policies.
BUG=chromium-os:27168
TEST=--disable-gdata works as expected. GDataDisabled in /etc/chromium/policies/managed/test_policy.json works as expected.
Review URL: https://chromiumcodereview.appspot.com/9719008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/configuration_policy_handler_list.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/policy/configuration_policy_pref_store_unittest.cc | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc index 4b7a830..c5b33d7 100644 --- a/chrome/browser/policy/configuration_policy_handler_list.cc +++ b/chrome/browser/policy/configuration_policy_handler_list.cc @@ -296,6 +296,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { { key::kChromeOsReleaseChannel, prefs::kChromeOsReleaseChannel, Value::TYPE_STRING }, + { key::kGDataDisabled, + prefs::kDisableGData, + Value::TYPE_BOOLEAN }, + { key::kGDataDisabledOverCellular, + prefs::kDisableGDataOverCellular, + Value::TYPE_BOOLEAN }, #endif // defined(OS_CHROMEOS) #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index db8f45d..61526c2 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -111,7 +111,8 @@ TEST_P(ConfigurationPolicyPrefStoreStringTest, GetDefault) { TEST_P(ConfigurationPolicyPrefStoreStringTest, SetValue) { provider_.AddMandatoryPolicy(GetParam().policy_name(), - base::Value::CreateStringValue("http://chromium.org")); + base::Value::CreateStringValue( + "http://chromium.org")); store_->OnUpdatePolicy(&provider_); const base::Value* value = NULL; EXPECT_EQ(PrefStore::READ_OK, @@ -274,7 +275,11 @@ INSTANTIATE_TEST_CASE_P( ConfigurationPolicyPrefStoreBooleanTest, testing::Values( PolicyAndPref(key::kChromeOsLockOnIdleSuspend, - prefs::kEnableScreenLock))); + prefs::kEnableScreenLock), + PolicyAndPref(key::kGDataDisabled, + prefs::kDisableGData), + PolicyAndPref(key::kGDataDisabledOverCellular, + prefs::kDisableGDataOverCellular))); #endif // defined(OS_CHROMEOS) // Test cases for integer-valued policy settings. |