Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4143)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/configuration_policy_pref_store_unittest.cc

Issue 8586030: Added ConfigurationPolicyProvider::RefreshPolicies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« chrome/browser/policy/cloud_policy_provider_unittest.cc ('K') | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/policy/configuration_policy_provider.h » ('j') | chrome/browser/policy/configuration_policy_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/configuration_policy_pref_store_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index 7cefd44ed246469fd0c01fd893f758e88085cde6..ad93b8990e3b7b5dbeeae5ba99c9ed794f0f9719 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -61,7 +61,7 @@ TEST_P(ConfigurationPolicyPrefStoreListTest, SetValue) {
in_value->Append(Value::CreateStringValue("test1"));
in_value->Append(Value::CreateStringValue("test2,"));
provider_.AddPolicy(GetParam().type(), in_value);
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(GetParam().pref_name(), &value));
@@ -108,7 +108,7 @@ TEST_P(ConfigurationPolicyPrefStoreStringTest, GetDefault) {
TEST_P(ConfigurationPolicyPrefStoreStringTest, SetValue) {
provider_.AddPolicy(GetParam().type(),
Value::CreateStringValue("http://chromium.org"));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(GetParam().pref_name(), &value));
@@ -158,7 +158,7 @@ TEST_P(ConfigurationPolicyPrefStoreBooleanTest, GetDefault) {
TEST_P(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(false));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(GetParam().pref_name(), &value));
@@ -169,7 +169,7 @@ TEST_P(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
EXPECT_FALSE(boolean_value);
provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(true));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(GetParam().pref_name(), &value));
@@ -278,7 +278,7 @@ TEST_P(ConfigurationPolicyPrefStoreIntegerTest, GetDefault) {
TEST_P(ConfigurationPolicyPrefStoreIntegerTest, SetValue) {
provider_.AddPolicy(GetParam().type(), Value::CreateIntegerValue(2));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(GetParam().pref_name(), &value));
@@ -826,7 +826,7 @@ TEST_F(ConfigurationPolicyPrefStoreSyncTest, Default) {
TEST_F(ConfigurationPolicyPrefStoreSyncTest, Enabled) {
provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(false));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
// Enabling Sync should not set the pref.
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kSyncManaged, NULL));
@@ -834,7 +834,7 @@ TEST_F(ConfigurationPolicyPrefStoreSyncTest, Enabled) {
TEST_F(ConfigurationPolicyPrefStoreSyncTest, Disabled) {
provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(true));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
// Sync should be flagged as managed.
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK, store_->GetValue(prefs::kSyncManaged, &value));
@@ -861,7 +861,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) {
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kPromptForDownload, NULL));
provider_.AddPolicy(kPolicyDownloadDirectory, Value::CreateStringValue(""));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
// Setting a DownloadDirectory should disable the PromptForDownload pref.
const Value* value = NULL;
@@ -881,7 +881,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest,
store_->GetValue(prefs::kPromptForDownload, NULL));
provider_.AddPolicy(kPolicyAllowFileSelectionDialogs,
Value::CreateBooleanValue(true));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
// Allowing file-selection dialogs should not influence the PromptForDownload
// pref.
@@ -895,7 +895,7 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest,
store_->GetValue(prefs::kPromptForDownload, NULL));
provider_.AddPolicy(kPolicyAllowFileSelectionDialogs,
Value::CreateBooleanValue(false));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
// Disabling file-selection dialogs should disable the PromptForDownload pref.
const Value* value = NULL;
@@ -920,7 +920,7 @@ TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Default) {
TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(true));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
// Enabling Autofill should not set the pref.
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kAutofillEnabled, NULL));
@@ -928,7 +928,7 @@ TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Disabled) {
provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(false));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
// Disabling Autofill should switch the pref to managed.
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -963,19 +963,19 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) {
EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1);
provider_.AddPolicy(kPolicyHomepageLocation,
Value::CreateStringValue("http://www.chromium.org"));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(prefs::kHomePage, &value));
EXPECT_TRUE(StringValue("http://www.chromium.org").Equals(value));
EXPECT_CALL(observer_, OnPrefValueChanged(_)).Times(0);
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1);
provider_.RemovePolicy(kPolicyHomepageLocation);
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kHomePage, NULL));
@@ -989,7 +989,7 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Initialization) {
provider_.SetInitializationComplete(true);
EXPECT_FALSE(store_->IsInitializationComplete());
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_TRUE(store_->IsInitializationComplete());
}
@@ -1005,12 +1005,12 @@ TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabled) {
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
provider_.AddPolicy(kPolicyJavascriptEnabled,
Value::CreateBooleanValue(true));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
provider_.AddPolicy(kPolicyJavascriptEnabled,
Value::CreateBooleanValue(false));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
@@ -1022,7 +1022,7 @@ TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabledOverridden) {
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
provider_.AddPolicy(kPolicyJavascriptEnabled,
Value::CreateBooleanValue(false));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
@@ -1030,7 +1030,7 @@ TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabledOverridden) {
// DefaultJavaScriptSetting overrides JavascriptEnabled.
provider_.AddPolicy(kPolicyDefaultJavaScriptSetting,
Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
- store_->OnUpdatePolicy();
+ store_->OnUpdatePolicy(&provider_);
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
« chrome/browser/policy/cloud_policy_provider_unittest.cc ('K') | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/policy/configuration_policy_provider.h » ('j') | chrome/browser/policy/configuration_policy_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698