| 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 e133bc98c1b7ae9efc7e5528196dbb82196aadf4..0ad9eb6daf051c50c57bf1961e6ec0d1cc9283fd 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
|
| @@ -1,8 +1,9 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #include "base/file_path.h"
|
| +#include "base/ref_counted.h"
|
| #include "chrome/browser/policy/configuration_policy_pref_store.h"
|
| #include "chrome/browser/policy/mock_configuration_policy_provider.h"
|
| #include "chrome/browser/prefs/proxy_prefs.h"
|
| @@ -37,10 +38,10 @@ class ConfigurationPolicyPrefStoreTestBase : public TESTBASE {
|
| protected:
|
| ConfigurationPolicyPrefStoreTestBase()
|
| : provider_(),
|
| - store_(&provider_) {}
|
| + store_(new ConfigurationPolicyPrefStore(&provider_)) {}
|
|
|
| MockConfigurationPolicyProvider provider_;
|
| - ConfigurationPolicyPrefStore store_;
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store_;
|
| };
|
|
|
| // Test cases for list-valued policy settings.
|
| @@ -51,7 +52,7 @@ class ConfigurationPolicyPrefStoreListTest
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreListTest, GetDefault) {
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(GetParam().pref_name(), NULL));
|
| + store_->GetValue(GetParam().pref_name(), NULL));
|
| }
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreListTest, SetValue) {
|
| @@ -59,10 +60,10 @@ 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();
|
| Value* value;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store_.GetValue(GetParam().pref_name(), &value));
|
| + store_->GetValue(GetParam().pref_name(), &value));
|
| EXPECT_TRUE(in_value->Equals(value));
|
| }
|
|
|
| @@ -87,16 +88,16 @@ class ConfigurationPolicyPrefStoreStringTest
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreStringTest, GetDefault) {
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(GetParam().pref_name(), NULL));
|
| + store_->GetValue(GetParam().pref_name(), NULL));
|
| }
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreStringTest, SetValue) {
|
| provider_.AddPolicy(GetParam().type(),
|
| Value::CreateStringValue("http://chromium.org"));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| Value* value;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store_.GetValue(GetParam().pref_name(), &value));
|
| + store_->GetValue(GetParam().pref_name(), &value));
|
| EXPECT_TRUE(StringValue("http://chromium.org").Equals(value));
|
| }
|
|
|
| @@ -127,23 +128,23 @@ class ConfigurationPolicyPrefStoreBooleanTest
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreBooleanTest, GetDefault) {
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(GetParam().pref_name(), NULL));
|
| + store_->GetValue(GetParam().pref_name(), NULL));
|
| }
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
|
| provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(false));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| Value* value;
|
| bool result = true;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store_.GetValue(GetParam().pref_name(), &value));
|
| + store_->GetValue(GetParam().pref_name(), &value));
|
| EXPECT_TRUE(FundamentalValue(false).Equals(value));
|
|
|
| provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(true));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| result = false;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store_.GetValue(GetParam().pref_name(), &value));
|
| + store_->GetValue(GetParam().pref_name(), &value));
|
| EXPECT_TRUE(FundamentalValue(true).Equals(value));
|
| }
|
|
|
| @@ -203,15 +204,15 @@ class ConfigurationPolicyPrefStoreIntegerTest
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreIntegerTest, GetDefault) {
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(GetParam().pref_name(), NULL));
|
| + store_->GetValue(GetParam().pref_name(), NULL));
|
| }
|
|
|
| TEST_P(ConfigurationPolicyPrefStoreIntegerTest, SetValue) {
|
| provider_.AddPolicy(GetParam().type(), Value::CreateIntegerValue(2));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store_.GetValue(GetParam().pref_name(), &value));
|
| + store_->GetValue(GetParam().pref_name(), &value));
|
| EXPECT_TRUE(FundamentalValue(2).Equals(value));
|
| }
|
|
|
| @@ -275,9 +276,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
|
| Value::CreateIntegerValue(
|
| kPolicyManuallyConfiguredProxyServerMode));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| VerifyProxyPrefs(
|
| - store, "chromium.org", "", "http://chromium.org/override",
|
| + *store, "chromium.org", "", "http://chromium.org/override",
|
| ProxyPrefs::MODE_FIXED_SERVERS);
|
| }
|
|
|
| @@ -290,10 +292,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
|
| Value::CreateStringValue("http://chromium.org/override"));
|
| provider.AddPolicy(kPolicyProxyServer,
|
| Value::CreateStringValue("chromium.org"));
|
| -
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| VerifyProxyPrefs(
|
| - store, "chromium.org", "", "http://chromium.org/override",
|
| + *store, "chromium.org", "", "http://chromium.org/override",
|
| ProxyPrefs::MODE_FIXED_SERVERS);
|
| }
|
|
|
| @@ -302,8 +304,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyServerMode) {
|
| provider.AddPolicy(kPolicyProxyServerMode,
|
| Value::CreateIntegerValue(kPolicyNoProxyServerMode));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(store, "", "", "", ProxyPrefs::MODE_DIRECT);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "", "", ProxyPrefs::MODE_DIRECT);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
|
| @@ -312,8 +315,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
|
| kPolicyProxyMode,
|
| Value::CreateStringValue(ProxyPrefs::kDirectProxyModeName));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(store, "", "", "", ProxyPrefs::MODE_DIRECT);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "", "", ProxyPrefs::MODE_DIRECT);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
|
| @@ -322,8 +326,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
|
| kPolicyProxyServerMode,
|
| Value::CreateIntegerValue(kPolicyAutoDetectProxyServerMode));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(store, "", "", "", ProxyPrefs::MODE_AUTO_DETECT);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "", "", ProxyPrefs::MODE_AUTO_DETECT);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
|
| @@ -332,8 +337,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
|
| kPolicyProxyMode,
|
| Value::CreateStringValue(ProxyPrefs::kAutoDetectProxyModeName));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(store, "", "", "", ProxyPrefs::MODE_AUTO_DETECT);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "", "", ProxyPrefs::MODE_AUTO_DETECT);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
|
| @@ -344,9 +350,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
|
| kPolicyProxyMode,
|
| Value::CreateStringValue(ProxyPrefs::kPacScriptProxyModeName));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(
|
| - store, "", "http://short.org/proxy.pac", "", ProxyPrefs::MODE_PAC_SCRIPT);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "http://short.org/proxy.pac", "",
|
| + ProxyPrefs::MODE_PAC_SCRIPT);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) {
|
| @@ -355,8 +362,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) {
|
| kPolicyProxyServerMode,
|
| Value::CreateIntegerValue(kPolicyUseSystemProxyServerMode));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(store, "", "", "", ProxyPrefs::MODE_SYSTEM);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "", "", ProxyPrefs::MODE_SYSTEM);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
|
| @@ -365,8 +373,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
|
| kPolicyProxyMode,
|
| Value::CreateStringValue(ProxyPrefs::kSystemProxyModeName));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(store, "", "", "", ProxyPrefs::MODE_SYSTEM);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "", "", ProxyPrefs::MODE_SYSTEM);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest,
|
| @@ -378,8 +387,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest,
|
| kPolicyProxyMode,
|
| Value::CreateStringValue(ProxyPrefs::kAutoDetectProxyModeName));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| - VerifyProxyPrefs(store, "", "", "", ProxyPrefs::MODE_AUTO_DETECT);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| + VerifyProxyPrefs(*store, "", "", "", ProxyPrefs::MODE_AUTO_DETECT);
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) {
|
| @@ -395,9 +405,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) {
|
| provider.AddPolicy(kPolicyProxyServer,
|
| Value::CreateStringValue("chromium.org"));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kProxyMode, NULL));
|
| + store->GetValue(prefs::kProxyMode, NULL));
|
| }
|
| }
|
|
|
| @@ -414,35 +425,36 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MinimallyDefined) {
|
| provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
|
| Value::CreateStringValue(search_url));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
|
|
| Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
|
| EXPECT_TRUE(StringValue(search_url).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderName, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderName, &value));
|
| EXPECT_TRUE(StringValue("test.com").Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderKeyword, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderKeyword, &value));
|
| EXPECT_TRUE(StringValue(std::string()).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderSuggestURL, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderSuggestURL, &value));
|
| EXPECT_TRUE(StringValue(std::string()).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderIconURL, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderIconURL, &value));
|
| EXPECT_TRUE(StringValue(std::string()).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderEncodings, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderEncodings, &value));
|
| EXPECT_TRUE(StringValue(std::string()).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderInstantURL, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderInstantURL, &value));
|
| EXPECT_TRUE(StringValue(std::string()).Equals(value));
|
| }
|
|
|
| @@ -471,31 +483,32 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, FullyDefined) {
|
| provider.AddPolicy(kPolicyDefaultSearchProviderEncodings,
|
| Value::CreateStringValue(encodings));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
|
|
| Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
|
| EXPECT_TRUE(StringValue(search_url).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderName, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderName, &value));
|
| EXPECT_TRUE(StringValue(name).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderKeyword, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderKeyword, &value));
|
| EXPECT_TRUE(StringValue(keyword).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderSuggestURL, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderSuggestURL, &value));
|
| EXPECT_TRUE(StringValue(suggest_url).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderIconURL, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderIconURL, &value));
|
| EXPECT_TRUE(StringValue(icon_url).Equals(value));
|
|
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store.GetValue(prefs::kDefaultSearchProviderEncodings, &value));
|
| + store->GetValue(prefs::kDefaultSearchProviderEncodings, &value));
|
| EXPECT_TRUE(StringValue(encodings).Equals(value));
|
| }
|
|
|
| @@ -521,20 +534,21 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MissingUrl) {
|
| provider.AddPolicy(kPolicyDefaultSearchProviderEncodings,
|
| Value::CreateStringValue(encodings));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
|
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderName, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderName, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderSuggestURL, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderSuggestURL, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderIconURL, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderIconURL, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderEncodings, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderEncodings, NULL));
|
| }
|
|
|
| // Checks that if the default search policy is invalid, that no elements of the
|
| @@ -562,20 +576,21 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, Invalid) {
|
| provider.AddPolicy(kPolicyDefaultSearchProviderEncodings,
|
| Value::CreateStringValue(encodings));
|
|
|
| - ConfigurationPolicyPrefStore store(&provider);
|
| + scoped_refptr<ConfigurationPolicyPrefStore> store(
|
| + new ConfigurationPolicyPrefStore(&provider));
|
|
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderSearchURL, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderName, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderName, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderKeyword, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderSuggestURL, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderSuggestURL, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderIconURL, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderIconURL, NULL));
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store.GetValue(prefs::kDefaultSearchProviderEncodings, NULL));
|
| + store->GetValue(prefs::kDefaultSearchProviderEncodings, NULL));
|
| }
|
|
|
| // Test cases for the Sync policy setting.
|
| @@ -585,23 +600,23 @@ class ConfigurationPolicyPrefStoreSyncTest
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreSyncTest, Default) {
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(prefs::kSyncManaged, NULL));
|
| + store_->GetValue(prefs::kSyncManaged, NULL));
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreSyncTest, Enabled) {
|
| provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(false));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| // Enabling Sync should not set the pref.
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(prefs::kSyncManaged, NULL));
|
| + store_->GetValue(prefs::kSyncManaged, NULL));
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreSyncTest, Disabled) {
|
| provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(true));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| // Sync should be flagged as managed.
|
| Value* value = NULL;
|
| - EXPECT_EQ(PrefStore::READ_OK, store_.GetValue(prefs::kSyncManaged, &value));
|
| + EXPECT_EQ(PrefStore::READ_OK, store_->GetValue(prefs::kSyncManaged, &value));
|
| ASSERT_TRUE(value != NULL);
|
| EXPECT_TRUE(FundamentalValue(true).Equals(value));
|
| }
|
| @@ -613,24 +628,24 @@ class ConfigurationPolicyPrefStoreAutoFillTest
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreAutoFillTest, Default) {
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(prefs::kSyncManaged, NULL));
|
| + store_->GetValue(prefs::kSyncManaged, NULL));
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreAutoFillTest, Enabled) {
|
| provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(true));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| // Enabling AutoFill should not set the pref.
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(prefs::kSyncManaged, NULL));
|
| + store_->GetValue(prefs::kSyncManaged, NULL));
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreAutoFillTest, Disabled) {
|
| provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(false));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| // Disabling AutoFill should switch the pref to managed.
|
| Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store_.GetValue(prefs::kAutoFillEnabled, &value));
|
| + store_->GetValue(prefs::kAutoFillEnabled, &value));
|
| EXPECT_TRUE(FundamentalValue(false).Equals(value));
|
| }
|
|
|
| @@ -639,11 +654,11 @@ class ConfigurationPolicyPrefStoreRefreshTest
|
| : public ConfigurationPolicyPrefStoreTestBase<testing::Test> {
|
| protected:
|
| virtual void SetUp() {
|
| - store_.AddObserver(&observer_);
|
| + store_->AddObserver(&observer_);
|
| }
|
|
|
| virtual void TearDown() {
|
| - store_.RemoveObserver(&observer_);
|
| + store_->RemoveObserver(&observer_);
|
| }
|
|
|
| PrefStoreObserverMock observer_;
|
| @@ -652,40 +667,40 @@ class ConfigurationPolicyPrefStoreRefreshTest
|
| TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) {
|
| Value* value = NULL;
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(prefs::kHomePage, NULL));
|
| + store_->GetValue(prefs::kHomePage, NULL));
|
|
|
| EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1);
|
| provider_.AddPolicy(kPolicyHomePage,
|
| Value::CreateStringValue("http://www.chromium.org"));
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| Mock::VerifyAndClearExpectations(&observer_);
|
| EXPECT_EQ(PrefStore::READ_OK,
|
| - store_.GetValue(prefs::kHomePage, &value));
|
| + store_->GetValue(prefs::kHomePage, &value));
|
| EXPECT_TRUE(StringValue("http://www.chromium.org").Equals(value));
|
|
|
| EXPECT_CALL(observer_, OnPrefValueChanged(_)).Times(0);
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| Mock::VerifyAndClearExpectations(&observer_);
|
|
|
| EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1);
|
| provider_.RemovePolicy(kPolicyHomePage);
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| Mock::VerifyAndClearExpectations(&observer_);
|
| EXPECT_EQ(PrefStore::READ_NO_VALUE,
|
| - store_.GetValue(prefs::kHomePage, NULL));
|
| + store_->GetValue(prefs::kHomePage, NULL));
|
| }
|
|
|
| TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Initialization) {
|
| - EXPECT_FALSE(store_.IsInitializationComplete());
|
| + EXPECT_FALSE(store_->IsInitializationComplete());
|
|
|
| EXPECT_CALL(observer_, OnInitializationCompleted()).Times(1);
|
|
|
| provider_.SetInitializationComplete(true);
|
| - EXPECT_FALSE(store_.IsInitializationComplete());
|
| + EXPECT_FALSE(store_->IsInitializationComplete());
|
|
|
| - store_.OnUpdatePolicy();
|
| + store_->OnUpdatePolicy();
|
| Mock::VerifyAndClearExpectations(&observer_);
|
| - EXPECT_TRUE(store_.IsInitializationComplete());
|
| + EXPECT_TRUE(store_->IsInitializationComplete());
|
| }
|
|
|
| } // namespace policy
|
|
|