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

Side by Side Diff: chrome/browser/policy/configuration_policy_pref_store_unittest.cc

Issue 22812002: Refactored ConfigurationPolicyPrefStore to not depend on chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/prefs/pref_store_observer_mock.h" 11 #include "base/prefs/pref_store_observer_mock.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "chrome/browser/policy/configuration_policy_handler.h" 13 #include "chrome/browser/policy/configuration_policy_handler.h"
14 #include "chrome/browser/policy/configuration_policy_handler_list.h"
14 #include "chrome/browser/policy/configuration_policy_pref_store.h" 15 #include "chrome/browser/policy/configuration_policy_pref_store.h"
15 #include "chrome/browser/policy/external_data_fetcher.h" 16 #include "chrome/browser/policy/external_data_fetcher.h"
16 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 17 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
17 #include "chrome/browser/policy/policy_map.h" 18 #include "chrome/browser/policy/policy_map.h"
18 #include "chrome/browser/policy/policy_service_impl.h" 19 #include "chrome/browser/policy/policy_service_impl.h"
19 #include "chrome/browser/prefs/incognito_mode_prefs.h" 20 #include "chrome/browser/prefs/incognito_mode_prefs.h"
20 #include "chrome/browser/prefs/proxy_config_dictionary.h" 21 #include "chrome/browser/prefs/proxy_config_dictionary.h"
21 #include "chrome/common/content_settings.h" 22 #include "chrome/common/content_settings.h"
22 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
23 #include "policy/policy_constants.h" 24 #include "policy/policy_constants.h"
(...skipping 24 matching lines...) Expand all
48 class ConfigurationPolicyPrefStoreTest : public testing::Test { 49 class ConfigurationPolicyPrefStoreTest : public testing::Test {
49 protected: 50 protected:
50 ConfigurationPolicyPrefStoreTest() { 51 ConfigurationPolicyPrefStoreTest() {
51 EXPECT_CALL(provider_, IsInitializationComplete(_)) 52 EXPECT_CALL(provider_, IsInitializationComplete(_))
52 .WillRepeatedly(Return(false)); 53 .WillRepeatedly(Return(false));
53 provider_.Init(); 54 provider_.Init();
54 PolicyServiceImpl::Providers providers; 55 PolicyServiceImpl::Providers providers;
55 providers.push_back(&provider_); 56 providers.push_back(&provider_);
56 policy_service_.reset(new PolicyServiceImpl(providers)); 57 policy_service_.reset(new PolicyServiceImpl(providers));
57 store_ = new ConfigurationPolicyPrefStore(policy_service_.get(), 58 store_ = new ConfigurationPolicyPrefStore(policy_service_.get(),
59 &handler_list_,
58 POLICY_LEVEL_MANDATORY); 60 POLICY_LEVEL_MANDATORY);
59 } 61 }
60 62
61 virtual void TearDown() OVERRIDE { 63 virtual void TearDown() OVERRIDE {
62 provider_.Shutdown(); 64 provider_.Shutdown();
63 } 65 }
64 66
65 void UpdateProviderPolicy(const PolicyMap& policy) { 67 void UpdateProviderPolicy(const PolicyMap& policy) {
66 provider_.UpdateChromePolicy(policy); 68 provider_.UpdateChromePolicy(policy);
67 base::RunLoop loop; 69 base::RunLoop loop;
68 loop.RunUntilIdle(); 70 loop.RunUntilIdle();
69 } 71 }
70 72
73 ConfigurationPolicyHandlerList handler_list_;
71 MockConfigurationPolicyProvider provider_; 74 MockConfigurationPolicyProvider provider_;
72 scoped_ptr<PolicyServiceImpl> policy_service_; 75 scoped_ptr<PolicyServiceImpl> policy_service_;
73 scoped_refptr<ConfigurationPolicyPrefStore> store_; 76 scoped_refptr<ConfigurationPolicyPrefStore> store_;
74 base::MessageLoop loop_; 77 base::MessageLoop loop_;
75 }; 78 };
76 79
77 // Test cases for list-valued policy settings. 80 // Test cases for list-valued policy settings.
78 class ConfigurationPolicyPrefStoreListTest 81 class ConfigurationPolicyPrefStoreListTest
79 : public ConfigurationPolicyPrefStoreTest, 82 : public ConfigurationPolicyPrefStoreTest,
80 public testing::WithParamInterface<PolicyAndPref> {}; 83 public testing::WithParamInterface<PolicyAndPref> {};
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 POLICY_SCOPE_USER, 1239 POLICY_SCOPE_USER,
1237 base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW), 1240 base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW),
1238 NULL); 1241 NULL);
1239 UpdateProviderPolicy(policy); 1242 UpdateProviderPolicy(policy);
1240 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 1243 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
1241 &value)); 1244 &value));
1242 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value)); 1245 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
1243 } 1246 }
1244 1247
1245 } // namespace policy 1248 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698