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

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

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/prefs/pref_store_observer_mock.h" 10 #include "base/prefs/pref_store_observer_mock.h"
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 402 policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
403 base::Value::CreateStringValue("http://chromium.org/override")); 403 base::Value::CreateStringValue("http://chromium.org/override"));
404 policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 404 policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
405 base::Value::CreateStringValue("chromium.org")); 405 base::Value::CreateStringValue("chromium.org"));
406 policy.Set( 406 policy.Set(
407 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 407 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
408 base::Value::CreateIntegerValue( 408 base::Value::CreateIntegerValue(
409 ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE)); 409 ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE));
410 UpdateProviderPolicy(policy); 410 UpdateProviderPolicy(policy);
411 411
412 VerifyProxyPrefs( 412 VerifyProxyPrefs("chromium.org",
413 "chromium.org", "", "http://chromium.org/override", 413 std::string(),
414 ProxyPrefs::MODE_FIXED_SERVERS); 414 "http://chromium.org/override",
415 ProxyPrefs::MODE_FIXED_SERVERS);
415 } 416 }
416 417
417 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) { 418 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
418 PolicyMap policy; 419 PolicyMap policy;
419 policy.Set( 420 policy.Set(
420 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 421 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
421 base::Value::CreateIntegerValue( 422 base::Value::CreateIntegerValue(
422 ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE)); 423 ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE));
423 policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 424 policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
424 base::Value::CreateStringValue("http://chromium.org/override")); 425 base::Value::CreateStringValue("http://chromium.org/override"));
425 policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 426 policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
426 base::Value::CreateStringValue("chromium.org")); 427 base::Value::CreateStringValue("chromium.org"));
427 UpdateProviderPolicy(policy); 428 UpdateProviderPolicy(policy);
428 429
429 VerifyProxyPrefs( 430 VerifyProxyPrefs("chromium.org",
430 "chromium.org", "", "http://chromium.org/override", 431 std::string(),
431 ProxyPrefs::MODE_FIXED_SERVERS); 432 "http://chromium.org/override",
433 ProxyPrefs::MODE_FIXED_SERVERS);
432 } 434 }
433 435
434 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsInvalid) { 436 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsInvalid) {
435 PolicyMap policy; 437 PolicyMap policy;
436 policy.Set( 438 policy.Set(
437 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 439 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
438 base::Value::CreateIntegerValue( 440 base::Value::CreateIntegerValue(
439 ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE)); 441 ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE));
440 UpdateProviderPolicy(policy); 442 UpdateProviderPolicy(policy);
441 443
442 const base::Value* value = NULL; 444 const base::Value* value = NULL;
443 EXPECT_FALSE(store_->GetValue(prefs::kProxy, &value)); 445 EXPECT_FALSE(store_->GetValue(prefs::kProxy, &value));
444 } 446 }
445 447
446 448
447 TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyServerMode) { 449 TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyServerMode) {
448 PolicyMap policy; 450 PolicyMap policy;
449 policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 451 policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
450 base::Value::CreateIntegerValue( 452 base::Value::CreateIntegerValue(
451 ProxyPolicyHandler::PROXY_SERVER_MODE)); 453 ProxyPolicyHandler::PROXY_SERVER_MODE));
452 UpdateProviderPolicy(policy); 454 UpdateProviderPolicy(policy);
453 VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_DIRECT); 455 VerifyProxyPrefs(
456 std::string(), std::string(), std::string(), ProxyPrefs::MODE_DIRECT);
454 } 457 }
455 458
456 TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) { 459 TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
457 PolicyMap policy; 460 PolicyMap policy;
458 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 461 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
459 base::Value::CreateStringValue(ProxyPrefs::kDirectProxyModeName)); 462 base::Value::CreateStringValue(ProxyPrefs::kDirectProxyModeName));
460 UpdateProviderPolicy(policy); 463 UpdateProviderPolicy(policy);
461 VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_DIRECT); 464 VerifyProxyPrefs(
465 std::string(), std::string(), std::string(), ProxyPrefs::MODE_DIRECT);
462 } 466 }
463 467
464 TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) { 468 TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
465 PolicyMap policy; 469 PolicyMap policy;
466 policy.Set( 470 policy.Set(
467 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 471 key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
468 base::Value::CreateIntegerValue( 472 base::Value::CreateIntegerValue(
469 ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE)); 473 ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE));
470 UpdateProviderPolicy(policy); 474 UpdateProviderPolicy(policy);
471 VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_AUTO_DETECT); 475 VerifyProxyPrefs(std::string(),
476 std::string(),
477 std::string(),
478 ProxyPrefs::MODE_AUTO_DETECT);
472 } 479 }
473 480
474 TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) { 481 TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
475 PolicyMap policy; 482 PolicyMap policy;
476 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 483 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
477 base::Value::CreateStringValue( 484 base::Value::CreateStringValue(
478 ProxyPrefs::kAutoDetectProxyModeName)); 485 ProxyPrefs::kAutoDetectProxyModeName));
479 UpdateProviderPolicy(policy); 486 UpdateProviderPolicy(policy);
480 VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_AUTO_DETECT); 487 VerifyProxyPrefs(std::string(),
488 std::string(),
489 std::string(),
490 ProxyPrefs::MODE_AUTO_DETECT);
481 } 491 }
482 492
483 TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) { 493 TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
484 PolicyMap policy; 494 PolicyMap policy;
485 policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 495 policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
486 base::Value::CreateStringValue("http://short.org/proxy.pac")); 496 base::Value::CreateStringValue("http://short.org/proxy.pac"));
487 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 497 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
488 base::Value::CreateStringValue( 498 base::Value::CreateStringValue(
489 ProxyPrefs::kPacScriptProxyModeName)); 499 ProxyPrefs::kPacScriptProxyModeName));
490 UpdateProviderPolicy(policy); 500 UpdateProviderPolicy(policy);
491 VerifyProxyPrefs("", "http://short.org/proxy.pac", "", 501 VerifyProxyPrefs(std::string(),
502 "http://short.org/proxy.pac",
503 std::string(),
492 ProxyPrefs::MODE_PAC_SCRIPT); 504 ProxyPrefs::MODE_PAC_SCRIPT);
493 } 505 }
494 506
495 TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeInvalid) { 507 TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeInvalid) {
496 PolicyMap policy; 508 PolicyMap policy;
497 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 509 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
498 base::Value::CreateStringValue( 510 base::Value::CreateStringValue(
499 ProxyPrefs::kPacScriptProxyModeName)); 511 ProxyPrefs::kPacScriptProxyModeName));
500 UpdateProviderPolicy(policy); 512 UpdateProviderPolicy(policy);
501 const base::Value* value = NULL; 513 const base::Value* value = NULL;
502 EXPECT_FALSE(store_->GetValue(prefs::kProxy, &value)); 514 EXPECT_FALSE(store_->GetValue(prefs::kProxy, &value));
503 } 515 }
504 516
505 // Regression test for http://crbug.com/78016, CPanel returns empty strings 517 // Regression test for http://crbug.com/78016, CPanel returns empty strings
506 // for unset properties. 518 // for unset properties.
507 TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeBug78016) { 519 TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeBug78016) {
508 PolicyMap policy; 520 PolicyMap policy;
509 policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 521 policy.Set(key::kProxyServer,
510 base::Value::CreateStringValue("")); 522 POLICY_LEVEL_MANDATORY,
511 policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 523 POLICY_SCOPE_USER,
524 base::Value::CreateStringValue(std::string()));
525 policy.Set(key::kProxyPacUrl,
526 POLICY_LEVEL_MANDATORY,
527 POLICY_SCOPE_USER,
512 base::Value::CreateStringValue("http://short.org/proxy.pac")); 528 base::Value::CreateStringValue("http://short.org/proxy.pac"));
513 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 529 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
514 base::Value::CreateStringValue( 530 base::Value::CreateStringValue(
515 ProxyPrefs::kPacScriptProxyModeName)); 531 ProxyPrefs::kPacScriptProxyModeName));
516 UpdateProviderPolicy(policy); 532 UpdateProviderPolicy(policy);
517 VerifyProxyPrefs("", "http://short.org/proxy.pac", "", 533 VerifyProxyPrefs(std::string(),
534 "http://short.org/proxy.pac",
535 std::string(),
518 ProxyPrefs::MODE_PAC_SCRIPT); 536 ProxyPrefs::MODE_PAC_SCRIPT);
519 } 537 }
520 538
521 TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) { 539 TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) {
522 PolicyMap policy; 540 PolicyMap policy;
523 policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 541 policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
524 base::Value::CreateIntegerValue( 542 base::Value::CreateIntegerValue(
525 ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE)); 543 ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE));
526 UpdateProviderPolicy(policy); 544 UpdateProviderPolicy(policy);
527 VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_SYSTEM); 545 VerifyProxyPrefs(
546 std::string(), std::string(), std::string(), ProxyPrefs::MODE_SYSTEM);
528 } 547 }
529 548
530 TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) { 549 TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
531 PolicyMap policy; 550 PolicyMap policy;
532 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 551 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
533 base::Value::CreateStringValue(ProxyPrefs::kSystemProxyModeName)); 552 base::Value::CreateStringValue(ProxyPrefs::kSystemProxyModeName));
534 UpdateProviderPolicy(policy); 553 UpdateProviderPolicy(policy);
535 VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_SYSTEM); 554 VerifyProxyPrefs(
555 std::string(), std::string(), std::string(), ProxyPrefs::MODE_SYSTEM);
536 } 556 }
537 557
538 TEST_F(ConfigurationPolicyPrefStoreProxyTest, 558 TEST_F(ConfigurationPolicyPrefStoreProxyTest,
539 ProxyModeOverridesProxyServerMode) { 559 ProxyModeOverridesProxyServerMode) {
540 PolicyMap policy; 560 PolicyMap policy;
541 policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 561 policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
542 base::Value::CreateIntegerValue( 562 base::Value::CreateIntegerValue(
543 ProxyPolicyHandler::PROXY_SERVER_MODE)); 563 ProxyPolicyHandler::PROXY_SERVER_MODE));
544 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 564 policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
545 base::Value::CreateStringValue( 565 base::Value::CreateStringValue(
546 ProxyPrefs::kAutoDetectProxyModeName)); 566 ProxyPrefs::kAutoDetectProxyModeName));
547 UpdateProviderPolicy(policy); 567 UpdateProviderPolicy(policy);
548 VerifyProxyPrefs("", "", "", ProxyPrefs::MODE_AUTO_DETECT); 568 VerifyProxyPrefs(std::string(),
569 std::string(),
570 std::string(),
571 ProxyPrefs::MODE_AUTO_DETECT);
549 } 572 }
550 573
551 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) { 574 TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) {
552 // No mode expects all three parameters being set. 575 // No mode expects all three parameters being set.
553 PolicyMap policy; 576 PolicyMap policy;
554 policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 577 policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
555 base::Value::CreateStringValue("http://short.org/proxy.pac")); 578 base::Value::CreateStringValue("http://short.org/proxy.pac"));
556 policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 579 policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
557 base::Value::CreateStringValue("http://chromium.org/override")); 580 base::Value::CreateStringValue("http://chromium.org/override"));
558 policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 581 policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 PolicyMap policy; 784 PolicyMap policy;
762 policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, 785 policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
763 POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false)); 786 POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
764 UpdateProviderPolicy(policy); 787 UpdateProviderPolicy(policy);
765 788
766 const base::Value* value = NULL; 789 const base::Value* value = NULL;
767 EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderEnabled, &value)); 790 EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderEnabled, &value));
768 base::FundamentalValue expected_enabled(false); 791 base::FundamentalValue expected_enabled(false);
769 EXPECT_TRUE(base::Value::Equals(&expected_enabled, value)); 792 EXPECT_TRUE(base::Value::Equals(&expected_enabled, value));
770 EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, &value)); 793 EXPECT_TRUE(store_->GetValue(prefs::kDefaultSearchProviderSearchURL, &value));
771 base::StringValue expected_search_url(""); 794 base::StringValue expected_search_url((std::string()));
772 EXPECT_TRUE(base::Value::Equals(&expected_search_url, value)); 795 EXPECT_TRUE(base::Value::Equals(&expected_search_url, value));
773 } 796 }
774 797
775 // Tests Incognito mode availability preference setting. 798 // Tests Incognito mode availability preference setting.
776 class ConfigurationPolicyPrefStoreIncognitoModeTest 799 class ConfigurationPolicyPrefStoreIncognitoModeTest
777 : public ConfigurationPolicyPrefStoreTest { 800 : public ConfigurationPolicyPrefStoreTest {
778 protected: 801 protected:
779 static const int kIncognitoModeAvailabilityNotSet = -1; 802 static const int kIncognitoModeAvailabilityNotSet = -1;
780 803
781 enum ObsoleteIncognitoEnabledValue { 804 enum ObsoleteIncognitoEnabledValue {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 : public ConfigurationPolicyPrefStoreTest {}; 924 : public ConfigurationPolicyPrefStoreTest {};
902 925
903 TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, Default) { 926 TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, Default) {
904 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL)); 927 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
905 } 928 }
906 929
907 #if !defined(OS_CHROMEOS) 930 #if !defined(OS_CHROMEOS)
908 TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) { 931 TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) {
909 PolicyMap policy; 932 PolicyMap policy;
910 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL)); 933 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
911 policy.Set(key::kDownloadDirectory, POLICY_LEVEL_MANDATORY, 934 policy.Set(key::kDownloadDirectory,
912 POLICY_SCOPE_USER, base::Value::CreateStringValue("")); 935 POLICY_LEVEL_MANDATORY,
936 POLICY_SCOPE_USER,
937 base::Value::CreateStringValue(std::string()));
913 UpdateProviderPolicy(policy); 938 UpdateProviderPolicy(policy);
914 939
915 // Setting a DownloadDirectory should disable the PromptForDownload pref. 940 // Setting a DownloadDirectory should disable the PromptForDownload pref.
916 const base::Value* value = NULL; 941 const base::Value* value = NULL;
917 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, 942 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload,
918 &value)); 943 &value));
919 ASSERT_TRUE(value); 944 ASSERT_TRUE(value);
920 bool prompt_for_download = true; 945 bool prompt_for_download = true;
921 bool result = value->GetAsBoolean(&prompt_for_download); 946 bool result = value->GetAsBoolean(&prompt_for_download);
922 ASSERT_TRUE(result); 947 ASSERT_TRUE(result);
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 policy.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY, 1100 policy.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,
1076 POLICY_SCOPE_USER, 1101 POLICY_SCOPE_USER,
1077 base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW)); 1102 base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
1078 UpdateProviderPolicy(policy); 1103 UpdateProviderPolicy(policy);
1079 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, 1104 EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,
1080 &value)); 1105 &value));
1081 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value)); 1106 EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
1082 } 1107 }
1083 1108
1084 } // namespace policy 1109 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/cloud/mock_device_management_service.cc ('k') | chrome/browser/policy/policy_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698