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

Side by Side Diff: chrome/browser/policy/configuration_policy_provider_win_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_provider_mac_unittest.cc ('k') | chrome/browser/policy/configuration_policy_store_interface.h » ('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 #include <windows.h>	6 #include <windows.h>

7	7

8 #include "base/message_loop.h"	8 #include "base/message_loop.h"

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

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

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

387 PolicyTestParams::ForStringPolicy(	387 PolicyTestParams::ForStringPolicy(

388 kPolicyDefaultSearchProviderInstantURL,	388 kPolicyDefaultSearchProviderInstantURL,

389 key::kDefaultSearchProviderInstantURL),	389 key::kDefaultSearchProviderInstantURL),

390 PolicyTestParams::ForStringPolicy(	390 PolicyTestParams::ForStringPolicy(

391 kPolicyDefaultSearchProviderIconURL,	391 kPolicyDefaultSearchProviderIconURL,

392 key::kDefaultSearchProviderIconURL),	392 key::kDefaultSearchProviderIconURL),

393 PolicyTestParams::ForStringPolicy(	393 PolicyTestParams::ForStringPolicy(

394 kPolicyDefaultSearchProviderEncodings,	394 kPolicyDefaultSearchProviderEncodings,

395 key::kDefaultSearchProviderEncodings),	395 key::kDefaultSearchProviderEncodings),

396 PolicyTestParams::ForIntegerPolicy(	396 PolicyTestParams::ForStringPolicy(

397 kPolicyProxyMode,	397 kPolicyProxyMode,

398 key::kProxyMode),	398 key::kProxyMode),

	399 PolicyTestParams::ForIntegerPolicy(

	400 kPolicyProxyServerMode,

	401 key::kProxyServerMode),

399 PolicyTestParams::ForStringPolicy(	402 PolicyTestParams::ForStringPolicy(

400 kPolicyProxyServer,	403 kPolicyProxyServer,

401 key::kProxyServer),	404 key::kProxyServer),

402 PolicyTestParams::ForStringPolicy(	405 PolicyTestParams::ForStringPolicy(

403 kPolicyProxyPacUrl,	406 kPolicyProxyPacUrl,

404 key::kProxyPacUrl),	407 key::kProxyPacUrl),

405 PolicyTestParams::ForStringPolicy(	408 PolicyTestParams::ForStringPolicy(

406 kPolicyProxyBypassList,	409 kPolicyProxyBypassList,

407 key::kProxyBypassList),	410 key::kProxyBypassList),

408 PolicyTestParams::ForBooleanPolicy(	411 PolicyTestParams::ForBooleanPolicy(

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
442 kPolicyExtensionInstallDenyList,	445 kPolicyExtensionInstallDenyList,

443 key::kExtensionInstallDenyList),	446 key::kExtensionInstallDenyList),

444 PolicyTestParams::ForBooleanPolicy(	447 PolicyTestParams::ForBooleanPolicy(

445 kPolicyShowHomeButton,	448 kPolicyShowHomeButton,

446 key::kShowHomeButton),	449 key::kShowHomeButton),

447 PolicyTestParams::ForBooleanPolicy(	450 PolicyTestParams::ForBooleanPolicy(

448 kPolicyPrintingEnabled,	451 kPolicyPrintingEnabled,

449 key::kPrintingEnabled)));	452 key::kPrintingEnabled)));

450	453

451 } // namespace policy	454 } // namespace policy

OLD	NEW