chrome/browser/policy/configuration_policy_pref_store_unittest.cc - Issue 6399001: Revert 72624 (due to crashes) - Implement pref policy for disabling incognito...

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

Issue 6399001: Revert 72624 (due to crashes) - Implement pref policy for disabling incognito... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 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

« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/policy/configuration_policy_provider_win_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/ref_counted.h"	6 #include "base/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_prefs.h"	9 #include "chrome/browser/prefs/proxy_prefs.h"

10 #include "chrome/common/notification_service.h"	10 #include "chrome/common/notification_service.h"

(...skipping 158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 TypeAndName(kPolicyPasswordManagerEnabled,	169 TypeAndName(kPolicyPasswordManagerEnabled,

170 prefs::kPasswordManagerEnabled),	170 prefs::kPasswordManagerEnabled),

171 TypeAndName(kPolicyPasswordManagerAllowShowPasswords,	171 TypeAndName(kPolicyPasswordManagerAllowShowPasswords,

172 prefs::kPasswordManagerAllowShowPasswords),	172 prefs::kPasswordManagerAllowShowPasswords),

173 TypeAndName(kPolicyShowHomeButton,	173 TypeAndName(kPolicyShowHomeButton,

174 prefs::kShowHomeButton),	174 prefs::kShowHomeButton),

175 TypeAndName(kPolicyPrintingEnabled,	175 TypeAndName(kPolicyPrintingEnabled,

176 prefs::kPrintingEnabled),	176 prefs::kPrintingEnabled),

177 TypeAndName(kPolicyJavascriptEnabled,	177 TypeAndName(kPolicyJavascriptEnabled,

178 prefs::kWebKitJavascriptEnabled),	178 prefs::kWebKitJavascriptEnabled),

179 TypeAndName(kPolicyIncognitoEnabled,

180 prefs::kIncognitoEnabled),

181 TypeAndName(kPolicySavingBrowserHistoryDisabled,	179 TypeAndName(kPolicySavingBrowserHistoryDisabled,

182 prefs::kSavingBrowserHistoryDisabled),	180 prefs::kSavingBrowserHistoryDisabled),

183 TypeAndName(kPolicySavingBrowserHistoryDisabled,	181 TypeAndName(kPolicySavingBrowserHistoryDisabled,

184 prefs::kSavingBrowserHistoryDisabled),	182 prefs::kSavingBrowserHistoryDisabled),

185 TypeAndName(kPolicyDisableAuthNegotiateCnameLookup,	183 TypeAndName(kPolicyDisableAuthNegotiateCnameLookup,

186 prefs::kDisableAuthNegotiateCnameLookup),	184 prefs::kDisableAuthNegotiateCnameLookup),

187 TypeAndName(kPolicyEnableAuthNegotiatePort,	185 TypeAndName(kPolicyEnableAuthNegotiatePort,

188 prefs::kEnableAuthNegotiatePort),	186 prefs::kEnableAuthNegotiatePort),

189 TypeAndName(kPolicyDisable3DAPIs,	187 TypeAndName(kPolicyDisable3DAPIs,

190 prefs::kDisable3DAPIs)));	188 prefs::kDisable3DAPIs)));

(...skipping 508 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
699	697

700 provider_.SetInitializationComplete(true);	698 provider_.SetInitializationComplete(true);

701 EXPECT_FALSE(store_->IsInitializationComplete());	699 EXPECT_FALSE(store_->IsInitializationComplete());

702	700

703 store_->OnUpdatePolicy();	701 store_->OnUpdatePolicy();

704 Mock::VerifyAndClearExpectations(&observer_);	702 Mock::VerifyAndClearExpectations(&observer_);

705 EXPECT_TRUE(store_->IsInitializationComplete());	703 EXPECT_TRUE(store_->IsInitializationComplete());

706 }	704 }

707	705

708 } // namespace policy	706 } // namespace policy

OLD	NEW