diff options
93 files changed, 207 insertions, 977 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 4fd126c..a7dac60 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -866,7 +866,6 @@ IDS_POLICY_FILTER_PLACEHOLDER IDS_POLICY_HEADER_LEVEL IDS_POLICY_HEADER_NAME IDS_POLICY_HEADER_SCOPE -IDS_POLICY_HEADER_SOURCE IDS_POLICY_HEADER_STATUS IDS_POLICY_HEADER_VALUE IDS_POLICY_HIDE_EXPANDED_VALUE @@ -906,10 +905,6 @@ IDS_POLICY_SCOPE_DEVICE IDS_POLICY_SCOPE_USER IDS_POLICY_SHOW_EXPANDED_VALUE IDS_POLICY_SHOW_UNSET -IDS_POLICY_SOURCE_CLOUD -IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT -IDS_POLICY_SOURCE_ENTERPRISE_OVERRIDE -IDS_POLICY_SOURCE_PLATFORM IDS_POLICY_STATUS IDS_POLICY_STATUS_DEVICE IDS_POLICY_STATUS_USER diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc index ac94f31..3d1121c 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc @@ -184,7 +184,6 @@ void DeviceLocalAccountExternalPolicyLoaderTest::SetForceInstallListPolicy() { store_.policy_map_.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, forcelist.release(), NULL); store_.NotifyStoreLoaded(); diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc index 8a0cd4a..4d63f2d 100644 --- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc +++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc @@ -987,7 +987,6 @@ void SAMLPolicyTest::SetSAMLOfflineSigninTimeLimitPolicy(int limit) { user_policy.Set(policy::key::kSAMLOfflineSigninTimeLimit, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(limit), NULL); provider_.UpdateChromePolicy(user_policy); diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc index 5672fa8..e1c7674 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc @@ -45,7 +45,7 @@ void SetExternalDataReference(CloudPolicyCore* core, ASSERT_TRUE(store); PolicyMap policy_map; policy_map.Set(policy, - POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, metadata.release(), new ExternalDataFetcher(store->external_data_manager(), policy)); diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc index af3c4ea..3511440 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc @@ -156,7 +156,6 @@ void CloudExternalDataManagerBaseTest::SetUp() { cloud_policy_store_.policy_map_.Set(kStringPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(std::string()), NULL); // Make |k10BytePolicy| reference 10 bytes of external data. @@ -213,7 +212,6 @@ void CloudExternalDataManagerBaseTest::SetExternalDataReference( policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, metadata.release(), new ExternalDataFetcher( external_data_manager_->weak_factory_.GetWeakPtr(), policy)); diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc index 95982a3..aa26956 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc @@ -354,7 +354,6 @@ void CloudExternalDataPolicyObserverTest::SetRegularUserAvatarPolicy( key::kUserAvatarImage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(value), external_data_manager_.CreateExternalDataFetcher( key::kUserAvatarImage).release()); diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc index e2a8052..7c30443 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc @@ -266,7 +266,7 @@ void NetworkConfigurationPolicyHandler::PrepareForDisplaying( sanitized_config = base::Value::CreateNullValue().release(); policies->Set(policy_name(), entry->level, entry->scope, - entry->source, sanitized_config, nullptr); + sanitized_config, NULL); } NetworkConfigurationPolicyHandler::NetworkConfigurationPolicyHandler( diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc index a5691b8..b654188 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc @@ -14,7 +14,6 @@ #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -62,7 +61,6 @@ TEST_F(ScreenMagnifierPolicyHandlerTest, Disabled) { policy_.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); handler_.ApplyPolicySettings(policy_, &prefs_); @@ -83,7 +81,6 @@ TEST_F(ScreenMagnifierPolicyHandlerTest, Enabled) { policy_.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1), NULL); handler_.ApplyPolicySettings(policy_, &prefs_); @@ -112,7 +109,6 @@ TEST(ExternalDataPolicyHandlerTest, WrongType) { policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); PolicyErrorMap errors; @@ -128,7 +124,6 @@ TEST(ExternalDataPolicyHandlerTest, MissingURL) { policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, dict.release(), NULL); PolicyErrorMap errors; @@ -145,7 +140,6 @@ TEST(ExternalDataPolicyHandlerTest, InvalidURL) { policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, dict.release(), NULL); PolicyErrorMap errors; @@ -161,7 +155,6 @@ TEST(ExternalDataPolicyHandlerTest, MissingHash) { policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, dict.release(), NULL); PolicyErrorMap errors; @@ -178,7 +171,6 @@ TEST(ExternalDataPolicyHandlerTest, InvalidHash) { policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, dict.release(), NULL); PolicyErrorMap errors; @@ -197,7 +189,6 @@ TEST(ExternalDataPolicyHandlerTest, Valid) { policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, dict.release(), NULL); PolicyErrorMap errors; @@ -258,7 +249,6 @@ TEST(NetworkConfigurationPolicyHandlerTest, ValidONC) { policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kTestONC), NULL); scoped_ptr<NetworkConfigurationPolicyHandler> handler( @@ -273,7 +263,6 @@ TEST(NetworkConfigurationPolicyHandlerTest, WrongType) { policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); scoped_ptr<NetworkConfigurationPolicyHandler> handler( @@ -289,7 +278,6 @@ TEST(NetworkConfigurationPolicyHandlerTest, JSONParseError) { policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kTestONC), NULL); scoped_ptr<NetworkConfigurationPolicyHandler> handler( @@ -318,7 +306,6 @@ TEST(NetworkConfigurationPolicyHandlerTest, Sanitization) { policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kTestONC), NULL); scoped_ptr<NetworkConfigurationPolicyHandler> handler( @@ -343,8 +330,7 @@ TEST(PinnedLauncherAppsPolicyHandler, PrefTranslation) { PinnedLauncherAppsPolicyHandler handler; policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, list.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); EXPECT_TRUE(prefs.GetValue(prefs::kPinnedLauncherApps, &value)); EXPECT_TRUE(base::Value::Equals(&expected_pinned_apps, value)); @@ -355,8 +341,7 @@ TEST(PinnedLauncherAppsPolicyHandler, PrefTranslation) { expected_pinned_apps.Append(entry1_dict); list.Append(entry1.DeepCopy()); policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, list.DeepCopy(), NULL); prefs.Clear(); handler.ApplyPolicySettings(policy_map, &prefs); EXPECT_TRUE(prefs.GetValue(prefs::kPinnedLauncherApps, &value)); @@ -376,7 +361,6 @@ TEST_F(LoginScreenPowerManagementPolicyHandlerTest, ValidPolicy) { policy_map.Set( key::kDeviceLoginScreenPowerManagement, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, base::JSONReader::Read(kLoginScreenPowerManagementPolicy).release(), NULL); LoginScreenPowerManagementPolicyHandler handler(chrome_schema_); @@ -390,7 +374,6 @@ TEST_F(LoginScreenPowerManagementPolicyHandlerTest, WrongType) { policy_map.Set(key::kDeviceLoginScreenPowerManagement, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); LoginScreenPowerManagementPolicyHandler handler(chrome_schema_); diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc index 7bc9ec7..7072f2d 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc @@ -43,7 +43,6 @@ #include "components/policy/core/common/cloud/cloud_policy_core.h" #include "components/policy/core/common/cloud/mock_device_management_service.h" #include "components/policy/core/common/external_data_fetcher.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema_registry.h" #include "google_apis/gaia/gaia_oauth_client.h" #include "net/url_request/test_url_fetcher_factory.h" @@ -185,7 +184,6 @@ class DeviceCloudPolicyManagerChromeOSTest .Set(key::kDeviceMetricsReportingEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); EXPECT_TRUE(manager_->policies().Equals(bundle)); diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc index 8d92fae..ca40ec6 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc +++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc @@ -15,7 +15,6 @@ #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" namespace policy { @@ -60,7 +59,6 @@ DeviceLocalAccountPolicyProvider::Create( key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue( chromeos::PowerPolicyController::ACTION_STOP_SESSION), NULL); @@ -70,7 +68,6 @@ DeviceLocalAccountPolicyProvider::Create( key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::StringValue("Never"), NULL); // Force the |ShowLogoutButtonInTray| policy to |true|, ensuring that a big, @@ -79,7 +76,6 @@ DeviceLocalAccountPolicyProvider::Create( key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue(true), NULL); // Force the |FullscreenAllowed| policy to |false|, ensuring that the ash @@ -88,7 +84,6 @@ DeviceLocalAccountPolicyProvider::Create( key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue(false), NULL); } @@ -175,12 +170,8 @@ void DeviceLocalAccountPolicyProvider::UpdateFromBroker() { it != chrome_policy_overrides_->end(); ++it) { const PolicyMap::Entry& entry = it->second; - chrome_policy.Set(it->first, - entry.level, - entry.scope, - entry.source, - entry.value->DeepCopy(), - nullptr); + chrome_policy.Set( + it->first, entry.level, entry.scope, entry.value->DeepCopy(), NULL); } } diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc index ae89764..53649bf 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc @@ -38,7 +38,6 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema_registry.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_test_util.h" @@ -144,7 +143,6 @@ void DeviceLocalAccountPolicyServiceTestBase::SetUp() { expected_policy_map_.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); @@ -808,7 +806,6 @@ void DeviceLocalAccountPolicyProviderTest::SetUp() { expected_policy_map_.Set(key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue( chromeos::PowerPolicyController:: ACTION_STOP_SESSION), @@ -816,19 +813,16 @@ void DeviceLocalAccountPolicyProviderTest::SetUp() { expected_policy_map_.Set(key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::StringValue("Never"), NULL); expected_policy_map_.Set(key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue(true), NULL); expected_policy_map_.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue(false), NULL); } @@ -895,7 +889,6 @@ TEST_F(DeviceLocalAccountPolicyProviderTest, Policy) { .Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc index 3b15701..98216eb 100644 --- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc +++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc @@ -20,7 +20,6 @@ #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "policy/policy_constants.h" #include "third_party/cros_system_api/dbus/service_constants.h" @@ -116,7 +115,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceGuestModeEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.guest_mode_enabled()), NULL); @@ -128,7 +126,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, if (container.has_reboot_on_shutdown()) { policies->Set(key::kDeviceRebootOnShutdown, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(container.reboot_on_shutdown()), NULL); } @@ -140,7 +137,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceShowUserNamesOnSignin, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.show_user_names()), NULL); @@ -153,7 +149,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceAllowNewUsers, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.allow_new_users()), NULL); @@ -172,7 +167,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceUserWhitelist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, whitelist, NULL); } @@ -184,7 +178,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceEphemeralUsersEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.ephemeral_users_enabled()), NULL); @@ -233,14 +226,12 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceLocalAccounts, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, account_list.release(), NULL); if (container.has_auto_login_id()) { policies->Set(key::kDeviceLocalAccountAutoLoginId, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue(container.auto_login_id()), NULL); } @@ -248,7 +239,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceLocalAccountAutoLoginDelay, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, DecodeIntegerValue(container.auto_login_delay()).release(), NULL); } @@ -256,7 +246,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceLocalAccountAutoLoginBailoutEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.enable_auto_login_bailout()), NULL); @@ -265,7 +254,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceLocalAccountPromptForNetworkWhenOffline, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.prompt_for_network_when_offline()), NULL); @@ -281,7 +269,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kSupervisedUsersEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, value, NULL); } @@ -293,7 +280,6 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceTransferSAMLCookies, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.transfer_saml_cookies()), NULL); @@ -309,7 +295,6 @@ void DecodeNetworkPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceDataRoamingEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.data_roaming_enabled()), NULL); @@ -323,7 +308,6 @@ void DecodeNetworkPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue(config), NULL); } @@ -337,7 +321,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceVersionInfo, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.report_version_info()), NULL); @@ -346,7 +329,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceActivityTimes, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.report_activity_times()), NULL); @@ -355,7 +337,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceBootMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.report_boot_mode()), NULL); @@ -364,7 +345,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.report_location()), NULL); @@ -373,7 +353,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceNetworkInterfaces, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.report_network_interfaces()), NULL); @@ -382,7 +361,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceUsers, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(container.report_users()), NULL); } @@ -390,7 +368,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceHardwareStatus, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.report_hardware_status()), NULL); @@ -399,7 +376,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportDeviceSessionStatus, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.report_session_status()), NULL); @@ -408,7 +384,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kReportUploadFrequency, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, DecodeIntegerValue( container.device_status_frequency()).release(), NULL); @@ -422,7 +397,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kHeartbeatEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.heartbeat_enabled()), NULL); @@ -431,7 +405,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kHeartbeatFrequency, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, DecodeIntegerValue( container.heartbeat_frequency()).release(), NULL); @@ -444,7 +417,6 @@ void DecodeReportingPolicies(const em::ChromeDeviceSettingsProto& policy, if (container.has_system_log_upload_enabled()) { policies->Set( key::kLogUploadEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(container.system_log_upload_enabled()), NULL); } @@ -460,7 +432,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kChromeOsReleaseChannel, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue(channel), NULL); // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't @@ -473,7 +444,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kChromeOsReleaseChannelDelegated, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.release_channel_delegated()), NULL); @@ -486,7 +456,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceAutoUpdateDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.update_disabled()), NULL); @@ -496,7 +465,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceTargetVersionPrefix, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue( container.target_version_prefix()), NULL); @@ -509,7 +477,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceUpdateScatterFactor, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(static_cast<int>( container.scatter_factor_in_seconds())), NULL); @@ -528,7 +495,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceUpdateAllowedConnectionTypes, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, allowed_connection_types, NULL); } @@ -538,7 +504,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, key::kDeviceUpdateHttpDownloadsEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(container.http_downloads_enabled()), NULL); } @@ -547,7 +512,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kRebootAfterUpdate, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.reboot_after_update()), NULL); @@ -557,7 +521,6 @@ void DecodeAutoUpdatePolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceAutoUpdateP2PEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(container.p2p_enabled()), NULL); } @@ -575,7 +538,6 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy, key::kDeviceLoginScreenDefaultLargeCursorEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.login_screen_default_large_cursor_enabled()), NULL); @@ -586,7 +548,6 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy, key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.login_screen_default_spoken_feedback_enabled()), NULL); @@ -597,7 +558,6 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy, key::kDeviceLoginScreenDefaultHighContrastEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.login_screen_default_high_contrast_enabled()), NULL); @@ -608,7 +568,6 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy, key::kDeviceLoginScreenDefaultScreenMagnifierType, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, DecodeIntegerValue( container.login_screen_default_screen_magnifier_type()).release(), NULL); @@ -619,7 +578,6 @@ void DecodeAccessibilityPolicies(const em::ChromeDeviceSettingsProto& policy, key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.login_screen_default_virtual_keyboard_enabled()), NULL); @@ -637,7 +595,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, key::kDevicePolicyRefreshRate, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, DecodeIntegerValue(container.device_policy_refresh_rate()).release(), NULL); } @@ -649,7 +606,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceMetricsReportingEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.metrics_enabled()), NULL); @@ -661,7 +617,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kSystemTimezone, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue( policy.system_timezone().timezone()), NULL); @@ -673,7 +628,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kSystemUse24HourClock, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( policy.use_24hour_clock().use_24hour_clock()), NULL); @@ -687,7 +641,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceAllowRedeemChromeOsRegistrationOffers, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( container.allow_redeem_offers()), NULL); @@ -700,7 +653,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kUptimeLimit, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, DecodeIntegerValue(container.uptime_limit()).release(), NULL); } @@ -718,7 +670,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceStartUpFlags, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, flags, NULL); } @@ -728,7 +679,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceVariationsRestrictParameter, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue( policy.variations_parameter().parameter()), NULL); @@ -740,7 +690,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kAttestationEnabledForDevice, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( policy.attestation_settings().attestation_enabled()), NULL); @@ -750,7 +699,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, key::kAttestationForContentProtectionEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( policy.attestation_settings().content_protection_enabled()), NULL); @@ -769,7 +717,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policies->Set(key::kDeviceLoginScreenPowerManagement, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, decoded_json.release(), NULL); } @@ -783,7 +730,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, key::kDeviceBlockDevmode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(container.block_devmode()), NULL); } @@ -794,7 +740,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, if (container.has_extension_cache_size()) { policies->Set( key::kExtensionCacheSize, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, + POLICY_SCOPE_MACHINE, DecodeIntegerValue(container.extension_cache_size()).release(), nullptr); } @@ -805,7 +751,7 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy, policy.login_screen_domain_auto_complete()); policies->Set( key::kDeviceLoginScreenDomainAutoComplete, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, + POLICY_SCOPE_MACHINE, new base::StringValue(container.login_screen_domain_auto_complete()), nullptr); } diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc index 30135be..f0fe77f 100644 --- a/chrome/browser/chromeos/policy/login_profile_policy_provider.cc +++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.cc @@ -64,7 +64,6 @@ void ApplyDevicePolicyAsRecommendedPolicy(const std::string& device_policy, user_policy_map->Set(user_policy, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, value->DeepCopy(), NULL); } @@ -79,7 +78,6 @@ void ApplyValueAsMandatoryPolicy(const base::Value* value, user_policy_map->Set(user_policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, value->DeepCopy(), NULL); } diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc index 8f75d38..9b770a0 100644 --- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc +++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc @@ -24,7 +24,6 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_service_impl.h" -#include "components/policy/core/common/policy_types.h" #include "components/user_manager/user.h" #include "components/user_manager/user_type.h" #include "content/public/test/test_browser_thread_bundle.h" @@ -345,7 +344,6 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) { policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(onc_policy), NULL); UpdateProviderPolicy(policy); @@ -469,7 +467,6 @@ TEST_F(NetworkConfigurationUpdaterTest, policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), NULL); UpdateProviderPolicy(policy); @@ -491,8 +488,7 @@ TEST_F(NetworkConfigurationUpdaterTest, DontImportCertificateBeforeCertificateImporterSet) { PolicyMap policy; policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - new base::StringValue(kFakeONC), nullptr); + POLICY_SCOPE_USER, new base::StringValue(kFakeONC), NULL); UpdateProviderPolicy(policy); EXPECT_CALL(network_config_handler_, @@ -558,7 +554,7 @@ class NetworkConfigurationUpdaterTestWithParam TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) { PolicyMap policy; policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); + new base::StringValue(kFakeONC), NULL); UpdateProviderPolicy(policy); EXPECT_CALL(network_config_handler_, @@ -579,7 +575,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyNotSetBeforePolicyProviderInitialized) { PolicyMap policy; policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); + new base::StringValue(kFakeONC), NULL); UpdateProviderPolicy(policy); CreateNetworkConfigurationUpdater(); @@ -606,7 +602,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyMap policy; policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); + new base::StringValue(kFakeONC), NULL); UpdateProviderPolicy(policy); EXPECT_CALL(network_config_handler_, @@ -645,7 +641,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) { PolicyMap policy; policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); + new base::StringValue(kFakeONC), NULL); UpdateProviderPolicy(policy); Mock::VerifyAndClearExpectations(&network_config_handler_); EXPECT_EQ(ExpectedImportCertificatesCallCount(), diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc index e257de7..8acc4ab 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc @@ -32,7 +32,6 @@ #include "components/policy/core/common/cloud/mock_device_management_service.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema_registry.h" #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" @@ -112,22 +111,19 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test { // Set up a policy map for testing. policy_map_.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://chromium.org"), NULL); policy_map_.Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::StringValue("primary-only"), NULL); policy_map_.Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); policy_map_.Set(key::kCaptivePortalAuthenticationIgnoresProxy, - POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, + POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, new base::FundamentalValue(false), NULL); expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc index 7bd03e3..bca077a0 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc @@ -18,7 +18,6 @@ #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/mock_cloud_policy_store.h" #include "components/policy/core/common/cloud/policy_builder.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "policy/proto/cloud_policy.pb.h" #include "policy/proto/device_management_local.pb.h" @@ -157,7 +156,6 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test { previous_policy.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(previous_value), NULL); } EXPECT_TRUE(previous_policy.Equals(store_->policy_map())); diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc index 2badeda..f09b6b9 100644 --- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc @@ -104,7 +104,6 @@ class TrayAccessibilityTest policy_map.Set(policy::key::kShowAccessibilityOptionsInSystemTrayMenu, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(value), NULL); provider_.UpdateChromePolicy(policy_map); diff --git a/chrome/browser/download/download_dir_policy_handler_unittest.cc b/chrome/browser/download/download_dir_policy_handler_unittest.cc index d713ba7..c0ad586 100644 --- a/chrome/browser/download/download_dir_policy_handler_unittest.cc +++ b/chrome/browser/download/download_dir_policy_handler_unittest.cc @@ -72,7 +72,6 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadDirectory) { policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(std::string()), NULL); UpdateProviderPolicy(policy); @@ -96,7 +95,6 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) { policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(kDriveNamePolicyVariableName), NULL); UpdateProviderPolicy(policy); @@ -123,7 +121,6 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) { policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(kUserIDHash), NULL); UpdateProviderPolicy(policy); @@ -132,7 +129,6 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) { policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(std::string(kDriveNamePolicyVariableName) + kRelativeToDriveRoot), NULL); @@ -151,7 +147,6 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) { policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(kUserIDHash), NULL); UpdateProviderPolicy(policy); diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc index 9d46c11..1b43634 100644 --- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc +++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc @@ -145,8 +145,7 @@ class CertificateProviderApiTest : public ExtensionApiTest { policy::PolicyMap policy; policy.Set(policy::key::kAutoSelectCertificateForUrls, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, autoselect_policy.release(), - nullptr); + autoselect_policy.release(), nullptr); provider_.UpdateChromePolicy(policy); content::RunAllPendingInMessageLoop(); diff --git a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc index 0896dfa..bd9a8d1 100644 --- a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc +++ b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc @@ -11,7 +11,6 @@ #include "chromeos/dbus/fake_session_manager_client.h" #include "chromeos/login/user_names.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/policy/core/common/policy_types.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" #include "extensions/browser/api_test_utils.h" @@ -105,7 +104,7 @@ class EnterpriseDeviceAttributesTest : public ExtensionApiTest { policy::PolicyMap policy; policy.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_MACHINE, - policy::POLICY_SOURCE_CLOUD, forcelist.release(), nullptr); + forcelist.release(), NULL); // Set the policy and wait until the extension is installed. extensions::TestExtensionRegistryObserver observer( diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc index efad440..ff92450 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc @@ -15,7 +15,6 @@ #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "content/public/browser/notification_service.h" #include "content/public/common/content_switches.h" #include "content/public/test/test_utils.h" @@ -304,7 +303,6 @@ class EnterprisePlatformKeysTest policy.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_MACHINE, - policy::POLICY_SOURCE_CLOUD, forcelist.release(), NULL); diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index b2b35ef..4670854 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -19,7 +19,6 @@ #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" @@ -563,7 +562,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) { policies.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, forcelist.DeepCopy(), NULL); UpdateProviderPolicy(policies); @@ -653,7 +651,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, policies.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, forcelist.DeepCopy(), NULL); UpdateProviderPolicy(policies); @@ -695,7 +692,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, policies.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, forcelist.DeepCopy(), NULL); UpdateProviderPolicy(policies); diff --git a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler_unittest.cc b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler_unittest.cc index f164c01..3e2902a 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler_unittest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/policy_handlers.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -25,7 +24,6 @@ TEST(NativeMessagingHostListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kNativeMessagingBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); { @@ -38,7 +36,6 @@ TEST(NativeMessagingHostListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kNativeMessagingBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); { @@ -51,7 +48,6 @@ TEST(NativeMessagingHostListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kNativeMessagingBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); { @@ -64,7 +60,6 @@ TEST(NativeMessagingHostListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kNativeMessagingBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); { @@ -91,7 +86,6 @@ TEST(NativeMessagingHostListPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kNativeMessagingBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -104,7 +98,6 @@ TEST(NativeMessagingHostListPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kNativeMessagingBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -115,7 +108,6 @@ TEST(NativeMessagingHostListPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kNativeMessagingBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc index f17f57a..e4710f2 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc @@ -586,7 +586,6 @@ IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, GetManagedProperties) { policy::PolicyMap policy; policy.Set(policy::key::kOpenNetworkConfiguration, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(user_policy_blob), nullptr); provider_.UpdateChromePolicy(policy); diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc index 55bf7f2..d2ff1a8 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc +++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc @@ -12,7 +12,6 @@ #include "base/message_loop/message_loop.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "content/public/test/test_browser_thread.h" #include "extensions/browser/api/storage/settings_observer.h" #include "extensions/browser/value_store/leveldb_value_store.h" @@ -121,10 +120,9 @@ TEST_F(PolicyValueStoreTest, DontProvideRecommendedPolicies) { policy::PolicyMap policies; base::FundamentalValue expected(123); policies.Set("must", policy::POLICY_LEVEL_MANDATORY, - policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, - expected.DeepCopy(), nullptr); + policy::POLICY_SCOPE_USER, expected.DeepCopy(), NULL); policies.Set("may", policy::POLICY_LEVEL_RECOMMENDED, - policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, + policy::POLICY_SCOPE_USER, new base::FundamentalValue(456), NULL); store_->SetCurrentPolicy(policies); ValueStore::ReadResult result = store_->Get(); @@ -167,7 +165,7 @@ TEST_F(PolicyValueStoreTest, NotifyOnChanges) { policy::PolicyMap policies; policies.Set("aaa", policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, value.DeepCopy(), nullptr); + value.DeepCopy(), NULL); store_->SetCurrentPolicy(policies); loop_.RunUntilIdle(); Mock::VerifyAndClearExpectations(&observer_); @@ -183,7 +181,7 @@ TEST_F(PolicyValueStoreTest, NotifyOnChanges) { } policies.Set("bbb", policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, value.DeepCopy(), nullptr); + value.DeepCopy(), NULL); store_->SetCurrentPolicy(policies); loop_.RunUntilIdle(); Mock::VerifyAndClearExpectations(&observer_); @@ -201,7 +199,7 @@ TEST_F(PolicyValueStoreTest, NotifyOnChanges) { } policies.Set("bbb", policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new_value.DeepCopy(), nullptr); + new_value.DeepCopy(), NULL); store_->SetCurrentPolicy(policies); loop_.RunUntilIdle(); Mock::VerifyAndClearExpectations(&observer_); diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc index 9ac951e..50f0383 100644 --- a/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc @@ -35,7 +35,6 @@ #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "components/policy/core/common/schema_map.h" #include "components/policy/core/common/schema_registry.h" @@ -135,8 +134,8 @@ class ExtensionSettingsApiTest : public ExtensionApiTest { scoped_ptr<policy::PolicyBundle> bundle(new policy::PolicyBundle()); policy::PolicyMap& policy_map = bundle->Get(policy::PolicyNamespace( policy::POLICY_DOMAIN_EXTENSIONS, kManagedStorageExtensionId)); - policy_map.LoadFrom(&policies, policy::POLICY_LEVEL_MANDATORY, - policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD); + policy_map.LoadFrom( + &policies, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER); policy_provider_.UpdatePolicy(bundle.Pass()); } #endif diff --git a/chrome/browser/extensions/extension_management_test_util.cc b/chrome/browser/extensions/extension_management_test_util.cc index a906b79..618eb0b 100644 --- a/chrome/browser/extensions/extension_management_test_util.cc +++ b/chrome/browser/extensions/extension_management_test_util.cc @@ -263,8 +263,7 @@ ExtensionManagementPolicyUpdater::~ExtensionManagementPolicyUpdater() { policies_->Get(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())) .Set(policy::key::kExtensionSettings, policy::POLICY_LEVEL_MANDATORY, - policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, - TakePref().release(), nullptr); + policy::POLICY_SCOPE_USER, TakePref().release(), nullptr); provider_->UpdatePolicy(policies_.Pass()); } diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc index daa28a6..a5fb830 100644 --- a/chrome/browser/extensions/policy_handlers_unittest.cc +++ b/chrome/browser/extensions/policy_handlers_unittest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/policy_handlers.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "extensions/browser/pref_names.h" #include "policy/policy_constants.h" @@ -44,7 +43,6 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -55,7 +53,6 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -66,7 +63,6 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -77,7 +73,6 @@ TEST(ExtensionListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -102,7 +97,6 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -113,7 +107,6 @@ TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kExtensionInstallBlacklist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -130,7 +123,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -141,7 +133,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -154,7 +145,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -166,7 +156,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -178,7 +167,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -201,7 +189,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -214,7 +201,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -225,7 +211,6 @@ TEST(ExtensionInstallForcelistPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kExtensionInstallForcelist, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -243,7 +228,6 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -254,7 +238,6 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -265,7 +248,6 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -276,7 +258,6 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -290,7 +271,6 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); errors.Clear(); @@ -311,7 +291,6 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kExtensionInstallSources, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); @@ -335,7 +314,6 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(policy::key::kExtensionSettings, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy_value.release(), NULL); // CheckPolicySettings() fails due to missing update URL. @@ -360,7 +338,6 @@ TEST(ExtensionSettingsPolicyHandlerTest, ApplyPolicySettings) { policy_map.Set(policy::key::kExtensionSettings, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, policy_value->DeepCopy(), NULL); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); diff --git a/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc b/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc index 4596462..e89d32d 100644 --- a/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc +++ b/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/net/disk_cache_dir_policy_handler.h" #include "chrome/common/pref_names.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -32,7 +31,6 @@ TEST_F(DiskCacheDirPolicyTest, SetPolicyInvalid) { policy_.Set(key::kDiskCacheDir, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); handler_.ApplyPolicySettings(policy_, &prefs_); @@ -45,7 +43,6 @@ TEST_F(DiskCacheDirPolicyTest, SetPolicyValid) { policy_.Set(key::kDiskCacheDir, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(in), NULL); handler_.ApplyPolicySettings(policy_, &prefs_); diff --git a/chrome/browser/net/proxy_policy_handler_unittest.cc b/chrome/browser/net/proxy_policy_handler_unittest.cc index 823101b..570bf01 100644 --- a/chrome/browser/net/proxy_policy_handler_unittest.cc +++ b/chrome/browser/net/proxy_policy_handler_unittest.cc @@ -10,7 +10,6 @@ #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/configuration_policy_pref_store_test.h" #include "components/policy/core/common/policy_service_impl.h" -#include "components/policy/core/common/policy_types.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" #include "policy/policy_constants.h" @@ -77,20 +76,17 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptions) { policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://chromium.org/override"), NULL); policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("chromium.org"), NULL); policy.Set( key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE), NULL); @@ -108,20 +104,17 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsReversedApplyOrder) { key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE), NULL); policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://chromium.org/override"), NULL); policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("chromium.org"), NULL); UpdateProviderPolicy(policy); @@ -138,7 +131,6 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsInvalid) { key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE), NULL); @@ -153,7 +145,6 @@ TEST_F(ProxyPolicyHandlerTest, NoProxyServerMode) { policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(ProxyPolicyHandler::PROXY_SERVER_MODE), NULL); UpdateProviderPolicy(policy); @@ -166,7 +157,6 @@ TEST_F(ProxyPolicyHandlerTest, NoProxyModeName) { policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(ProxyPrefs::kDirectProxyModeName), NULL); UpdateProviderPolicy(policy); @@ -179,7 +169,6 @@ TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyServerMode) { policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE), NULL); @@ -195,7 +184,6 @@ TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyModeName) { policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName), NULL); UpdateProviderPolicy(policy); @@ -210,13 +198,11 @@ TEST_F(ProxyPolicyHandlerTest, PacScriptProxyMode) { policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://short.org/proxy.pac"), NULL); policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(ProxyPrefs::kPacScriptProxyModeName), NULL); UpdateProviderPolicy(policy); @@ -231,7 +217,6 @@ TEST_F(ProxyPolicyHandlerTest, PacScriptProxyModeInvalid) { policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(ProxyPrefs::kPacScriptProxyModeName), NULL); UpdateProviderPolicy(policy); @@ -246,19 +231,16 @@ TEST_F(ProxyPolicyHandlerTest, PacScriptProxyModeBug78016) { policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(std::string()), NULL); policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://short.org/proxy.pac"), NULL); policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(ProxyPrefs::kPacScriptProxyModeName), NULL); UpdateProviderPolicy(policy); @@ -273,7 +255,6 @@ TEST_F(ProxyPolicyHandlerTest, UseSystemProxyServerMode) { policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue( ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE), NULL); @@ -287,7 +268,6 @@ TEST_F(ProxyPolicyHandlerTest, UseSystemProxyMode) { policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(ProxyPrefs::kSystemProxyModeName), NULL); UpdateProviderPolicy(policy); @@ -301,13 +281,11 @@ TEST_F(ProxyPolicyHandlerTest, policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(ProxyPolicyHandler::PROXY_SERVER_MODE), NULL); policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName), NULL); UpdateProviderPolicy(policy); @@ -323,26 +301,22 @@ TEST_F(ProxyPolicyHandlerTest, ProxyInvalid) { policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://short.org/proxy.pac"), NULL); policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://chromium.org/override"), NULL); policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("chromium.org"), NULL); for (int i = 0; i < ProxyPolicyHandler::MODE_COUNT; ++i) { policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(i), NULL); UpdateProviderPolicy(policy); diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index 8ff592f..946f119 100644 --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc @@ -36,7 +36,6 @@ #include "components/policy/core/common/policy_service.h" #include "components/policy/core/common/policy_switches.h" #include "components/policy/core/common/policy_test_utils.h" -#include "components/policy/core/common/policy_types.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_utils.h" @@ -148,19 +147,16 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) { policy_map->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::StringValue("primary-only"), NULL); policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(false), NULL); policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(false), NULL); #endif @@ -170,53 +166,43 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(4), NULL); base::ListValue list; list.AppendString("dev.chromium.org"); list.AppendString("youtube.com"); - expected->Set(key::kURLBlacklist, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, - list.DeepCopy(), - nullptr); + expected->Set( + key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, + list.DeepCopy(), NULL); expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1000), NULL); expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(homepage), NULL); #if defined(OS_CHROMEOS) expected->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::StringValue("primary-only"), NULL); expected->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(false), NULL); expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(false), NULL); #endif diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc index d741b97..6ba4978 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc @@ -302,8 +302,7 @@ void CloudPolicyInvalidatorTest::StorePolicy( store_.policy_map_.LoadFrom( &policies, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD); + POLICY_SCOPE_MACHINE); store_.NotifyStoreLoaded(); } diff --git a/chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc b/chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc index f743751..8392ff9 100644 --- a/chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc +++ b/chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" #include "chrome/common/pref_names.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -31,7 +30,6 @@ TEST_F(FileSelectionDialogsPolicyTest, EnableFileSelectionDialogs) { policy_.Set(key::kAllowFileSelectionDialogs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); handler_.ApplyPolicySettings(policy_, &prefs_); @@ -45,7 +43,6 @@ TEST_F(FileSelectionDialogsPolicyTest, DisableFileSelectionDialogs) { policy_.Set(key::kAllowFileSelectionDialogs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); handler_.ApplyPolicySettings(policy_, &prefs_); diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc index a741c05..36b6e82 100644 --- a/chrome/browser/policy/javascript_policy_handler_unittest.cc +++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc @@ -9,7 +9,6 @@ #include "components/policy/core/browser/configuration_policy_pref_store_test.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" namespace policy { @@ -28,7 +27,6 @@ TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) { policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policy); @@ -36,7 +34,6 @@ TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) { policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policy); @@ -52,7 +49,6 @@ TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) { policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policy); @@ -64,7 +60,6 @@ TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) { policy.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(CONTENT_SETTING_ALLOW), NULL); UpdateProviderPolicy(policy); diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc index 5009731..6018b9c 100644 --- a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc +++ b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc @@ -8,7 +8,6 @@ #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/configuration_policy_pref_store_test.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "policy/policy_constants.h" @@ -32,10 +31,7 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, ApplyPolicySettings) { EXPECT_FALSE(store_->GetValue(bookmarks::prefs::kManagedBookmarks, NULL)); PolicyMap policy; - policy.Set(key::kManagedBookmarks, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, + policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, base::JSONReader::Read("[" " {" " \"name\": \"Google\"," @@ -116,7 +112,6 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, WrongPolicyType) { policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue( "[" " {" @@ -132,10 +127,7 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, WrongPolicyType) { #if defined(ENABLE_EXTENSIONS) TEST_F(ManagedBookmarksPolicyHandlerTest, UnknownKeys) { PolicyMap policy; - policy.Set(key::kManagedBookmarks, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, + policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, base::JSONReader::Read("[" " {" " \"name\": \"Google\"," @@ -164,10 +156,7 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, UnknownKeys) { #if defined(ENABLE_EXTENSIONS) TEST_F(ManagedBookmarksPolicyHandlerTest, BadBookmark) { PolicyMap policy; - policy.Set(key::kManagedBookmarks, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, + policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, base::JSONReader::Read("[" " {" " \"name\": \"Empty\"," diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 80f6129..99d02d8 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -100,7 +100,6 @@ #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_service.h" #include "components/policy/core/common/policy_service_impl.h" -#include "components/policy/core/common/policy_types.h" #include "components/search/search.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" @@ -675,7 +674,6 @@ class PolicyTest : public InProcessBrowserTest { policies.Set(key::kDisableScreenshots, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(!enabled), NULL); UpdateProviderPolicy(policies); @@ -824,7 +822,6 @@ class PolicyTest : public InProcessBrowserTest { policies->Set(key, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, value, nullptr); } else { @@ -883,7 +880,6 @@ class LocalePolicyTest : public PolicyTest { policies.Set(key::kApplicationLocaleValue, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("fr"), NULL); provider_.UpdateChromePolicy(policies); @@ -932,7 +928,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) { policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -947,7 +942,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) { policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -987,7 +981,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PRE_DefaultCookiesSetting) { policies.Set(key::kDefaultCookiesSetting, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(4), NULL); UpdateProviderPolicy(policies); @@ -1036,48 +1029,41 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) { policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); policies.Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kKeyword), NULL); policies.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kSearchURL), NULL); base::ListValue* alternate_urls = new base::ListValue(); alternate_urls->AppendString(kAlternateURL0); alternate_urls->AppendString(kAlternateURL1); policies.Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, alternate_urls, nullptr); + POLICY_SCOPE_USER, alternate_urls, NULL); policies.Set(key::kDefaultSearchProviderSearchTermsReplacementKey, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kSearchTermsReplacementKey), NULL); policies.Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kImageURL), NULL); policies.Set(key::kDefaultSearchProviderImageURLPostParams, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kImageURLPostParams), NULL); policies.Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kNewTabURL), NULL); UpdateProviderPolicy(policies); @@ -1110,7 +1096,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) { policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); EXPECT_TRUE(service->GetDefaultSearchProvider()); @@ -1128,7 +1113,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PolicyPreprocessing) { policies.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(3), NULL); UpdateProviderPolicy(policies); @@ -1140,7 +1124,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PolicyPreprocessing) { expected.Set(key::kProxySettings, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, expected_value.release(), NULL); @@ -1233,37 +1216,31 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ReplaceSearchTerms) { policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); policies.Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kKeyword), NULL); policies.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kSearchURL), NULL); policies.Set(key::kDefaultSearchProviderInstantURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kInstantURL), NULL); base::ListValue* alternate_urls = new base::ListValue(); alternate_urls->AppendString(kAlternateURL0); alternate_urls->AppendString(kAlternateURL1); policies.Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, alternate_urls, nullptr); + POLICY_SCOPE_USER, alternate_urls, NULL); policies.Set(key::kDefaultSearchProviderSearchTermsReplacementKey, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kSearchTermsReplacementKey), NULL); UpdateProviderPolicy(policies); @@ -1345,7 +1322,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) { policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -1357,7 +1333,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) { policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -1373,7 +1348,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableSpdy) { policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -1384,7 +1358,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableSpdy) { policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -1414,8 +1387,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPlugins) { base::ListValue disabled_plugins; disabled_plugins.Append(new base::StringValue("*Flash*")); PolicyMap policies; - policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, disabled_plugins.DeepCopy(), nullptr); + policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, disabled_plugins.DeepCopy(), NULL); UpdateProviderPolicy(policies); EXPECT_FALSE(plugin_prefs->IsPluginEnabled(*flash)); // The user shouldn't be able to enable it. @@ -1441,8 +1414,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPluginsExceptions) { base::ListValue disabled_plugins; disabled_plugins.Append(new base::StringValue("*")); PolicyMap policies; - policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, disabled_plugins.DeepCopy(), nullptr); + policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, disabled_plugins.DeepCopy(), NULL); UpdateProviderPolicy(policies); EXPECT_FALSE(plugin_prefs->IsPluginEnabled(*flash)); // The user shouldn't be able to enable it. @@ -1453,8 +1426,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPluginsExceptions) { base::ListValue disabled_plugins_exceptions; disabled_plugins_exceptions.Append(new base::StringValue("*Flash*")); policies.Set(key::kDisabledPluginsExceptions, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - disabled_plugins_exceptions.DeepCopy(), nullptr); + POLICY_SCOPE_USER, disabled_plugins_exceptions.DeepCopy(), NULL); UpdateProviderPolicy(policies); // It should revert to the user's preference automatically. EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash)); @@ -1483,8 +1455,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, EnabledPlugins) { plugin_list.Append(new base::StringValue(content::kFlashPluginName)); PolicyMap policies; policies.Set(key::kEnabledPlugins, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, plugin_list.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, plugin_list.DeepCopy(), NULL); UpdateProviderPolicy(policies); EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash)); // The user can't disable it anymore. @@ -1493,8 +1464,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, EnabledPlugins) { // When a plugin is both enabled and disabled, the whitelist takes precedence. policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, plugin_list.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, plugin_list.DeepCopy(), NULL); UpdateProviderPolicy(policies); EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash)); } @@ -1539,7 +1509,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AlwaysAuthorizePlugins) { policies.Set(key::kAlwaysAuthorizePlugins, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -1566,7 +1535,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabled) { policies.Set(key::kDeveloperToolsDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); content::WindowedNotificationObserver close_observer( @@ -1614,7 +1582,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_WebStoreIconHidden) { policies.Set(key::kHideWebStoreIcon, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -1650,7 +1617,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DownloadDirectory) { policies.Set(key::kDownloadDirectory, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(forced_dir.path().value()), NULL); UpdateProviderPolicy(policies); @@ -1668,8 +1634,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklistSelective) { blacklist.Append(new base::StringValue(kGoodCrxId)); PolicyMap policies; policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); // "good.crx" is blacklisted. @@ -1700,8 +1665,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_ExtensionInstallBlacklistWildcard) { blacklist.Append(new base::StringValue("*")); PolicyMap policies; policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); // AdBlock was automatically removed. @@ -1748,11 +1712,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklistSharedModules) { base::StringPrintf("%s;%s", kImporterId, update_xml_url.spec().c_str())); PolicyMap policies; policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); policies.Set(key::kExtensionInstallForcelist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, forcelist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, forcelist.DeepCopy(), NULL); extensions::ExtensionRegistry* registry = extensions::ExtensionRegistry::Get(browser()->profile()); @@ -1799,11 +1761,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallWhitelist) { whitelist.Append(new base::StringValue(kGoodCrxId)); PolicyMap policies; policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); policies.Set(key::kExtensionInstallWhitelist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, whitelist.DeepCopy(), NULL); UpdateProviderPolicy(policies); // "adblock.crx" is blacklisted. EXPECT_FALSE(InstallExtension(kAdBlockCrxName)); @@ -1836,8 +1796,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallForcelist) { base::StringPrintf("%s;%s", kGoodCrxId, url.spec().c_str()))); PolicyMap policies; policies.Set(key::kExtensionInstallForcelist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, forcelist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, forcelist.DeepCopy(), NULL); content::WindowedNotificationObserver observer( extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED, content::NotificationService::AllSources()); @@ -1956,7 +1915,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionRecommendedInstallationMode) { policies.Set(key::kExtensionSettings, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, dict_value.DeepCopy(), NULL); content::WindowedNotificationObserver observer( @@ -1990,8 +1948,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionAllowedTypes) { allowed_types.AppendString("hosted_app"); PolicyMap policies; policies.Set(key::kExtensionAllowedTypes, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, allowed_types.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, allowed_types.DeepCopy(), NULL); UpdateProviderPolicy(policies); // "good.crx" is blocked. @@ -2049,8 +2006,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_ExtensionInstallSources) { install_sources.AppendString(referrer_url.spec()); PolicyMap policies; policies.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - install_sources.DeepCopy(), nullptr); + POLICY_SCOPE_USER, install_sources.DeepCopy(), NULL); UpdateProviderPolicy(policies); content::WindowedNotificationObserver observer( @@ -2280,7 +2236,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) { policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(chrome::kChromeUICreditsURL), NULL); UpdateProviderPolicy(policies); @@ -2291,7 +2246,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) { policies.Set(key::kHomepageIsNewTabPage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -2314,7 +2268,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) { policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2326,7 +2279,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) { policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -2349,7 +2301,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) { policies.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2370,7 +2321,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) { policies.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(CONTENT_SETTING_ALLOW), NULL); UpdateProviderPolicy(policies); @@ -2389,7 +2339,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NetworkPrediction) { policies.Set(key::kDnsPrefetchingEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2401,7 +2350,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NetworkPrediction) { key::kNetworkPredictionOptions, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(chrome_browser_net::NETWORK_PREDICTION_ALWAYS), NULL); UpdateProviderPolicy(policies); @@ -2415,7 +2363,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) { policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -2431,7 +2378,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) { policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2467,7 +2413,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_TranslateEnabled) { policies.Set(key::kTranslateEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -2513,7 +2458,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_TranslateEnabled) { policies.Set(key::kTranslateEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2556,8 +2500,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklist) { blacklist.Append(new base::StringValue("bbb.com")); PolicyMap policies; policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); FlushBlacklistPolicy(); // All bbb.com URLs are blocked, and "aaa.com" is still unblocked. @@ -2570,8 +2513,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklist) { whitelist.Append(new base::StringValue("sub.bbb.com")); whitelist.Append(new base::StringValue("bbb.com/policy")); policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, whitelist.DeepCopy(), NULL); UpdateProviderPolicy(policies); FlushBlacklistPolicy(); CheckURLIsBlocked(browser(), kURLS[1]); @@ -2607,8 +2549,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklistSubresources) { blacklist.Append(new base::StringValue(subframe_url.spec().c_str())); PolicyMap policies; policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); FlushBlacklistPolicy(); @@ -2654,8 +2595,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) { blacklist.Append(new base::StringValue("file://*")); PolicyMap policies; policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); FlushBlacklistPolicy(); @@ -2665,8 +2605,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) { // Replace the URLblacklist with disabling the file scheme. blacklist.Remove(base::StringValue("file://*"), NULL); policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); FlushBlacklistPolicy(); @@ -2678,8 +2617,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) { base::ListValue disabledscheme; disabledscheme.Append(new base::StringValue("file")); policies.Set(key::kDisabledSchemes, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - disabledscheme.DeepCopy(), nullptr); + POLICY_SCOPE_USER, disabledscheme.DeepCopy(), NULL); UpdateProviderPolicy(policies); FlushBlacklistPolicy(); @@ -2691,12 +2629,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) { base::ListValue whitelist; whitelist.Append(new base::StringValue(base_path)); policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, whitelist.DeepCopy(), NULL); blacklist.Append(new base::StringValue(folder_path)); policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); FlushBlacklistPolicy(); @@ -2745,7 +2681,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SSLVersionFallbackMin) { policies.Set(key::kSSLVersionFallbackMin, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(new_value), NULL); UpdateProviderPolicy(policies); @@ -2760,7 +2695,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) { policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2778,7 +2712,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedApp) { policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2850,7 +2783,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) { policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -2865,7 +2797,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) { policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -2905,7 +2836,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_SessionLengthLimit) { policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(kThreeHoursInMs), NULL); UpdateProviderPolicy(policies); @@ -2918,7 +2848,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_SessionLengthLimit) { policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(kOneHourInMs), NULL); UpdateProviderPolicy(policies); @@ -2950,7 +2879,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PolicyMap policies; policies.Set(key::kWaitForInitialUserActivity, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -2963,7 +2891,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(kOneHourInMs), NULL); UpdateProviderPolicy(policies); @@ -3000,13 +2927,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PolicyMap policies; policies.Set(key::kWaitForInitialUserActivity, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(kThreeHoursInMs), NULL); UpdateProviderPolicy(policies); @@ -3019,7 +2944,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(kOneHourInMs), NULL); UpdateProviderPolicy(policies); @@ -3042,7 +2966,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, LargeCursorEnabled) { policies.Set(key::kLargeCursorEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -3069,7 +2992,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SpokenFeedbackEnabled) { policies.Set(key::kSpokenFeedbackEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -3096,7 +3018,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HighContrastEnabled) { policies.Set(key::kHighContrastEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -3123,7 +3044,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeNone) { policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); UpdateProviderPolicy(policies); @@ -3147,7 +3067,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeFull) { policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(ui::MAGNIFIER_FULL), NULL); UpdateProviderPolicy(policies); @@ -3174,7 +3093,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AccessibilityVirtualKeyboardEnabled) { policies.Set(key::kVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -3200,7 +3118,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) { policies.Set(key::kTouchVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -3213,7 +3130,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) { policies.Set(key::kTouchVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); @@ -3288,19 +3204,16 @@ class RestoreOnStartupPolicyTest key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(SessionStartupPref::kPrefValueHomePage), NULL); policies.Set(key::kHomepageIsNewTabPage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kRestoredURLs[1]), NULL); provider_.UpdateChromePolicy(policies); @@ -3316,13 +3229,11 @@ class RestoreOnStartupPolicyTest key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(SessionStartupPref::kPrefValueHomePage), NULL); policies.Set(key::kHomepageIsNewTabPage, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); provider_.UpdateChromePolicy(policies); @@ -3341,12 +3252,11 @@ class RestoreOnStartupPolicyTest policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(SessionStartupPref::kPrefValueURLs), NULL); policies.Set( key::kRestoreOnStartupURLs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, urls.DeepCopy(), nullptr); + urls.DeepCopy(), NULL); provider_.UpdateChromePolicy(policies); } @@ -3357,7 +3267,6 @@ class RestoreOnStartupPolicyTest key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(SessionStartupPref::kPrefValueNewTab), NULL); provider_.UpdateChromePolicy(policies); @@ -3370,7 +3279,6 @@ class RestoreOnStartupPolicyTest policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(SessionStartupPref::kPrefValueLast), NULL); provider_.UpdateChromePolicy(policies); @@ -3435,19 +3343,16 @@ class PolicyStatisticsCollectorTest : public PolicyTest { policies.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://chromium.org"), NULL); provider_.UpdateChromePolicy(policies); @@ -3515,7 +3420,6 @@ class MediaStreamDevicesControllerBrowserTest policies->Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(policy_value_), NULL); @@ -3533,8 +3437,8 @@ class MediaStreamDevicesControllerBrowserTest // is that the request has not been allowed via the whitelist. request_url_allowed_via_whitelist_ = false; } - policies->Set(whitelist_policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list, nullptr); + policies->Set(whitelist_policy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, list, NULL); } } @@ -3729,8 +3633,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SafeBrowsingExtendedReportingOptInAllowed) { prefs->GetBoolean(prefs::kSafeBrowsingExtendedReportingOptInAllowed)); PolicyMap policies; policies.Set(key::kSafeBrowsingExtendedReportingOptInAllowed, - POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - new base::FundamentalValue(false), nullptr); + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, + new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); EXPECT_FALSE( prefs->GetBoolean(prefs::kSafeBrowsingExtendedReportingOptInAllowed)); @@ -3813,8 +3717,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SSLErrorOverridingDisallowed) { // Disallowing the proceed link by setting the policy to |false|. PolicyMap policies; policies.Set(key::kSSLErrorOverrideAllowed, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - new base::FundamentalValue(false), nullptr); + POLICY_SCOPE_USER, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); // Policy should not allow overriding anymore. @@ -3863,7 +3766,6 @@ class PolicyVariationsServiceTest : public PolicyTest { policies.Set(key::kVariationsRestrictParameter, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("restricted"), NULL); provider_.UpdateChromePolicy(policies); @@ -3895,8 +3797,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NativeMessagingBlacklistSelective) { blacklist.Append(new base::StringValue("host.name")); PolicyMap policies; policies.Set(key::kNativeMessagingBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); PrefService* prefs = browser()->profile()->GetPrefs(); @@ -3911,8 +3812,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NativeMessagingBlacklistWildcard) { blacklist.Append(new base::StringValue("*")); PolicyMap policies; policies.Set(key::kNativeMessagingBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); UpdateProviderPolicy(policies); PrefService* prefs = browser()->profile()->GetPrefs(); @@ -3929,11 +3829,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NativeMessagingWhitelist) { whitelist.Append(new base::StringValue("host.name")); PolicyMap policies; policies.Set(key::kNativeMessagingBlacklist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); policies.Set(key::kNativeMessagingWhitelist, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(), - nullptr); + POLICY_SCOPE_USER, whitelist.DeepCopy(), NULL); UpdateProviderPolicy(policies); PrefService* prefs = browser()->profile()->GetPrefs(); @@ -3958,7 +3856,6 @@ class HardwareAccelerationModePolicyTest : public PolicyTest { policies.Set(key::kHardwareAccelerationModeEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); provider_.UpdateChromePolicy(policies); @@ -3990,7 +3887,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, UnifiedDesktopEnabledByDefault) { policies.Set(key::kUnifiedDesktopEnabledByDefault, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policies); @@ -3998,7 +3894,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, UnifiedDesktopEnabledByDefault) { policies.Set(key::kUnifiedDesktopEnabledByDefault, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policies); diff --git a/chrome/browser/policy/policy_network_browsertest.cc b/chrome/browser/policy/policy_network_browsertest.cc index ec2d90c..e5c42af 100644 --- a/chrome/browser/policy/policy_network_browsertest.cc +++ b/chrome/browser/policy/policy_network_browsertest.cc @@ -12,7 +12,6 @@ #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/browser_test.h" #include "net/http/http_transaction_factory.h" @@ -85,7 +84,7 @@ class QuicAllowedPolicyIsFalse: public QuicAllowedPolicyTestBase { protected: void GetQuicAllowedPolicy(PolicyMap* values) override { values->Set(key::kQuicAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), nullptr); + new base::FundamentalValue(false), NULL); } private: @@ -104,7 +103,7 @@ class QuicAllowedPolicyIsTrue: public QuicAllowedPolicyTestBase { protected: void GetQuicAllowedPolicy(PolicyMap* values) override { values->Set(key::kQuicAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), nullptr); + new base::FundamentalValue(true), NULL); } private: diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index cfbd3c8..503c5f9 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -36,7 +36,6 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_details.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" @@ -520,7 +519,6 @@ class PolicyPrefsTest : public InProcessBrowserTest { it.key(), level, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, it.value().DeepCopy(), policy_details->max_external_data_size ? new ExternalDataFetcher(base::WeakPtr<ExternalDataManager>(), diff --git a/chrome/browser/policy/policy_startup_browsertest.cc b/chrome/browser/policy/policy_startup_browsertest.cc index 85c6cc5..bf429d3 100644 --- a/chrome/browser/policy/policy_startup_browsertest.cc +++ b/chrome/browser/policy/policy_startup_browsertest.cc @@ -12,7 +12,6 @@ #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" class PolicyMakeDefaultBrowserTest : public InProcessBrowserTest { @@ -33,7 +32,6 @@ class PolicyMakeDefaultBrowserTest : public InProcessBrowserTest { values.Set(policy::key::kDefaultBrowserSettingEnabled, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_MACHINE, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); provider_.UpdateChromePolicy(values); diff --git a/chrome/browser/policy/profile_policy_connector_unittest.cc b/chrome/browser/policy/profile_policy_connector_unittest.cc index 74d578f..3df619f 100644 --- a/chrome/browser/policy/profile_policy_connector_unittest.cc +++ b/chrome/browser/policy/profile_policy_connector_unittest.cc @@ -16,7 +16,6 @@ #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_service.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema_registry.h" #include "policy/policy_constants.h" #include "policy/proto/device_management_backend.pb.h" @@ -98,7 +97,6 @@ TEST_F(ProfilePolicyConnectorTest, IsPolicyFromCloudPolicy) { cloud_policy_store_.policy_map_.Set(key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), nullptr); cloud_policy_store_.NotifyStoreLoaded(); @@ -115,7 +113,6 @@ TEST_F(ProfilePolicyConnectorTest, IsPolicyFromCloudPolicy) { map.Set(key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), nullptr); mock_provider_.UpdateChromePolicy(map); diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc index 6505646..09b6d83 100644 --- a/chrome/browser/prefs/proxy_policy_unittest.cc +++ b/chrome/browser/prefs/proxy_policy_unittest.cc @@ -15,7 +15,6 @@ #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_service_impl.h" -#include "components/policy/core/common/policy_types.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/proxy_config/proxy_config_dictionary.h" #include "components/proxy_config/proxy_config_pref_names.h" @@ -127,17 +126,15 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineOptions) { new base::StringValue(ProxyPrefs::kFixedServersProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, mode_name, nullptr); + mode_name, NULL); policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("abc"), NULL); policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("ghi"), NULL); provider_.UpdateChromePolicy(policy); @@ -170,7 +167,7 @@ TEST_F(ProxyPolicyTest, OverridesUnrelatedCommandLineOptions) { new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, mode_name, nullptr); + mode_name, NULL); provider_.UpdateChromePolicy(policy); // First verify that command-line options are set correctly when @@ -198,7 +195,7 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineNoProxy) { new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, mode_name, nullptr); + mode_name, NULL); provider_.UpdateChromePolicy(policy); // First verify that command-line options are set correctly when @@ -222,7 +219,7 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineAutoDetect) { new base::StringValue(ProxyPrefs::kDirectProxyModeName); PolicyMap policy; policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, mode_name, nullptr); + mode_name, NULL); provider_.UpdateChromePolicy(policy); // First verify that the auto-detect is set if there is no managed diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc index 3c44310..6e6390a 100644 --- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc +++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc @@ -29,7 +29,6 @@ #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #endif @@ -192,7 +191,6 @@ IN_PROC_BROWSER_TEST_F(SyncedPrefChangeRegistrarTest, policies.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateChromePolicy(policies); @@ -214,7 +212,6 @@ IN_PROC_BROWSER_TEST_F(SyncedPrefChangeRegistrarTest, policies.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateChromePolicy(policies); diff --git a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc index f68d618..5fac6d6 100644 --- a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc +++ b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc @@ -7,7 +7,6 @@ #include "chrome/common/pref_names.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/configuration_policy_pref_store_test.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" namespace policy { @@ -36,7 +35,6 @@ class IncognitoModePolicyHandlerTest policy.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(incognito_enabled == INCOGNITO_ENABLED_TRUE), NULL); @@ -45,7 +43,6 @@ class IncognitoModePolicyHandlerTest policy.Set(key::kIncognitoModeAvailability, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(availability), NULL); } diff --git a/chrome/browser/resources/policy.html b/chrome/browser/resources/policy.html index e8878d4..5b8c4d3 100644 --- a/chrome/browser/resources/policy.html +++ b/chrome/browser/resources/policy.html @@ -99,9 +99,6 @@ <td class="level-column"> <div class="level elide"></div> </td> - <td class="source-column"> - <div class="source elide"></div> - </td> <td class="name-column"> <div class="name elide"></div> </td> diff --git a/chrome/browser/resources/policy.js b/chrome/browser/resources/policy.js index aaba4ff..bec30a7 100644 --- a/chrome/browser/resources/policy.js +++ b/chrome/browser/resources/policy.js @@ -134,8 +134,6 @@ cr.define('policy', function() { this.querySelector('.level').textContent = loadTimeData.getString(value.level == 'recommended' ? 'levelRecommended' : 'levelMandatory'); - this.querySelector('.source').textContent = - loadTimeData.getString(value.source); this.querySelector('.value').textContent = value.value; this.querySelector('.expanded-value').textContent = value.value; } @@ -521,8 +519,7 @@ cr.define('policy', function() { var newTable = window.document.createElement('table'); var tableHead = window.document.createElement('thead'); var tableRow = window.document.createElement('tr'); - var tableHeadings = ['Scope', 'Level', 'Source', 'Name', 'Value', - 'Status']; + var tableHeadings = ['Scope', 'Level', 'Name', 'Value', 'Status']; for (var i = 0; i < tableHeadings.length; i++) { var tableHeader = window.document.createElement('th'); tableHeader.classList.add(tableHeadings[i].toLowerCase() + '-column'); diff --git a/chrome/browser/search/contextual_search_policy_handler_android_unittest.cc b/chrome/browser/search/contextual_search_policy_handler_android_unittest.cc index 7ad34f1..1b494f0 100644 --- a/chrome/browser/search/contextual_search_policy_handler_android_unittest.cc +++ b/chrome/browser/search/contextual_search_policy_handler_android_unittest.cc @@ -27,7 +27,6 @@ TEST(ContextualSearchPolicyHandlerAndroidTest, Enabled) { policy.Set(key::kContextualSearchEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, new base::FundamentalValue(true), NULL); PrefValueMap prefs; @@ -45,7 +44,6 @@ TEST(ContextualSearchPolicyHandlerAndroidTest, Disabled) { policy.Set(key::kContextualSearchEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, new base::FundamentalValue(false), NULL); PrefValueMap prefs; diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc index 0c35d58..3835652a 100644 --- a/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc +++ b/chrome/browser/sessions/restore_on_startup_policy_handler_unittest.cc @@ -16,7 +16,6 @@ #include "components/policy/core/browser/configuration_policy_handler.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "grit/components_strings.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -28,8 +27,7 @@ class RestoreOnStartupPolicyHandlerTest : public testing::Test { protected: void SetPolicyValue(const std::string& policy, base::Value* value) { policies_.Set( - policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - value, nullptr); + policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, value, NULL); } bool CheckPolicySettings() { return handler_.CheckPolicySettings(policies_, &errors_); diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc index 13cbbc0..cb34e92 100644 --- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc @@ -15,7 +15,6 @@ #include "components/bookmarks/browser/bookmark_node.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" #include "testing/gmock/include/gmock/gmock.h" @@ -2204,7 +2203,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, ManagedBookmarks) { policy::PolicyMap policy; policy.Set(policy::key::kManagedBookmarks, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, list, nullptr); + list, NULL); policy_provider_.UpdateChromePolicy(policy); base::RunLoop().RunUntilIdle(); diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 1e913a3..e5a2805 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -1598,7 +1598,6 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, policy::key::kRestoreOnStartup, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(SessionStartupPref::kPrefValueURLs), NULL); base::ListValue startup_urls; @@ -1606,8 +1605,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, new base::StringValue(test_server()->GetURL("files/title1.html").spec())); policy_map_.Set(policy::key::kRestoreOnStartupURLs, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, startup_urls.DeepCopy(), - nullptr); + startup_urls.DeepCopy(), NULL); provider_.UpdateChromePolicy(policy_map_); base::RunLoop().RunUntilIdle(); diff --git a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc index 881eec7..f4bf8f6 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc @@ -50,7 +50,6 @@ class CertificateManagerBrowserTest : public options::OptionsUIBrowserTest { policy.Set(policy::key::kOpenNetworkConfiguration, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(user_policy_blob), NULL); provider_.UpdateChromePolicy(policy); diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index 2f2cee9..2482e34 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -201,7 +201,7 @@ void PreferencesBrowserTest::SetUserPolicies( policy::PolicyMap map; for (size_t i = 0; i < names.size(); ++i) { map.Set(names[i], level, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, values[i]->DeepCopy(), nullptr); + values[i]->DeepCopy(), NULL); } policy_provider_.UpdateChromePolicy(map); } @@ -878,7 +878,6 @@ class ProxyPreferencesBrowserTest : public PreferencesBrowserTest { map.Set(policy_name, policy::POLICY_LEVEL_MANDATORY, scope, - policy::POLICY_SOURCE_CLOUD, new base::StringValue(onc_policy), NULL); policy_provider_.UpdateChromePolicy(map); diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index 7c646e0..03d4348 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -4,15 +4,13 @@ #include "chrome/browser/ui/webui/policy_ui.h" -#include <stddef.h> - #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/json/json_writer.h" #include "base/logging.h" -#include "base/macros.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/time/time.h" @@ -79,28 +77,6 @@ namespace em = enterprise_management; namespace { -struct PolicySourceMap { - const char* key; - int string_id; -}; - -// Strings that map from PolicySource enum to i18n string keys and their IDs. -const PolicySourceMap kPolicySources[policy::POLICY_SOURCE_COUNT] = { - {"sourceEnterpriseDefault", IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT}, - {"sourceCloud", IDS_POLICY_SOURCE_CLOUD}, - {"sourceEnterpriseOverride", IDS_POLICY_SOURCE_ENTERPRISE_OVERRIDE}, - {"sourcePlatform", IDS_POLICY_SOURCE_PLATFORM} -}; - -void AddLocalizedPoilcySourceStrings(content::WebUIDataSource* source) { - DCHECK_EQ(static_cast<size_t>(policy::POLICY_SOURCE_COUNT), - arraysize(kPolicySources)); - for (size_t i = 0; i < arraysize(kPolicySources); ++i) { - source->AddLocalizedString(kPolicySources[i].key, - kPolicySources[i].string_id); - } -} - content::WebUIDataSource* CreatePolicyUIHTMLSource() { content::WebUIDataSource* source = content::WebUIDataSource::Create(chrome::kChromeUIPolicyHost); @@ -132,7 +108,6 @@ content::WebUIDataSource* CreatePolicyUIHTMLSource() { source->AddLocalizedString("headerName", IDS_POLICY_HEADER_NAME); source->AddLocalizedString("headerValue", IDS_POLICY_HEADER_VALUE); source->AddLocalizedString("headerStatus", IDS_POLICY_HEADER_STATUS); - source->AddLocalizedString("headerSource", IDS_POLICY_HEADER_SOURCE); source->AddLocalizedString("showExpandedValue", IDS_POLICY_SHOW_EXPANDED_VALUE); source->AddLocalizedString("hideExpandedValue", @@ -145,7 +120,6 @@ content::WebUIDataSource* CreatePolicyUIHTMLSource() { source->AddLocalizedString("unset", IDS_POLICY_UNSET); source->AddLocalizedString("unknown", IDS_POLICY_UNKNOWN); source->AddLocalizedString("notSpecified", IDS_POLICY_NOT_SPECIFIED); - AddLocalizedPoilcySourceStrings(source); source->SetJsonPath("strings.js"); @@ -778,7 +752,6 @@ void PolicyUIHandler::GetPolicyValues(const policy::PolicyMap& map, value->SetString("level", "recommended"); else value->SetString("level", "mandatory"); - value->SetString("source", kPolicySources[entry->second.source].key); base::string16 error = errors->GetErrors(entry->first); if (!error.empty()) value->SetString("error", error); diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc index b7ae8a1..161a734 100644 --- a/chrome/browser/ui/webui/policy_ui_browsertest.cc +++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc @@ -41,7 +41,6 @@ namespace { std::vector<std::string> PopulateExpectedPolicy( const std::string& name, const std::string& value, - const std::string& source, const policy::PolicyMap::Entry* metadata, bool unknown) { std::vector<std::string> expected_policy; @@ -63,8 +62,6 @@ std::vector<std::string> PopulateExpectedPolicy( } else { expected_policy.push_back(std::string()); } - // Populate expected source name. - expected_policy.push_back(source); // Populate expected policy name. expected_policy.push_back(name); @@ -121,9 +118,9 @@ void PolicyUITest::SetUpInProcessBrowserTestFixture() { } void PolicyUITest::UpdateProviderPolicy(const policy::PolicyMap& policy) { - provider_.UpdateChromePolicy(policy); - base::RunLoop loop; - loop.RunUntilIdle(); + provider_.UpdateChromePolicy(policy); + base::RunLoop loop; + loop.RunUntilIdle(); } void PolicyUITest::VerifyPolicies( @@ -190,8 +187,7 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyNames) { for (policy::Schema::Iterator it = chrome_schema.GetPropertiesIterator(); !it.IsAtEnd(); it.Advance()) { expected_policies.push_back( - PopulateExpectedPolicy( - it.key(), std::string(), std::string(), nullptr, false)); + PopulateExpectedPolicy(it.key(), std::string(), NULL, false)); } // Retrieve the contents of the policy table from the UI and verify that it @@ -215,28 +211,24 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyValues) { values.Set(policy::key::kRestoreOnStartupURLs, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, restore_on_startup_urls, NULL); expected_values[policy::key::kRestoreOnStartupURLs] = "aaa,bbb,ccc"; values.Set(policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_MACHINE, - policy::POLICY_SOURCE_CLOUD, new base::StringValue("http://google.com"), NULL); expected_values[policy::key::kHomepageLocation] = "http://google.com"; values.Set(policy::key::kRestoreOnStartup, policy::POLICY_LEVEL_RECOMMENDED, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(4), NULL); expected_values[policy::key::kRestoreOnStartup] = "4"; values.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_RECOMMENDED, policy::POLICY_SCOPE_MACHINE, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); expected_values[policy::key::kShowHomeButton] = "true"; @@ -245,7 +237,6 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyValues) { values.Set(kUnknownPolicy, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_PLATFORM, new base::FundamentalValue(true), NULL); expected_values[kUnknownPolicy] = "true"; @@ -266,19 +257,16 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyValues) { expected_values.find(props.key()); const std::string value = it == expected_values.end() ? std::string() : it->second; - const std::string source = - it == expected_values.end() ? std::string() : "Cloud"; const policy::PolicyMap::Entry* metadata = values.Get(props.key()); expected_policies.insert( metadata ? expected_policies.begin() + first_unset_position++ : expected_policies.end(), - PopulateExpectedPolicy(props.key(), value, source, metadata, false)); + PopulateExpectedPolicy(props.key(), value, metadata, false)); } expected_policies.insert( expected_policies.begin() + first_unset_position++, PopulateExpectedPolicy(kUnknownPolicy, expected_values[kUnknownPolicy], - "Platform", values.Get(kUnknownPolicy), true)); @@ -330,12 +318,11 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, ExtensionLoadAndSendPolicy) { for (policy::Schema::Iterator it = chrome_schema.GetPropertiesIterator(); !it.IsAtEnd(); it.Advance()) { expected_policies.push_back( - PopulateExpectedPolicy( - it.key(), std::string(), std::string(), nullptr, false)); + PopulateExpectedPolicy(it.key(), std::string(), NULL, false)); } // Add newly added policy to expected policy list. expected_policies.push_back(PopulateExpectedPolicy( - newly_added_policy_name, std::string(), std::string(), nullptr, false)); + newly_added_policy_name, std::string(), NULL, false)); // Verify if policy UI includes policy that extension have. VerifyPolicies(expected_policies); diff --git a/components/policy/core/browser/android/policy_converter.cc b/components/policy/core/browser/android/policy_converter.cc index 21cd0f6..85909f3 100644 --- a/components/policy/core/browser/android/policy_converter.cc +++ b/components/policy/core/browser/android/policy_converter.cc @@ -190,7 +190,6 @@ void PolicyConverter::SetPolicyValue(const std::string& key, const PolicyNamespace ns(POLICY_DOMAIN_CHROME, std::string()); policy_bundle_->Get(ns) .Set(key, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, ConvertValueToSchema(value.Pass(), schema).release(), nullptr); } diff --git a/components/policy/core/browser/autofill_policy_handler_unittest.cc b/components/policy/core/browser/autofill_policy_handler_unittest.cc index aa457c5..f84f5e6 100644 --- a/components/policy/core/browser/autofill_policy_handler_unittest.cc +++ b/components/policy/core/browser/autofill_policy_handler_unittest.cc @@ -7,7 +7,6 @@ #include "components/autofill/core/common/autofill_pref_names.h" #include "components/policy/core/browser/autofill_policy_handler.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -29,7 +28,6 @@ TEST_F(AutofillPolicyHandlerTest, Enabled) { policy.Set(key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); PrefValueMap prefs; @@ -45,7 +43,6 @@ TEST_F(AutofillPolicyHandlerTest, Disabled) { policy.Set(key::kAutoFillEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); PrefValueMap prefs; diff --git a/components/policy/core/browser/configuration_policy_handler_unittest.cc b/components/policy/core/browser/configuration_policy_handler_unittest.cc index 57db6d6..67b6604 100644 --- a/components/policy/core/browser/configuration_policy_handler_unittest.cc +++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc @@ -11,7 +11,6 @@ #include "components/policy/core/browser/configuration_policy_handler.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "testing/gtest/include/gtest/gtest.h" @@ -57,22 +56,22 @@ TEST(StringToIntEnumListPolicyHandlerTest, CheckPolicySettings) { kTestPref, base::Bind(GetIntegerTypeMap)); - policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list.DeepCopy(), nullptr); + policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, list.DeepCopy(), NULL); errors.Clear(); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); list.AppendString("one"); - policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list.DeepCopy(), nullptr); + policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, list.DeepCopy(), NULL); errors.Clear(); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_TRUE(errors.empty()); list.AppendString("invalid"); - policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list.DeepCopy(), nullptr); + policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, list.DeepCopy(), NULL); errors.Clear(); EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); EXPECT_FALSE(errors.empty()); @@ -81,7 +80,6 @@ TEST(StringToIntEnumListPolicyHandlerTest, CheckPolicySettings) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("no list"), NULL); errors.Clear(); @@ -101,23 +99,23 @@ TEST(StringMappingListPolicyHandlerTest, ApplyPolicySettings) { kTestPref, base::Bind(GetIntegerTypeMap)); - policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list.DeepCopy(), nullptr); + policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, list.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); EXPECT_TRUE(base::Value::Equals(&expected, value)); list.AppendString("two"); expected.AppendInteger(2); - policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list.DeepCopy(), nullptr); + policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, list.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); EXPECT_TRUE(base::Value::Equals(&expected, value)); list.AppendString("invalid"); - policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list.DeepCopy(), nullptr); + policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, list.DeepCopy(), NULL); handler.ApplyPolicySettings(policy_map, &prefs); EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); EXPECT_TRUE(base::Value::Equals(&expected, value)); @@ -135,7 +133,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); errors.Clear(); @@ -145,7 +142,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); errors.Clear(); @@ -155,7 +151,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); errors.Clear(); @@ -167,7 +162,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(-5), NULL); errors.Clear(); @@ -177,7 +171,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(15), NULL); errors.Clear(); @@ -189,7 +182,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("invalid"), NULL); errors.Clear(); @@ -209,7 +201,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); errors.Clear(); @@ -219,7 +210,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); errors.Clear(); @@ -229,7 +219,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); errors.Clear(); @@ -241,7 +230,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(-5), NULL); errors.Clear(); @@ -251,7 +239,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(15), NULL); errors.Clear(); @@ -263,7 +250,6 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("invalid"), NULL); errors.Clear(); @@ -285,7 +271,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); prefs.Clear(); @@ -297,7 +282,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); prefs.Clear(); @@ -309,7 +293,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); prefs.Clear(); @@ -323,7 +306,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(-5), NULL); prefs.Clear(); @@ -335,7 +317,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(15), NULL); prefs.Clear(); @@ -359,7 +340,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); prefs.Clear(); @@ -371,7 +351,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); prefs.Clear(); @@ -383,7 +362,6 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); prefs.Clear(); @@ -406,7 +384,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); errors.Clear(); @@ -416,7 +393,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); errors.Clear(); @@ -426,7 +402,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); errors.Clear(); @@ -438,7 +413,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(-5), NULL); errors.Clear(); @@ -448,7 +422,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(15), NULL); errors.Clear(); @@ -460,7 +433,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("invalid"), NULL); errors.Clear(); @@ -481,7 +453,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); errors.Clear(); @@ -491,7 +462,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); errors.Clear(); @@ -501,7 +471,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); errors.Clear(); @@ -513,7 +482,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(-5), NULL); errors.Clear(); @@ -523,7 +491,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(15), NULL); errors.Clear(); @@ -535,7 +502,6 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("invalid"), NULL); errors.Clear(); @@ -558,7 +524,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); prefs.Clear(); @@ -570,7 +535,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); prefs.Clear(); @@ -582,7 +546,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); prefs.Clear(); @@ -596,7 +559,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(-5), NULL); prefs.Clear(); @@ -608,7 +570,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(15), NULL); prefs.Clear(); @@ -633,7 +594,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); prefs.Clear(); @@ -645,7 +605,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(5), NULL); prefs.Clear(); @@ -657,7 +616,6 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) { policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(10), NULL); prefs.Clear(); @@ -703,8 +661,8 @@ TEST(SchemaValidatingPolicyHandlerTest, CheckAndGetValue) { ASSERT_TRUE(policy_map_value->GetAsDictionary(&policy_map_dict)); PolicyMap policy_map; - policy_map.LoadFrom(policy_map_dict, POLICY_LEVEL_RECOMMENDED, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD); + policy_map.LoadFrom( + policy_map_dict, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER); TestSchemaValidatingPolicyHandler handler(schema, SCHEMA_ALLOW_INVALID); scoped_ptr<base::Value> output_value; @@ -764,13 +722,11 @@ TEST(SimpleSchemaValidatingPolicyHandlerTest, CheckAndGetValue) { PolicyMap policy_map_recommended; policy_map_recommended.LoadFrom( - policy_map_dict, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD); + policy_map_dict, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER); PolicyMap policy_map_mandatory; policy_map_mandatory.LoadFrom( - policy_map_dict, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD); + policy_map_dict, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); SimpleSchemaValidatingPolicyHandler handler_all( policy_name, diff --git a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc index d4b2599..c8a20366 100644 --- a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc +++ b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc @@ -16,7 +16,6 @@ #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/policy/core/common/policy_service_impl.h" -#include "components/policy/core/common/policy_types.h" #include "testing/gmock/include/gmock/gmock.h" // Note: this file should move to components/policy/core/browser, but the @@ -56,8 +55,8 @@ TEST_F(ConfigurationPolicyPrefStoreListTest, SetValue) { in_value->Append(new base::StringValue("test1")); in_value->Append(new base::StringValue("test2,")); PolicyMap policy; - policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, in_value, nullptr); + policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, in_value, NULL); UpdateProviderPolicy(policy); const base::Value* value = NULL; EXPECT_TRUE(store_->GetValue(kTestPref, &value)); @@ -84,7 +83,6 @@ TEST_F(ConfigurationPolicyPrefStoreStringTest, SetValue) { policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://chromium.org"), NULL); UpdateProviderPolicy(policy); @@ -113,7 +111,6 @@ TEST_F(ConfigurationPolicyPrefStoreBooleanTest, SetValue) { policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policy); @@ -128,7 +125,6 @@ TEST_F(ConfigurationPolicyPrefStoreBooleanTest, SetValue) { policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); UpdateProviderPolicy(policy); @@ -159,7 +155,6 @@ TEST_F(ConfigurationPolicyPrefStoreIntegerTest, SetValue) { policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(2), NULL); UpdateProviderPolicy(policy); @@ -196,7 +191,6 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) { policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://www.chromium.org"), NULL); UpdateProviderPolicy(policy); diff --git a/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc b/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc index d0740a7..282bbe4 100644 --- a/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc +++ b/components/policy/core/browser/url_blacklist_policy_handler_unittest.cc @@ -9,7 +9,6 @@ #include "components/policy/core/browser/url_blacklist_policy_handler.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_pref_names.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -30,8 +29,7 @@ const char kTestBlacklistValue[] = "kTestBlacklistValue"; class URLBlacklistPolicyHandlerTest : public testing::Test { protected: void SetPolicy(const std::string& key, base::Value* value) { - policies_.Set(key, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, value, nullptr); + policies_.Set(key, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, value, NULL); } bool CheckPolicy(const std::string& key, base::Value* value) { SetPolicy(key, value); diff --git a/components/policy/core/common/async_policy_provider_unittest.cc b/components/policy/core/common/async_policy_provider_unittest.cc index a477c82..587d693 100644 --- a/components/policy/core/common/async_policy_provider_unittest.cc +++ b/components/policy/core/common/async_policy_provider_unittest.cc @@ -12,7 +12,6 @@ #include "components/policy/core/common/async_policy_loader.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema_registry.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -33,7 +32,6 @@ void SetPolicy(PolicyBundle* bundle, .Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, new base::StringValue(value), NULL); } diff --git a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc index 2410403..076537f 100644 --- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc +++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc @@ -15,7 +15,6 @@ #include "components/policy/core/common/configuration_policy_provider_test.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema_registry.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -63,8 +62,7 @@ class TestHarness : public PolicyProviderTestHarness { }; TestHarness::TestHarness(PolicyLevel level) - : PolicyProviderTestHarness(level, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD) { -} + : PolicyProviderTestHarness(level, POLICY_SCOPE_USER) {} TestHarness::~TestHarness() {} @@ -89,7 +87,6 @@ void TestHarness::InstallStringPolicy(const std::string& policy_name, store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), - POLICY_SOURCE_CLOUD, new base::StringValue(policy_value), nullptr); } @@ -99,9 +96,7 @@ void TestHarness::InstallIntegerPolicy(const std::string& policy_name, store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), - POLICY_SOURCE_CLOUD, - new base:: - FundamentalValue(policy_value), + new base::FundamentalValue(policy_value), nullptr); } @@ -110,31 +105,21 @@ void TestHarness::InstallBooleanPolicy(const std::string& policy_name, store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), - POLICY_SOURCE_CLOUD, - new base:: - FundamentalValue(policy_value), + new base::FundamentalValue(policy_value), nullptr); } void TestHarness::InstallStringListPolicy(const std::string& policy_name, const base::ListValue* policy_value) { - store_.policy_map_.Set(policy_name, - policy_level(), - policy_scope(), - POLICY_SOURCE_CLOUD, - policy_value->DeepCopy(), - nullptr); + store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), + policy_value->DeepCopy(), nullptr); } void TestHarness::InstallDictionaryPolicy( const std::string& policy_name, const base::DictionaryValue* policy_value) { - store_.policy_map_.Set(policy_name, - policy_level(), - policy_scope(), - POLICY_SOURCE_CLOUD, - policy_value->DeepCopy(), - nullptr); + store_.policy_map_.Set(policy_name, policy_level(), policy_scope(), + policy_value->DeepCopy(), nullptr); } // static @@ -191,7 +176,6 @@ class CloudPolicyManagerTest : public testing::Test { policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value"), nullptr); expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) diff --git a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc index 9f181bf..ee8dbd0 100644 --- a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc +++ b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc @@ -129,13 +129,11 @@ class ComponentCloudPolicyServiceTest : public testing::Test { expected_policy_.Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("disabled"), nullptr); expected_policy_.Set("Second", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("maybe"), nullptr); } @@ -516,7 +514,6 @@ TEST_F(ComponentCloudPolicyServiceTest, LoadInvalidPolicyFromCache) { expected_bundle.Get(ns).Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("published"), nullptr); EXPECT_TRUE(service_->policy().Equals(expected_bundle)); diff --git a/components/policy/core/common/cloud/component_cloud_policy_store.cc b/components/policy/core/common/cloud/component_cloud_policy_store.cc index b836ceb..5e2874d 100644 --- a/components/policy/core/common/cloud/component_cloud_policy_store.cc +++ b/components/policy/core/common/cloud/component_cloud_policy_store.cc @@ -13,7 +13,6 @@ #include "components/policy/core/common/cloud/cloud_policy_validator.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "crypto/sha2.h" #include "policy/proto/chrome_extension_policy.pb.h" #include "policy/proto/device_management_backend.pb.h" @@ -354,8 +353,7 @@ bool ComponentCloudPolicyStore::ParsePolicy(const std::string& data, // If policy for components is ever used for device-level settings then // this must support a configurable scope; assuming POLICY_SCOPE_USER is // fine for now. - policy->Set(it.key(), level, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - value.release(), nullptr); + policy->Set(it.key(), level, POLICY_SCOPE_USER, value.release(), NULL); } return true; diff --git a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc index 056c0f7..e3b15e4 100644 --- a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc +++ b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc @@ -17,7 +17,6 @@ #include "components/policy/core/common/cloud/policy_builder.h" #include "components/policy/core/common/cloud/resource_cache.h" #include "components/policy/core/common/external_data_fetcher.h" -#include "components/policy/core/common/policy_types.h" #include "crypto/sha2.h" #include "policy/proto/chrome_extension_policy.pb.h" #include "policy/proto/device_management_backend.pb.h" @@ -89,13 +88,11 @@ class ComponentCloudPolicyStoreTest : public testing::Test { policy.Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("disabled"), NULL); policy.Set("Second", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("maybe"), NULL); } diff --git a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc index 4e0e220..3412cc0 100644 --- a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc +++ b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc @@ -111,13 +111,11 @@ void ComponentCloudPolicyUpdaterTest::SetUp() { policy.Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("disabled"), NULL); policy.Set("Second", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("maybe"), NULL); } diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc index 17798fe..ee6cdec 100644 --- a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc +++ b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc @@ -11,7 +11,6 @@ #include "components/policy/core/common/cloud/mock_user_cloud_policy_store.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema_registry.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gmock/include/gmock/gmock.h" @@ -36,7 +35,6 @@ class UserCloudPolicyManagerTest : public testing::Test { policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value"), NULL); expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) diff --git a/components/policy/core/common/config_dir_policy_loader.cc b/components/policy/core/common/config_dir_policy_loader.cc index b81bfa9..b39d838 100644 --- a/components/policy/core/common/config_dir_policy_loader.cc +++ b/components/policy/core/common/config_dir_policy_loader.cc @@ -18,7 +18,6 @@ #include "base/stl_util.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_load_status.h" -#include "components/policy/core/common/policy_types.h" namespace policy { @@ -166,8 +165,7 @@ void ConfigDirPolicyLoader::LoadFromPath(const base::FilePath& path, // Add chrome policy. PolicyMap policy_map; - policy_map.LoadFrom(dictionary_value, level, scope_, - POLICY_SOURCE_PLATFORM); + policy_map.LoadFrom(dictionary_value, level, scope_); bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) .MergeFrom(policy_map); } @@ -217,7 +215,7 @@ void ConfigDirPolicyLoader::Merge3rdPartyPolicy( } PolicyMap policy; - policy.LoadFrom(policy_dictionary, level, scope_, POLICY_SOURCE_PLATFORM); + policy.LoadFrom(policy_dictionary, level, scope_); bundle->Get(PolicyNamespace(domain, components_it.key())) .MergeFrom(policy); } diff --git a/components/policy/core/common/config_dir_policy_loader_unittest.cc b/components/policy/core/common/config_dir_policy_loader_unittest.cc index 680621c..94b233d 100644 --- a/components/policy/core/common/config_dir_policy_loader_unittest.cc +++ b/components/policy/core/common/config_dir_policy_loader_unittest.cc @@ -15,7 +15,6 @@ #include "components/policy/core/common/configuration_policy_provider_test.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" namespace policy { @@ -69,9 +68,7 @@ class TestHarness : public PolicyProviderTestHarness { }; TestHarness::TestHarness() - : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM), + : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE), next_policy_file_index_(100) {} TestHarness::~TestHarness() {} @@ -228,8 +225,7 @@ TEST_F(ConfigDirPolicyLoaderTest, ReadPrefsMergePrefs) { ASSERT_TRUE(bundle.get()); PolicyBundle expected_bundle; expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) - .LoadFrom(&test_dict_foo, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM); + .LoadFrom(&test_dict_foo, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); EXPECT_TRUE(bundle->Equals(expected_bundle)); } diff --git a/components/policy/core/common/configuration_policy_provider_test.cc b/components/policy/core/common/configuration_policy_provider_test.cc index a9d2ecb..0f407e5 100644 --- a/components/policy/core/common/configuration_policy_provider_test.cc +++ b/components/policy/core/common/configuration_policy_provider_test.cc @@ -13,7 +13,6 @@ #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" -#include "components/policy/core/common/policy_types.h" #include "testing/gmock/include/gmock/gmock.h" using ::testing::Mock; @@ -147,9 +146,8 @@ bool PolicyTestBase::RegisterSchema(const PolicyNamespace& ns, } PolicyProviderTestHarness::PolicyProviderTestHarness(PolicyLevel level, - PolicyScope scope, - PolicySource source) - : level_(level), scope_(scope), source_(source) {} + PolicyScope scope) + : level_(level), scope_(scope) {} PolicyProviderTestHarness::~PolicyProviderTestHarness() {} @@ -161,10 +159,6 @@ PolicyScope PolicyProviderTestHarness::policy_scope() const { return scope_; } -PolicySource PolicyProviderTestHarness::policy_source() const { - return source_; -} - void PolicyProviderTestHarness::Install3rdPartyPolicy( const base::DictionaryValue* policies) { FAIL(); @@ -230,7 +224,6 @@ void ConfigurationPolicyProviderTest::CheckValue( .Set(policy_name, test_harness_->policy_level(), test_harness_->policy_scope(), - test_harness_->policy_source(), expected_value.DeepCopy(), NULL); EXPECT_TRUE(provider_->policies().Equals(expected_bundle)); @@ -347,7 +340,6 @@ TEST_P(ConfigurationPolicyProviderTest, RefreshPolicies) { .Set(test_keys::kKeyString, test_harness_->policy_level(), test_harness_->policy_scope(), - test_harness_->policy_source(), new base::StringValue("value"), NULL); EXPECT_TRUE(provider_->policies().Equals(bundle)); @@ -400,7 +392,6 @@ TEST_P(Configuration3rdPartyPolicyProviderTest, Load3rdParty) { expected_policy.Set(test_keys::kKeyDictionary, test_harness_->policy_level(), test_harness_->policy_scope(), - test_harness_->policy_source(), policy_dict.DeepCopy(), NULL); PolicyBundle expected_bundle; @@ -409,8 +400,7 @@ TEST_P(Configuration3rdPartyPolicyProviderTest, Load3rdParty) { expected_policy.Clear(); expected_policy.LoadFrom(&policy_dict, test_harness_->policy_level(), - test_harness_->policy_scope(), - test_harness_->policy_source()); + test_harness_->policy_scope()); expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")) .CopyFrom(expected_policy); diff --git a/components/policy/core/common/configuration_policy_provider_test.h b/components/policy/core/common/configuration_policy_provider_test.h index 60bc6e4..a8a0d43 100644 --- a/components/policy/core/common/configuration_policy_provider_test.h +++ b/components/policy/core/common/configuration_policy_provider_test.h @@ -65,11 +65,9 @@ class PolicyTestBase : public testing::Test { // ConfigurationPolicyProviderTest below. class PolicyProviderTestHarness { public: - // |level|, |scope| and |source| are the level, scope and source of the - // policies returned by the providers from CreateProvider(). - PolicyProviderTestHarness(PolicyLevel level, - PolicyScope scope, - PolicySource source); + // |level| and |scope| are the level and scope of the policies returned by + // the providers from CreateProvider(). + PolicyProviderTestHarness(PolicyLevel level, PolicyScope scope); virtual ~PolicyProviderTestHarness(); // Actions to run at gtest SetUp() time. @@ -80,10 +78,9 @@ class PolicyProviderTestHarness { SchemaRegistry* registry, scoped_refptr<base::SequencedTaskRunner> task_runner) = 0; - // Returns the policy level, scope and source set by the policy provider. + // Returns the policy level and scope set by the policy provider. PolicyLevel policy_level() const; PolicyScope policy_scope() const; - PolicySource policy_source() const; // Helpers to configure the environment the policy provider reads from. virtual void InstallEmptyPolicy() = 0; @@ -106,7 +103,6 @@ class PolicyProviderTestHarness { private: PolicyLevel level_; PolicyScope scope_; - PolicySource source_; DISALLOW_COPY_AND_ASSIGN(PolicyProviderTestHarness); }; diff --git a/components/policy/core/common/generate_policy_source_unittest.cc b/components/policy/core/common/generate_policy_source_unittest.cc index 641aefc..e06919c 100644 --- a/components/policy/core/common/generate_policy_source_unittest.cc +++ b/components/policy/core/common/generate_policy_source_unittest.cc @@ -220,7 +220,6 @@ TEST(GeneratePolicySource, SetEnterpriseDefaults) { policy_map.Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("test_value"), NULL); SetEnterpriseUsersDefaults(&policy_map); diff --git a/components/policy/core/common/policy_bundle_unittest.cc b/components/policy/core/common/policy_bundle_unittest.cc index 53a9d75..747ead6 100644 --- a/components/policy/core/common/policy_bundle_unittest.cc +++ b/components/policy/core/common/policy_bundle_unittest.cc @@ -9,7 +9,6 @@ #include "base/values.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { @@ -31,19 +30,16 @@ void AddTestPolicies(PolicyMap* policy) { policy->Set("mandatory-user", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(123), NULL); policy->Set("mandatory-machine", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue("omg"), NULL); policy->Set("recommended-user", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); base::DictionaryValue* dict = new base::DictionaryValue(); @@ -51,7 +47,7 @@ void AddTestPolicies(PolicyMap* policy) { dict->SetInteger("int", 456); dict->SetString("str", "bbq"); policy->Set("recommended-machine", POLICY_LEVEL_RECOMMENDED, - POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, dict, nullptr); + POLICY_SCOPE_MACHINE, dict, NULL); } // Adds test policies to |policy| based on the parameters: @@ -66,15 +62,13 @@ void AddTestPoliciesWithParams(PolicyMap *policy, policy->Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(value), NULL); - policy->Set(kPolicyClashing1, level, scope, POLICY_SOURCE_CLOUD, - new base::FundamentalValue(value), nullptr); + policy->Set( + kPolicyClashing1, level, scope, new base::FundamentalValue(value), NULL); policy->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(value), NULL); } @@ -206,31 +200,26 @@ TEST(PolicyBundleTest, MergeFrom) { expected.Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); expected.Set(kPolicyClashing1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1), NULL); expected.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); expected.Set(kPolicy1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1), NULL); expected.Set(kPolicy2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(2), NULL); EXPECT_TRUE(merged.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, @@ -274,7 +263,6 @@ TEST(PolicyBundleTest, Equals) { .Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(123), NULL); EXPECT_FALSE(bundle.Equals(other)); @@ -284,7 +272,6 @@ TEST(PolicyBundleTest, Equals) { .Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(123), NULL); EXPECT_FALSE(bundle.Equals(other)); @@ -298,7 +285,6 @@ TEST(PolicyBundleTest, Equals) { policy_map.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(123), NULL); EXPECT_FALSE(bundle.Equals(other)); diff --git a/components/policy/core/common/policy_loader_ios.mm b/components/policy/core/common/policy_loader_ios.mm index c728a25..eae6488 100644 --- a/components/policy/core/common/policy_loader_ios.mm +++ b/components/policy/core/common/policy_loader_ios.mm @@ -177,8 +177,7 @@ void PolicyLoaderIOS::LoadNSDictionaryToPolicyBundle(NSDictionary* dictionary, base::DictionaryValue* dict = NULL; if (value && value->GetAsDictionary(&dict)) { PolicyMap& map = bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, "")); - map.LoadFrom(dict, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM); + map.LoadFrom(dict, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE); } } diff --git a/components/policy/core/common/policy_loader_ios_unittest.mm b/components/policy/core/common/policy_loader_ios_unittest.mm index dba3991..f22d37f 100644 --- a/components/policy/core/common/policy_loader_ios_unittest.mm +++ b/components/policy/core/common/policy_loader_ios_unittest.mm @@ -16,7 +16,6 @@ #include "components/policy/core/common/policy_loader_ios.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_test_utils.h" -#include "components/policy/core/common/policy_types.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { @@ -69,8 +68,7 @@ class TestHarness : public PolicyProviderTestHarness { }; TestHarness::TestHarness(bool use_encoded_key) - : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM), + : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE), use_encoded_key_(use_encoded_key) {} TestHarness::~TestHarness() { @@ -253,11 +251,9 @@ TEST(PolicyProviderIOSTest, ChromePolicyOverEncodedChromePolicy) { PolicyMap& expectedMap = expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, "")); expectedMap.Set("shared", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue("right"), - nullptr); + new base::StringValue("right"), NULL); expectedMap.Set("key2", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue("value2"), - nullptr); + new base::StringValue("value2"), NULL); scoped_refptr<base::TestSimpleTaskRunner> taskRunner = new base::TestSimpleTaskRunner(); diff --git a/components/policy/core/common/policy_loader_mac.mm b/components/policy/core/common/policy_loader_mac.mm index 2f8001d..e10735b 100644 --- a/components/policy/core/common/policy_loader_mac.mm +++ b/components/policy/core/common/policy_loader_mac.mm @@ -86,8 +86,8 @@ scoped_ptr<PolicyBundle> PolicyLoaderMac::Load() { // TODO(joaodasilva): figure the policy scope. scoped_ptr<base::Value> policy = PropertyToValue(value); if (policy) { - chrome_policy.Set(it.key(), level, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, policy.release(), nullptr); + chrome_policy.Set(it.key(), level, POLICY_SCOPE_USER, policy.release(), + NULL); } else { status.Add(POLICY_LOAD_STATUS_PARSE_ERROR); } @@ -180,8 +180,8 @@ void PolicyLoaderMac::LoadPolicyForComponent( forced ? POLICY_LEVEL_MANDATORY : POLICY_LEVEL_RECOMMENDED; scoped_ptr<base::Value> policy_value = PropertyToValue(value); if (policy_value) { - policy->Set(it.key(), level, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM, - policy_value.release(), nullptr); + policy->Set(it.key(), level, POLICY_SCOPE_USER, policy_value.release(), + NULL); } } } diff --git a/components/policy/core/common/policy_loader_mac_unittest.cc b/components/policy/core/common/policy_loader_mac_unittest.cc index 6c9b650..ec18d31 100644 --- a/components/policy/core/common/policy_loader_mac_unittest.cc +++ b/components/policy/core/common/policy_loader_mac_unittest.cc @@ -17,7 +17,6 @@ #include "components/policy/core/common/policy_loader_mac.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_test_utils.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/preferences_mock_mac.h" #include "testing/gtest/include/gtest/gtest.h" @@ -60,8 +59,7 @@ class TestHarness : public PolicyProviderTestHarness { }; TestHarness::TestHarness() - : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM) {} + : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER) {} TestHarness::~TestHarness() {} @@ -192,7 +190,6 @@ TEST_F(PolicyLoaderMacTest, TestNonForcedValue) { .Set(test_keys::kKeyString, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, new base::StringValue("string value"), NULL); EXPECT_TRUE(provider_->policies().Equals(expected_bundle)); diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc index 279a936..3516754 100644 --- a/components/policy/core/common/policy_loader_win.cc +++ b/components/policy/core/common/policy_loader_win.cc @@ -44,7 +44,6 @@ #include "components/policy/core/common/policy_load_status.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_namespace.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/preg_parser_win.h" #include "components/policy/core/common/registry_dict_win.h" #include "components/policy/core/common/schema.h" @@ -172,7 +171,7 @@ void FilterUntrustedPolicy(PolicyMap* policy) { } if (invalid_policies) { policy->Set(key::kExtensionInstallForcelist, - map_entry->level, map_entry->scope, map_entry->source, + map_entry->level, map_entry->scope, filtered_values.release(), map_entry->external_data_fetcher); @@ -330,7 +329,7 @@ void ParsePolicy(const RegistryDict* gpo_dict, return; } - policy->LoadFrom(policy_dict, level, scope, POLICY_SOURCE_PLATFORM); + policy->LoadFrom(policy_dict, level, scope); } // Collects stats about the enterprise environment that can be used to decide diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc index 52bd224..c0afc4e 100644 --- a/components/policy/core/common/policy_loader_win_unittest.cc +++ b/components/policy/core/common/policy_loader_win_unittest.cc @@ -34,7 +34,6 @@ #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/preg_parser_win.h" #include "components/policy/core/common/schema_map.h" #include "testing/gtest/include/gtest/gtest.h" @@ -334,10 +333,7 @@ void ScopedGroupPolicyRegistrySandbox::DeleteKeys() { } RegistryTestHarness::RegistryTestHarness(HKEY hive, PolicyScope scope) - : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, scope, - POLICY_SOURCE_PLATFORM), - hive_(hive) { -} + : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, scope), hive_(hive) {} RegistryTestHarness::~RegistryTestHarness() {} @@ -459,9 +455,7 @@ PolicyProviderTestHarness* RegistryTestHarness::CreateHKLM() { } PRegTestHarness::PRegTestHarness() - : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM) { -} + : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE) {} PRegTestHarness::~PRegTestHarness() {} @@ -764,8 +758,7 @@ class PolicyLoaderWinTest : public PolicyTestBase, expected_policy.SetString(test_keys::kKeyString, "registry"); PolicyBundle expected; expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) - .LoadFrom(&expected_policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM); + .LoadFrom(&expected_policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); return Matches(expected); } @@ -781,7 +774,7 @@ class PolicyLoaderWinTest : public PolicyTestBase, PolicyBundle expected; expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) .LoadFrom(&expected_policy, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM); + POLICY_SCOPE_MACHINE); return Matches(expected); } @@ -810,7 +803,6 @@ TEST_F(PolicyLoaderWinTest, HKLMOverHKCU) { .Set(test_keys::kKeyString, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue("hklm"), NULL); EXPECT_TRUE(Matches(expected)); @@ -865,25 +857,21 @@ TEST_F(PolicyLoaderWinTest, Merge3rdPartyPolicies) { expected_policy.Set("a", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue(kMachineMandatory), NULL); expected_policy.Set("b", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, new base::StringValue(kUserMandatory), NULL); expected_policy.Set("c", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue(kMachineRecommended), NULL); expected_policy.Set("d", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, new base::StringValue(kUserRecommended), NULL); EXPECT_TRUE(Matches(expected)); @@ -942,8 +930,7 @@ TEST_F(PolicyLoaderWinTest, LoadStringEncodedValues) { InstallValue(encoded_policy, HKEY_CURRENT_USER, kPathSuffix, kMandatory)); PolicyBundle expected; - expected.Get(ns).LoadFrom(&policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM); + expected.Get(ns).LoadFrom(&policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); EXPECT_TRUE(Matches(expected)); } @@ -975,8 +962,7 @@ TEST_F(PolicyLoaderWinTest, LoadIntegerEncodedValues) { policy.SetInteger("int", 123); policy.SetDouble("double", 456.0); PolicyBundle expected; - expected.Get(ns).LoadFrom(&policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM); + expected.Get(ns).LoadFrom(&policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); EXPECT_TRUE(Matches(expected)); } @@ -1026,8 +1012,8 @@ TEST_F(PolicyLoaderWinTest, DefaultPropertySchemaType) { base::DictionaryValue expected_policies; expected_policies.Set("policy", expected_policy.DeepCopy()); PolicyBundle expected; - expected.Get(ns).LoadFrom(&expected_policies, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM); + expected.Get(ns).LoadFrom( + &expected_policies, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); EXPECT_TRUE(Matches(expected)); } @@ -1192,12 +1178,12 @@ TEST_F(PolicyLoaderWinTest, LoadExtensionPolicyAlternativeSpelling) { base::DictionaryValue expected_a; expected_a.SetInteger("policy 1", 3); expected_a.SetInteger("policy 2", 3); - expected.Get(ns_a).LoadFrom(&expected_a, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM); + expected.Get(ns_a).LoadFrom( + &expected_a, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE); base::DictionaryValue expected_b; expected_b.SetInteger("policy 1", 2); - expected.Get(ns_b).LoadFrom(&expected_b, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM); + expected.Get(ns_b).LoadFrom( + &expected_b, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE); EXPECT_TRUE(Matches(expected)); } @@ -1233,10 +1219,9 @@ TEST_F(PolicyLoaderWinTest, LBSSupport) { PolicyMap& expected_policy = expected.Get(ns); expected_policy.Set("alternative_browser_path", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue("c:\\legacy\\browser.exe"), NULL); expected_policy.Set("url_list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, list.DeepCopy(), nullptr); + list.DeepCopy(), NULL); EXPECT_TRUE(Matches(expected)); } diff --git a/components/policy/core/common/policy_map.cc b/components/policy/core/common/policy_map.cc index 84b8fd8..5e1fd5b 100644 --- a/components/policy/core/common/policy_map.cc +++ b/components/policy/core/common/policy_map.cc @@ -28,7 +28,6 @@ scoped_ptr<PolicyMap::Entry> PolicyMap::Entry::DeepCopy() const { scoped_ptr<Entry> copy(new Entry); copy->level = level; copy->scope = scope; - copy->source = source; if (value) copy->value = value->DeepCopy(); if (external_data_fetcher) { @@ -49,8 +48,6 @@ bool PolicyMap::Entry::has_higher_priority_than( bool PolicyMap::Entry::Equals(const PolicyMap::Entry& other) const { return level == other.level && scope == other.scope && - source == other.source && // Necessary for PolicyUIHandler observers. - // They have to update when sources change. base::Value::Equals(value, other.value) && ExternalDataFetcher::Equals(external_data_fetcher, other.external_data_fetcher); @@ -76,14 +73,12 @@ const base::Value* PolicyMap::GetValue(const std::string& policy) const { void PolicyMap::Set(const std::string& policy, PolicyLevel level, PolicyScope scope, - PolicySource source, base::Value* value, ExternalDataFetcher* external_data_fetcher) { Entry& entry = map_[policy]; entry.DeleteOwnedMembers(); entry.level = level; entry.scope = scope; - entry.source = source; entry.value = value; entry.external_data_fetcher = external_data_fetcher; } @@ -104,11 +99,9 @@ void PolicyMap::CopyFrom(const PolicyMap& other) { Clear(); for (const_iterator it = other.begin(); it != other.end(); ++it) { const Entry& entry = it->second; - Set(it->first, entry.level, entry.scope, entry.source, - entry.value->DeepCopy(), - entry.external_data_fetcher - ? new ExternalDataFetcher(*entry.external_data_fetcher) - : nullptr); + Set(it->first, entry.level, entry.scope, + entry.value->DeepCopy(), entry.external_data_fetcher ? + new ExternalDataFetcher(*entry.external_data_fetcher) : NULL); } } @@ -122,12 +115,10 @@ void PolicyMap::MergeFrom(const PolicyMap& other) { for (const_iterator it = other.begin(); it != other.end(); ++it) { const Entry* entry = Get(it->first); if (!entry || it->second.has_higher_priority_than(*entry)) { - Set(it->first, it->second.level, it->second.scope, it->second.source, - it->second.value->DeepCopy(), - it->second.external_data_fetcher - ? new ExternalDataFetcher( - *it->second.external_data_fetcher) - : nullptr); + Set(it->first, it->second.level, it->second.scope, + it->second.value->DeepCopy(), it->second.external_data_fetcher ? + new ExternalDataFetcher(*it->second.external_data_fetcher) : + NULL); } } } @@ -135,11 +126,10 @@ void PolicyMap::MergeFrom(const PolicyMap& other) { void PolicyMap::LoadFrom( const base::DictionaryValue* policies, PolicyLevel level, - PolicyScope scope, - PolicySource source) { + PolicyScope scope) { for (base::DictionaryValue::Iterator it(*policies); !it.IsAtEnd(); it.Advance()) { - Set(it.key(), level, scope, source, it.value().DeepCopy(), nullptr); + Set(it.key(), level, scope, it.value().DeepCopy(), NULL); } } diff --git a/components/policy/core/common/policy_map.h b/components/policy/core/common/policy_map.h index 8ff480a..7d0d06b 100644 --- a/components/policy/core/common/policy_map.h +++ b/components/policy/core/common/policy_map.h @@ -28,9 +28,6 @@ class POLICY_EXPORT PolicyMap { base::Value* value; ExternalDataFetcher* external_data_fetcher; - // For debugging and displaying only. Set by provider delivering the policy. - PolicySource source; - Entry(); // Deletes all members owned by |this|. @@ -66,7 +63,6 @@ class POLICY_EXPORT PolicyMap { void Set(const std::string& policy, PolicyLevel level, PolicyScope scope, - PolicySource source, base::Value* value, ExternalDataFetcher* external_data_fetcher); @@ -89,12 +85,11 @@ class POLICY_EXPORT PolicyMap { void MergeFrom(const PolicyMap& other); // Loads the values in |policies| into this PolicyMap. All policies loaded - // will have |level|, |scope| and |source| in their entries. Existing entries - // are replaced. + // will have |level| and |scope| in their entries. Existing entries are + // replaced. void LoadFrom(const base::DictionaryValue* policies, PolicyLevel level, - PolicyScope scope, - PolicySource source); + PolicyScope scope); // Compares this value map against |other| and stores all key names that have // different values or reference different external data in |differing_keys|. diff --git a/components/policy/core/common/policy_map_unittest.cc b/components/policy/core/common/policy_map_unittest.cc index 58dfcac..356cabc 100644 --- a/components/policy/core/common/policy_map_unittest.cc +++ b/components/policy/core/common/policy_map_unittest.cc @@ -7,7 +7,6 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "components/policy/core/common/external_data_manager.h" -#include "components/policy/core/common/policy_types.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { @@ -26,14 +25,13 @@ const char kTestPolicyName8[] = "policy.test.8"; // Utility functions for the tests. void SetPolicy(PolicyMap* map, const char* name, base::Value* value) { - map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - value, nullptr); + map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, value, NULL); } void SetPolicy(PolicyMap* map, const char* name, ExternalDataFetcher* external_data_fetcher) { - map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, + map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, NULL, external_data_fetcher); } @@ -66,17 +64,15 @@ TEST_F(PolicyMapTest, SetAndGet) { ASSERT_TRUE(entry != NULL); EXPECT_EQ(POLICY_LEVEL_MANDATORY, entry->level); EXPECT_EQ(POLICY_SCOPE_USER, entry->scope); - EXPECT_EQ(POLICY_SOURCE_CLOUD, entry->source); EXPECT_TRUE(ExternalDataFetcher::Equals( entry->external_data_fetcher, CreateExternalDataFetcher("dummy").get())); - map.Set(kTestPolicyName1, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr, nullptr); + map.Set(kTestPolicyName1, POLICY_LEVEL_RECOMMENDED, + POLICY_SCOPE_MACHINE, NULL, NULL); EXPECT_FALSE(map.GetValue(kTestPolicyName1)); entry = map.Get(kTestPolicyName1); ASSERT_TRUE(entry != NULL); EXPECT_EQ(POLICY_LEVEL_RECOMMENDED, entry->level); EXPECT_EQ(POLICY_SCOPE_MACHINE, entry->scope); - EXPECT_EQ(POLICY_SOURCE_ENTERPRISE_DEFAULT, entry->source); EXPECT_FALSE(entry->external_data_fetcher); } @@ -168,30 +164,24 @@ TEST_F(PolicyMapTest, MergeFrom) { a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("google.com"), NULL); a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); a.Set(kTestPolicyName3, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_DEFAULT, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, NULL, CreateExternalDataFetcher("a").release()); a.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue("google.com/q={x}"), NULL); @@ -199,36 +189,29 @@ TEST_F(PolicyMapTest, MergeFrom) { b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue("chromium.org"), NULL); b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); b.Set(kTestPolicyName3, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, NULL, CreateExternalDataFetcher("b").release()); b.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue(true), NULL); b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue(std::string()), NULL); b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); @@ -239,40 +222,33 @@ TEST_F(PolicyMapTest, MergeFrom) { c.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue("chromium.org"), NULL); // |a| has precedence over |b|. c.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); c.Set(kTestPolicyName3, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_DEFAULT, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, NULL, CreateExternalDataFetcher("a").release()); // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER for POLICY_LEVEL_RECOMMENDED. c.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_ENTERPRISE_OVERRIDE, new base::FundamentalValue(true), NULL); // POLICY_LEVEL_MANDATORY over POLICY_LEVEL_RECOMMENDED. c.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue(std::string()), NULL); // Merge new ones. c.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); @@ -284,41 +260,32 @@ TEST_F(PolicyMapTest, GetDifferingKeys) { a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("google.com"), NULL); a.Set(kTestPolicyName2, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, NULL, CreateExternalDataFetcher("dummy").release()); a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); a.Set(kTestPolicyName4, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, NULL, CreateExternalDataFetcher("a").release()); a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); a.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::StringValue("google.com/q={x}"), NULL); a.Set(kTestPolicyName7, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); @@ -326,41 +293,32 @@ TEST_F(PolicyMapTest, GetDifferingKeys) { b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("google.com"), NULL); b.Set(kTestPolicyName2, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, NULL, CreateExternalDataFetcher("dummy").release()); b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); b.Set(kTestPolicyName4, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_MACHINE, - POLICY_SOURCE_CLOUD, + POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, NULL, CreateExternalDataFetcher("b").release()); b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("google.com/q={x}"), NULL); b.Set(kTestPolicyName8, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); @@ -389,38 +347,4 @@ TEST_F(PolicyMapTest, GetDifferingKeys) { EXPECT_EQ(6u, diff.size()); } -TEST_F(PolicyMapTest, LoadFromSetsLevelScopeAndSource) { - base::DictionaryValue policies; - policies.SetString("TestPolicy1", "google.com"); - policies.SetBoolean("TestPolicy2", true); - policies.SetInteger("TestPolicy3", -12321); - - PolicyMap loaded; - loaded.LoadFrom(&policies, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM); - - PolicyMap expected; - expected.Set("TestPolicy1", - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, - new base::StringValue("google.com"), - nullptr); - expected.Set("TestPolicy2", - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, - new base::FundamentalValue(true), - nullptr); - expected.Set("TestPolicy3", - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - POLICY_SOURCE_PLATFORM, - new base::FundamentalValue(-12321), - nullptr); - EXPECT_TRUE(loaded.Equals(expected)); -} - } // namespace policy diff --git a/components/policy/core/common/policy_service_impl.cc b/components/policy/core/common/policy_service_impl.cc index 2820767..96922ac 100644 --- a/components/policy/core/common/policy_service_impl.cc +++ b/components/policy/core/common/policy_service_impl.cc @@ -14,7 +14,6 @@ #include "base/values.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" namespace policy { @@ -42,7 +41,6 @@ void FixDeprecatedPolicies(PolicyMap* policies) { // The highest (level, scope) pair for an existing proxy policy is determined // first, and then only policies with those exact attributes are merged. PolicyMap::Entry current_priority; // Defaults to the lowest priority. - PolicySource inherited_source = POLICY_SOURCE_ENTERPRISE_DEFAULT; scoped_ptr<base::DictionaryValue> proxy_settings(new base::DictionaryValue); for (size_t i = 0; i < arraysize(kProxyPolicies); ++i) { const PolicyMap::Entry* entry = policies->Get(kProxyPolicies[i]); @@ -50,8 +48,6 @@ void FixDeprecatedPolicies(PolicyMap* policies) { if (entry->has_higher_priority_than(current_priority)) { proxy_settings->Clear(); current_priority = *entry; - if (entry->source > inherited_source) // Higher priority? - inherited_source = entry->source; } if (!entry->has_higher_priority_than(current_priority) && !current_priority.has_higher_priority_than(*entry)) { @@ -68,7 +64,6 @@ void FixDeprecatedPolicies(PolicyMap* policies) { policies->Set(key::kProxySettings, current_priority.level, current_priority.scope, - inherited_source, proxy_settings.release(), NULL); } diff --git a/components/policy/core/common/policy_service_impl_unittest.cc b/components/policy/core/common/policy_service_impl_unittest.cc index d9431f1..ae51237 100644 --- a/components/policy/core/common/policy_service_impl_unittest.cc +++ b/components/policy/core/common/policy_service_impl_unittest.cc @@ -13,7 +13,6 @@ #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/mock_policy_service.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -53,23 +52,19 @@ void AddTestPolicies(PolicyBundle* bundle, policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::StringValue(value), NULL); policy_map->Set( - kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM, - new base::StringValue(value), nullptr); + kDiffLevelPolicy, level, scope, new base::StringValue(value), NULL); policy_map = &bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension)); policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::StringValue(value), NULL); policy_map->Set( - kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM, - new base::StringValue(value), nullptr); + kDiffLevelPolicy, level, scope, new base::StringValue(value), NULL); } // Observer class that changes the policy in the passed provider when the @@ -87,7 +82,6 @@ class ChangePolicyObserver : public PolicyService::Observer { new_policy.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(14), NULL); provider_->UpdateChromePolicy(new_policy); @@ -121,7 +115,6 @@ class PolicyServiceTest : public testing::Test { policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(13), NULL); provider0_.UpdateChromePolicy(policy0_); @@ -174,7 +167,6 @@ TEST_F(PolicyServiceTest, LoadsPoliciesBeforeProvidersRefresh) { expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(13), NULL); EXPECT_TRUE(VerifyPolicies( @@ -189,7 +181,6 @@ TEST_F(PolicyServiceTest, NotifyObservers) { expectedPrevious.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(13), NULL); @@ -198,13 +189,11 @@ TEST_F(PolicyServiceTest, NotifyObservers) { expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(123), NULL); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(123), NULL); EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, @@ -226,13 +215,11 @@ TEST_F(PolicyServiceTest, NotifyObservers) { expectedCurrent.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(456), NULL); policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(456), NULL); EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, @@ -258,13 +245,11 @@ TEST_F(PolicyServiceTest, NotifyObservers) { expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(789), NULL); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(789), NULL); @@ -298,7 +283,6 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) { previous_policy_map.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(13), NULL); PolicyMap policy_map; @@ -306,7 +290,6 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) { policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value"), NULL); @@ -349,7 +332,6 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) { policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("another value"), NULL); bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension1)) @@ -389,13 +371,11 @@ TEST_F(PolicyServiceTest, ObserverChangesPolicy) { policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(123), NULL); policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1234), NULL); // Should not crash. @@ -409,31 +389,26 @@ TEST_F(PolicyServiceTest, Priorities) { expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::FundamentalValue(13), NULL); expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); policy1_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1), NULL); policy2_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(2), NULL); provider0_.UpdateChromePolicy(policy0_); @@ -445,7 +420,6 @@ TEST_F(PolicyServiceTest, Priorities) { expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1), NULL); policy0_.Erase("aaa"); @@ -456,13 +430,11 @@ TEST_F(PolicyServiceTest, Priorities) { expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(2), NULL); policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1), NULL); provider1_.UpdateChromePolicy(policy1_); @@ -490,14 +462,14 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { base::FundamentalValue kValue0(0); EXPECT_CALL(*this, OnPolicyValueUpdated(NULL, ValueEquals(&kValue0))); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr); + kValue0.DeepCopy(), NULL); provider0_.UpdateChromePolicy(policy0_); Mock::VerifyAndClearExpectations(this); // Changing other values doesn't trigger a notification. EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0); policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr); + kValue0.DeepCopy(), NULL); provider0_.UpdateChromePolicy(policy0_); Mock::VerifyAndClearExpectations(this); @@ -506,7 +478,7 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { EXPECT_CALL(*this, OnPolicyValueUpdated(ValueEquals(&kValue0), ValueEquals(&kValue1))); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr); + kValue1.DeepCopy(), NULL); provider0_.UpdateChromePolicy(policy0_); Mock::VerifyAndClearExpectations(this); @@ -520,9 +492,9 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0); registrar.reset(); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr); + kValue1.DeepCopy(), NULL); policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, kValue1.DeepCopy(), nullptr); + kValue1.DeepCopy(), NULL); provider0_.UpdateChromePolicy(policy0_); Mock::VerifyAndClearExpectations(this); } @@ -543,14 +515,14 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); base::FundamentalValue kValue0(0); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr); + kValue0.DeepCopy(), NULL); provider0_.UpdateChromePolicy(policy0_); Mock::VerifyAndClearExpectations(this); EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); base::FundamentalValue kValue1(1); policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr); + kValue1.DeepCopy(), NULL); provider1_.UpdateChromePolicy(policy1_); Mock::VerifyAndClearExpectations(this); @@ -559,7 +531,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { // refreshed. EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); policy1_.Set("bbb", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue1.DeepCopy(), nullptr); + kValue1.DeepCopy(), NULL); provider1_.UpdateChromePolicy(policy1_); Mock::VerifyAndClearExpectations(this); @@ -574,7 +546,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); policy2_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue0.DeepCopy(), nullptr); + kValue0.DeepCopy(), NULL); provider2_.UpdateChromePolicy(policy2_); Mock::VerifyAndClearExpectations(this); @@ -582,7 +554,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { EXPECT_CALL(*this, OnPolicyRefresh()).Times(2); base::FundamentalValue kValue2(2); policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, kValue2.DeepCopy(), nullptr); + kValue2.DeepCopy(), NULL); provider0_.UpdateChromePolicy(policy0_); provider1_.UpdateChromePolicy(policy1_); Mock::VerifyAndClearExpectations(this); @@ -616,7 +588,6 @@ TEST_F(PolicyServiceTest, NamespaceMerge) { expected.Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_ENTERPRISE_DEFAULT, new base::StringValue("bundle0"), NULL); // For policies with different levels and scopes, the highest priority @@ -624,7 +595,6 @@ TEST_F(PolicyServiceTest, NamespaceMerge) { expected.Set(kDiffLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, - POLICY_SOURCE_PLATFORM, new base::StringValue("bundle2"), NULL); EXPECT_TRUE(policy_service_->GetPolicies( @@ -724,7 +694,6 @@ TEST_F(PolicyServiceTest, FixDeprecatedPolicies) { policy_map.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(3), NULL); @@ -733,13 +702,11 @@ TEST_F(PolicyServiceTest, FixDeprecatedPolicies) { policy_map.Set(key::kProxyMode, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("pac_script"), NULL); policy_map.Set(key::kProxyPacUrl, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("http://example.com/wpad.dat"), NULL); @@ -747,7 +714,6 @@ TEST_F(PolicyServiceTest, FixDeprecatedPolicies) { policy_bundle->Get(extension_namespace).Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(3), NULL); @@ -756,15 +722,13 @@ TEST_F(PolicyServiceTest, FixDeprecatedPolicies) { scoped_ptr<base::DictionaryValue> expected_value(new base::DictionaryValue); expected_value->SetInteger(key::kProxyServerMode, 3); expected_chrome.Set(key::kProxySettings, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - expected_value.release(), nullptr); + POLICY_SCOPE_USER, expected_value.release(), NULL); // The resulting Extensions namespace map shouldn't have been modified. PolicyMap expected_extension; expected_extension.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(3), NULL); diff --git a/components/policy/core/common/policy_statistics_collector_unittest.cc b/components/policy/core/common/policy_statistics_collector_unittest.cc index 6d5a0c2..984f63b 100644 --- a/components/policy/core/common/policy_statistics_collector_unittest.cc +++ b/components/policy/core/common/policy_statistics_collector_unittest.cc @@ -109,7 +109,6 @@ class PolicyStatisticsCollectorTest : public testing::Test { policy_map_.Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); } diff --git a/components/policy/core/common/policy_types.h b/components/policy/core/common/policy_types.h index b4dd523..07289ca 100644 --- a/components/policy/core/common/policy_types.h +++ b/components/policy/core/common/policy_types.h @@ -28,26 +28,6 @@ enum PolicyLevel { POLICY_LEVEL_MANDATORY, }; -// The source of a policy indicates where its value is originating from. The -// sources are ordered by priority (with weakest policy first). -enum PolicySource { - // The policy was set because we are running in an enterprise environment. - POLICY_SOURCE_ENTERPRISE_DEFAULT, - - // The policy was set by a cloud source. - POLICY_SOURCE_CLOUD, - - // Any non-platform policy was overridden because we are running in an - // enterprise environment. - POLICY_SOURCE_ENTERPRISE_OVERRIDE, - - // The policy was set by a platform source. - POLICY_SOURCE_PLATFORM, - - // Number of source types. Has to be the last element. - POLICY_SOURCE_COUNT -}; - } // namespace policy #endif // COMPONENTS_POLICY_CORE_COMMON_POLICY_TYPES_H_ diff --git a/components/policy/core/common/proxy_policy_provider_unittest.cc b/components/policy/core/common/proxy_policy_provider_unittest.cc index 9ba9130..09c5da9 100644 --- a/components/policy/core/common/proxy_policy_provider_unittest.cc +++ b/components/policy/core/common/proxy_policy_provider_unittest.cc @@ -6,7 +6,6 @@ #include "base/callback.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/proxy_policy_provider.h" #include "components/policy/core/common/schema_registry.h" #include "testing/gmock/include/gmock/gmock.h" @@ -56,7 +55,6 @@ TEST_F(ProxyPolicyProviderTest, Delegate) { .Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value"), NULL); mock_provider_.UpdatePolicy(CopyBundle(bundle)); @@ -71,7 +69,6 @@ TEST_F(ProxyPolicyProviderTest, Delegate) { .Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("new value"), NULL); mock_provider_.UpdatePolicy(CopyBundle(bundle)); diff --git a/components/policy/core/common/schema_map_unittest.cc b/components/policy/core/common/schema_map_unittest.cc index e19a70d..ef7e336 100644 --- a/components/policy/core/common/schema_map_unittest.cc +++ b/components/policy/core/common/schema_map_unittest.cc @@ -10,7 +10,6 @@ #include "components/policy/core/common/external_data_manager.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/policy/core/common/schema.h" #include "testing/gtest/include/gtest/gtest.h" @@ -142,7 +141,6 @@ TEST_F(SchemaMapTest, FilterBundle) { expected_bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value"), NULL); bundle.CopyFrom(expected_bundle); @@ -152,7 +150,6 @@ TEST_F(SchemaMapTest, FilterBundle) { bundle.Get(another_extension_ns).Set("AnotherExtensionPolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value"), NULL); schema_map->FilterBundle(&bundle); @@ -164,37 +161,32 @@ TEST_F(SchemaMapTest, FilterBundle) { list.AppendString("a"); list.AppendString("b"); map.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, list.DeepCopy(), nullptr); + list.DeepCopy(), NULL); map.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); map.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1), NULL); map.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, base::Value::CreateNullValue().release(), - nullptr); + base::Value::CreateNullValue().release(), NULL); map.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(1.2), NULL); base::DictionaryValue dict; dict.SetString("a", "b"); dict.SetInteger("b", 2); map.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, dict.DeepCopy(), nullptr); + dict.DeepCopy(), NULL); map.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value"), NULL); @@ -202,7 +194,6 @@ TEST_F(SchemaMapTest, FilterBundle) { bundle.Get(extension_ns).Set("Unexpected", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("to-be-removed"), NULL); @@ -215,41 +206,35 @@ TEST_F(SchemaMapTest, FilterBundle) { badmap.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); badmap.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(0), NULL); badmap.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); badmap.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); badmap.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); badmap.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); badmap.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, nullptr, + NULL, new ExternalDataFetcher(base::WeakPtr<ExternalDataManager>(), std::string())); @@ -281,7 +266,6 @@ TEST_F(SchemaMapTest, LegacyComponents) { bundle.Get(extension_ns).Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value 1"), NULL); @@ -290,7 +274,6 @@ TEST_F(SchemaMapTest, LegacyComponents) { bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value 3"), NULL); @@ -302,7 +285,6 @@ TEST_F(SchemaMapTest, LegacyComponents) { bundle.Get(without_schema_ns).Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value 2"), NULL); @@ -310,7 +292,6 @@ TEST_F(SchemaMapTest, LegacyComponents) { bundle.Get(extension_ns).Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value 4"), NULL); @@ -319,7 +300,6 @@ TEST_F(SchemaMapTest, LegacyComponents) { bundle.Get(unknown_ns).Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("value 5"), NULL); diff --git a/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc b/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc index a67b63b..c90d2ea 100644 --- a/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc +++ b/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc @@ -86,7 +86,6 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, PassOnChromePolicy) { bundle.Get(chrome_ns).Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("visible"), NULL); @@ -97,7 +96,6 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, PassOnChromePolicy) { .Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("not visible"), NULL); mock_provider_.UpdatePolicy(delegate_bundle.Pass()); @@ -129,7 +127,6 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, SchemaReadyWithComponents) { policy_map.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("omg"), NULL); scoped_ptr<PolicyBundle> bundle(new PolicyBundle); @@ -181,7 +178,6 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, DelegateUpdates) { policy_map.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("omg"), NULL); // Chrome policy updates are visible even if the components aren't ready. @@ -225,7 +221,6 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, RemoveAndAddComponent) { platform_policy.Get(ns).Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue("omg"), NULL); scoped_ptr<PolicyBundle> copy(new PolicyBundle); diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py index e744758..105a860 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -639,7 +639,6 @@ def _WritePolicyConstantSource(policies, os, f): '#include <climits>\n' '\n' '#include "base/logging.h"\n' - '#include "components/policy/core/common/policy_types.h"\n' '#include "components/policy/core/common/schema_internal.h"\n' '\n' 'namespace policy {\n' @@ -720,7 +719,6 @@ def _WritePolicyConstantSource(policies, os, f): ' policy_map->Set(key::k%s,\n' ' POLICY_LEVEL_MANDATORY,\n' ' POLICY_SCOPE_USER,\n' - ' POLICY_SOURCE_ENTERPRISE_DEFAULT,\n' ' %s,\n' ' NULL);\n' ' }\n' % (policy.name, policy.name, creation_expression)) @@ -901,7 +899,6 @@ CPP_HEAD = ''' #include "components/policy/core/common/cloud/cloud_external_data_manager.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "policy/proto/cloud_policy.pb.h" @@ -1009,12 +1006,9 @@ def _WritePolicyCode(f, policy): f.write(' if (value) {\n') f.write(' ExternalDataFetcher* external_data_fetcher = %s;\n' % _CreateExternalDataFetcher(policy.policy_type, policy.name)) - f.write(' map->Set(key::k%s, \n' % policy.name) - f.write(' level, \n' - ' POLICY_SCOPE_USER, \n' - ' POLICY_SOURCE_CLOUD, \n' - ' value, \n' - ' external_data_fetcher);\n' + f.write(' map->Set(key::k%s, level, POLICY_SCOPE_USER,\n' % + policy.name) + f.write(' value, external_data_fetcher);\n' ' }\n' ' }\n' ' }\n' diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index f9701ce..8433599 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -291,9 +291,6 @@ <message name="IDS_POLICY_HEADER_STATUS" desc="Table header for the column in policy table that contains the policy status."> Status </message> - <message name="IDS_POLICY_HEADER_SOURCE" desc="Table header for the column in policy table that contains the policy source."> - Source - </message> <message name="IDS_POLICY_SHOW_EXPANDED_VALUE" desc="Text for the link that shows the policy value. Used when the policy value is too long to be always visible."> Show value </message> @@ -322,16 +319,4 @@ <message name="IDS_POLICY_INVALID_BOOKMARK" desc="Text displayed in the status column when an entry of the ManagedBookmarks policy is not a valid bookmark."> Ignored invalid bookmark at index <ph name="ENTRY_INDEX">$1<ex>3</ex></ph> </message> - <message name="IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT" desc="Indicates that a policy is set by default in an enterprise environment and can be overridden (for Chrome OS only)."> - Enterprise default - </message> - <message name="IDS_POLICY_SOURCE_CLOUD" desc="Indicates that the policy originates from the cloud."> - Cloud - </message> - <message name="IDS_POLICY_SOURCE_PLATFORM" desc="Indicates that the policy is obtained from the local OS."> - Platform - </message> - <message name="IDS_POLICY_SOURCE_ENTERPRISE_OVERRIDE" desc="Indicates that a policy is enforced in an enterprise environment and can not be overridden (for Chrome OS only)."> - Enterprise override - </message> </grit-part> diff --git a/components/search_engines/default_search_policy_handler_unittest.cc b/components/search_engines/default_search_policy_handler_unittest.cc index c4fdea2..954984b 100644 --- a/components/search_engines/default_search_policy_handler_unittest.cc +++ b/components/search_engines/default_search_policy_handler_unittest.cc @@ -5,7 +5,6 @@ #include "base/memory/scoped_ptr.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/configuration_policy_pref_store_test.h" -#include "components/policy/core/common/policy_types.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/default_search_policy_handler.h" #include "components/search_engines/search_engines_pref_names.h" @@ -86,66 +85,55 @@ void DefaultSearchPolicyHandlerTest:: policy->Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kSearchURL), NULL); policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kName), NULL); policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kKeyword), NULL); policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kSuggestURL), NULL); policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kIconURL), NULL); policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, encodings, nullptr); + POLICY_SCOPE_USER, encodings, NULL); policy->Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - default_alternate_urls_.DeepCopy(), nullptr); + POLICY_SCOPE_USER, default_alternate_urls_.DeepCopy(), NULL); policy->Set(key::kDefaultSearchProviderSearchTermsReplacementKey, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kReplacementKey), NULL); policy->Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kImageURL), NULL); policy->Set(key::kDefaultSearchProviderImageURLPostParams, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kImageParams), NULL); policy->Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kNewTabURL), NULL); } @@ -169,8 +157,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, Invalid) { BuildDefaultSearchPolicy(&policy); const char bad_search_url[] = "http://test.com/noSearchTerms"; policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, - new base::StringValue(bad_search_url), nullptr); + POLICY_SCOPE_USER, new base::StringValue(bad_search_url), NULL); UpdateProviderPolicy(policy); const base::Value* temp = nullptr; @@ -247,7 +234,6 @@ TEST_F(DefaultSearchPolicyHandlerTest, Disabled) { policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); UpdateProviderPolicy(policy); @@ -268,13 +254,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) { policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kSearchURL), NULL); UpdateProviderPolicy(policy); @@ -332,13 +316,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, FileURL) { policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - POLICY_SOURCE_CLOUD, new base::StringValue(kFileSearchURL), NULL); UpdateProviderPolicy(policy); diff --git a/components/sync_driver/sync_policy_handler_unittest.cc b/components/sync_driver/sync_policy_handler_unittest.cc index 2d95ec1..e0f2c0d 100644 --- a/components/sync_driver/sync_policy_handler_unittest.cc +++ b/components/sync_driver/sync_policy_handler_unittest.cc @@ -5,7 +5,6 @@ #include "base/prefs/pref_value_map.h" #include "base/values.h" #include "components/policy/core/common/policy_map.h" -#include "components/policy/core/common/policy_types.h" #include "components/sync_driver/pref_names.h" #include "components/sync_driver/sync_policy_handler.h" #include "policy/policy_constants.h" @@ -29,7 +28,6 @@ TEST_F(SyncPolicyHandlerTest, Enabled) { policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(false), NULL); SyncPolicyHandler handler; @@ -45,7 +43,6 @@ TEST_F(SyncPolicyHandlerTest, Disabled) { policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, - policy::POLICY_SOURCE_CLOUD, new base::FundamentalValue(true), NULL); SyncPolicyHandler handler; diff --git a/remoting/host/policy_watcher_unittest.cc b/remoting/host/policy_watcher_unittest.cc index 729c2fd..cf5ea37 100644 --- a/remoting/host/policy_watcher_unittest.cc +++ b/remoting/host/policy_watcher_unittest.cc @@ -186,8 +186,7 @@ class PolicyWatcherTest : public testing::Test { policy::PolicyBundle policy_bundle; policy::PolicyMap& policy_map = policy_bundle.Get(policy_namespace); policy_map.LoadFrom(&dict, policy::POLICY_LEVEL_MANDATORY, - policy::POLICY_SCOPE_MACHINE, - policy::POLICY_SOURCE_CLOUD); + policy::POLICY_SCOPE_MACHINE); // Simulate a policy file/registry/preference update. policy_loader_->SetPolicies(policy_bundle); diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index df2e6ca..e3e1dd6 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -262,26 +262,26 @@ # We only use one file depending on whether we're building Chromium or # Google Chrome. "components/components_chromium_strings.grd": { - "messages": [30160], + "messages": [30140], }, "components/components_google_chrome_strings.grd": { - "messages": [30160], + "messages": [30140], }, "components/resources/components_resources.grd": { - "includes": [30175], + "includes": [30155], }, "components/resources/components_scaled_resources.grd": { - "structures": [30350], + "structures": [30310], }, "third_party/WebKit/public/blink_resources.grd": { - "includes": [30370], - "structures": [30670], + "includes": [30350], + "structures": [30650], }, "chrome/browser/devtools/device/webrtc/resources.grd": { - "includes": [30820], + "includes": [30800], }, "chrome/browser/resources/settings/settings_resources.grd": { - "structures": [30920], + "structures": [30900], }, # Resource ids starting at 31000 are reserved for projects built on Chromium. |