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

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

Issue 6992081: Make --allow-cross-domain-auth-prompt equivalent to a preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "chrome/browser/policy/configuration_policy_pref_store.h" 7 #include "chrome/browser/policy/configuration_policy_pref_store.h"
8 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 8 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
9 #include "chrome/browser/prefs/proxy_config_dictionary.h" 9 #include "chrome/browser/prefs/proxy_config_dictionary.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 prefs::kEnableTranslate), 218 prefs::kEnableTranslate),
219 TypeAndName(kPolicyAllowOutdatedPlugins, 219 TypeAndName(kPolicyAllowOutdatedPlugins,
220 prefs::kPluginsAllowOutdated), 220 prefs::kPluginsAllowOutdated),
221 TypeAndName(kPolicyAlwaysAuthorizePlugins, 221 TypeAndName(kPolicyAlwaysAuthorizePlugins,
222 prefs::kPluginsAlwaysAuthorize), 222 prefs::kPluginsAlwaysAuthorize),
223 TypeAndName(kPolicyBookmarkBarEnabled, 223 TypeAndName(kPolicyBookmarkBarEnabled,
224 prefs::kEnableBookmarkBar), 224 prefs::kEnableBookmarkBar),
225 TypeAndName(kPolicyEditBookmarksEnabled, 225 TypeAndName(kPolicyEditBookmarksEnabled,
226 prefs::kEditBookmarksEnabled), 226 prefs::kEditBookmarksEnabled),
227 TypeAndName(kPolicyAllowFileSelectionDialogs, 227 TypeAndName(kPolicyAllowFileSelectionDialogs,
228 prefs::kAllowFileSelectionDialogs))); 228 prefs::kAllowFileSelectionDialogs),
229 TypeAndName(kPolicyAllowCrossOriginAuthPrompt,
230 prefs::kAllowCrossOriginAuthPrompt)));
229 231
230 #if defined(OS_CHROMEOS) 232 #if defined(OS_CHROMEOS)
231 INSTANTIATE_TEST_CASE_P( 233 INSTANTIATE_TEST_CASE_P(
232 CrosConfigurationPolicyPrefStoreBooleanTestInstance, 234 CrosConfigurationPolicyPrefStoreBooleanTestInstance,
233 ConfigurationPolicyPrefStoreBooleanTest, 235 ConfigurationPolicyPrefStoreBooleanTest,
234 testing::Values( 236 testing::Values(
235 TypeAndName(kPolicyChromeOsLockOnIdleSuspend, 237 TypeAndName(kPolicyChromeOsLockOnIdleSuspend,
236 prefs::kEnableScreenLock))); 238 prefs::kEnableScreenLock)));
237 #endif // defined(OS_CHROMEOS) 239 #endif // defined(OS_CHROMEOS)
238 240
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 850
849 provider_.SetInitializationComplete(true); 851 provider_.SetInitializationComplete(true);
850 EXPECT_FALSE(store_->IsInitializationComplete()); 852 EXPECT_FALSE(store_->IsInitializationComplete());
851 853
852 store_->OnUpdatePolicy(); 854 store_->OnUpdatePolicy();
853 Mock::VerifyAndClearExpectations(&observer_); 855 Mock::VerifyAndClearExpectations(&observer_);
854 EXPECT_TRUE(store_->IsInitializationComplete()); 856 EXPECT_TRUE(store_->IsInitializationComplete());
855 } 857 }
856 858
857 } // namespace policy 859 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698