chrome/browser/policy/configuration_policy_provider_mac_unittest.cc - Issue 5958014: Policy: Add ProxyMode and deprecate ProxyServerMode.

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

Issue 5958014: Policy: Add ProxyMode and deprecate ProxyServerMode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: check final diff 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_unittest.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) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 <gtest/gtest.h>	5 #include <gtest/gtest.h>

6	6

7 #include "base/mac/scoped_cftyperef.h"	7 #include "base/mac/scoped_cftyperef.h"

8 #include "base/stl_util-inl.h"	8 #include "base/stl_util-inl.h"

9 #include "base/sys_string_conversions.h"	9 #include "base/sys_string_conversions.h"

10 #include "chrome/browser/policy/configuration_policy_pref_store.h"	10 #include "chrome/browser/policy/configuration_policy_pref_store.h"

(...skipping 217 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
228 key::kDefaultSearchProviderSuggestURL),	228 key::kDefaultSearchProviderSuggestURL),

229 PolicyTestParams::ForStringPolicy(	229 PolicyTestParams::ForStringPolicy(

230 kPolicyDefaultSearchProviderInstantURL,	230 kPolicyDefaultSearchProviderInstantURL,

231 key::kDefaultSearchProviderInstantURL),	231 key::kDefaultSearchProviderInstantURL),

232 PolicyTestParams::ForStringPolicy(	232 PolicyTestParams::ForStringPolicy(

233 kPolicyDefaultSearchProviderIconURL,	233 kPolicyDefaultSearchProviderIconURL,

234 key::kDefaultSearchProviderIconURL),	234 key::kDefaultSearchProviderIconURL),

235 PolicyTestParams::ForStringPolicy(	235 PolicyTestParams::ForStringPolicy(

236 kPolicyDefaultSearchProviderEncodings,	236 kPolicyDefaultSearchProviderEncodings,

237 key::kDefaultSearchProviderEncodings),	237 key::kDefaultSearchProviderEncodings),

238 PolicyTestParams::ForIntegerPolicy(	238 PolicyTestParams::ForStringPolicy(

239 kPolicyProxyMode,	239 kPolicyProxyMode,

240 key::kProxyMode),	240 key::kProxyMode),

	241 PolicyTestParams::ForIntegerPolicy(

	242 kPolicyProxyServerMode,

	243 key::kProxyServerMode),

241 PolicyTestParams::ForStringPolicy(	244 PolicyTestParams::ForStringPolicy(

242 kPolicyProxyServer,	245 kPolicyProxyServer,

243 key::kProxyServer),	246 key::kProxyServer),

244 PolicyTestParams::ForStringPolicy(	247 PolicyTestParams::ForStringPolicy(

245 kPolicyProxyPacUrl,	248 kPolicyProxyPacUrl,

246 key::kProxyPacUrl),	249 key::kProxyPacUrl),

247 PolicyTestParams::ForStringPolicy(	250 PolicyTestParams::ForStringPolicy(

248 kPolicyProxyBypassList,	251 kPolicyProxyBypassList,

249 key::kProxyBypassList),	252 key::kProxyBypassList),

250 PolicyTestParams::ForBooleanPolicy(	253 PolicyTestParams::ForBooleanPolicy(

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
287 kPolicyExtensionInstallDenyList,	290 kPolicyExtensionInstallDenyList,

288 key::kExtensionInstallDenyList),	291 key::kExtensionInstallDenyList),

289 PolicyTestParams::ForBooleanPolicy(	292 PolicyTestParams::ForBooleanPolicy(

290 kPolicyShowHomeButton,	293 kPolicyShowHomeButton,

291 key::kShowHomeButton),	294 key::kShowHomeButton),

292 PolicyTestParams::ForBooleanPolicy(	295 PolicyTestParams::ForBooleanPolicy(

293 kPolicyPrintingEnabled,	296 kPolicyPrintingEnabled,

294 key::kPrintingEnabled)));	297 key::kPrintingEnabled)));

295	298

296 } // namespace policy	299 } // namespace policy

OLD	NEW