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

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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 prefs::kEnableTranslate), 226 prefs::kEnableTranslate),
227 TypeAndName(kPolicyAllowOutdatedPlugins, 227 TypeAndName(kPolicyAllowOutdatedPlugins,
228 prefs::kPluginsAllowOutdated), 228 prefs::kPluginsAllowOutdated),
229 TypeAndName(kPolicyAlwaysAuthorizePlugins, 229 TypeAndName(kPolicyAlwaysAuthorizePlugins,
230 prefs::kPluginsAlwaysAuthorize), 230 prefs::kPluginsAlwaysAuthorize),
231 TypeAndName(kPolicyBookmarkBarEnabled, 231 TypeAndName(kPolicyBookmarkBarEnabled,
232 prefs::kEnableBookmarkBar), 232 prefs::kEnableBookmarkBar),
233 TypeAndName(kPolicyEditBookmarksEnabled, 233 TypeAndName(kPolicyEditBookmarksEnabled,
234 prefs::kEditBookmarksEnabled), 234 prefs::kEditBookmarksEnabled),
235 TypeAndName(kPolicyAllowFileSelectionDialogs, 235 TypeAndName(kPolicyAllowFileSelectionDialogs,
236 prefs::kAllowFileSelectionDialogs))); 236 prefs::kAllowFileSelectionDialogs),
237 TypeAndName(kPolicyAllowCrossOriginAuthPrompt,
238 prefs::kAllowCrossOriginAuthPrompt)));
237 239
238 #if defined(OS_CHROMEOS) 240 #if defined(OS_CHROMEOS)
239 INSTANTIATE_TEST_CASE_P( 241 INSTANTIATE_TEST_CASE_P(
240 CrosConfigurationPolicyPrefStoreBooleanTestInstance, 242 CrosConfigurationPolicyPrefStoreBooleanTestInstance,
241 ConfigurationPolicyPrefStoreBooleanTest, 243 ConfigurationPolicyPrefStoreBooleanTest,
242 testing::Values( 244 testing::Values(
243 TypeAndName(kPolicyChromeOsLockOnIdleSuspend, 245 TypeAndName(kPolicyChromeOsLockOnIdleSuspend,
244 prefs::kEnableScreenLock))); 246 prefs::kEnableScreenLock)));
245 #endif // defined(OS_CHROMEOS) 247 #endif // defined(OS_CHROMEOS)
246 248
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 863
862 provider_.SetInitializationComplete(true); 864 provider_.SetInitializationComplete(true);
863 EXPECT_FALSE(store_->IsInitializationComplete()); 865 EXPECT_FALSE(store_->IsInitializationComplete());
864 866
865 store_->OnUpdatePolicy(); 867 store_->OnUpdatePolicy();
866 Mock::VerifyAndClearExpectations(&observer_); 868 Mock::VerifyAndClearExpectations(&observer_);
867 EXPECT_TRUE(store_->IsInitializationComplete()); 869 EXPECT_TRUE(store_->IsInitializationComplete());
868 } 870 }
869 871
870 } // namespace policy 872 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/prefs/command_line_pref_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698