Commit caf75813 authored by Min Qin's avatar Min Qin Committed by Commit Bot

Remove 2 policy related prefs on android when creating default network context

QuicAllowed and Http09OnNonDefaultPortsEnabled are not part of
android policies. See https://www.chromium.org/administrators/policy-list-3.
On desktop, they are retrieved from the policy service.
On Android, we are planning to run ServiceManager only without the browser
process. As a result, calling policy_service() doesn't work when that is
enabled.
This CL simply disables the code on Android, so we won't need
to worry about them when creating default network context without
browser process.
If later on these policies are enabled to Android, we can add them to a
persistent pref store, which can be loaded without browser process.

BUG=866028

Change-Id: Ie992d072ff26e085f236817e7a7f08c5bb8b3cba
Reviewed-on: https://chromium-review.googlesource.com/1195794Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587308}
parent 7c9aa090
...@@ -333,6 +333,8 @@ void SystemNetworkContextManager::SetUp( ...@@ -333,6 +333,8 @@ void SystemNetworkContextManager::SetUp(
SystemNetworkContextManager::SystemNetworkContextManager() SystemNetworkContextManager::SystemNetworkContextManager()
: ssl_config_service_manager_(SSLConfigServiceManager::CreateDefaultManager( : ssl_config_service_manager_(SSLConfigServiceManager::CreateDefaultManager(
g_browser_process->local_state())) { g_browser_process->local_state())) {
#if !defined(OS_ANDROID)
// QuicAllowed was not part of Android policy.
const base::Value* value = const base::Value* value =
g_browser_process->policy_service() g_browser_process->policy_service()
->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, ->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
...@@ -340,6 +342,7 @@ SystemNetworkContextManager::SystemNetworkContextManager() ...@@ -340,6 +342,7 @@ SystemNetworkContextManager::SystemNetworkContextManager()
.GetValue(policy::key::kQuicAllowed); .GetValue(policy::key::kQuicAllowed);
if (value) if (value)
value->GetAsBoolean(&is_quic_allowed_); value->GetAsBoolean(&is_quic_allowed_);
#endif
shared_url_loader_factory_ = new URLLoaderFactoryForSystem(this); shared_url_loader_factory_ = new URLLoaderFactoryForSystem(this);
PrefService* local_state = g_browser_process->local_state(); PrefService* local_state = g_browser_process->local_state();
...@@ -569,6 +572,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() { ...@@ -569,6 +572,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
// point, all NetworkContexts will be destroyed as well. // point, all NetworkContexts will be destroyed as well.
AddSSLConfigToNetworkContextParams(network_context_params.get()); AddSSLConfigToNetworkContextParams(network_context_params.get());
bool http_09_on_non_default_ports_enabled = false;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// CT is only enabled on Desktop platforms for now. // CT is only enabled on Desktop platforms for now.
network_context_params->enforce_chrome_ct_policy = true; network_context_params->enforce_chrome_ct_policy = true;
...@@ -580,9 +584,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() { ...@@ -580,9 +584,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
log_info->dns_api_endpoint = ct_log.log_dns_domain; log_info->dns_api_endpoint = ct_log.log_dns_domain;
network_context_params->ct_logs.push_back(std::move(log_info)); network_context_params->ct_logs.push_back(std::move(log_info));
} }
#endif
bool http_09_on_non_default_ports_enabled = false;
const base::Value* value = const base::Value* value =
g_browser_process->policy_service() g_browser_process->policy_service()
->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, ->GetPolicies(policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
...@@ -590,6 +592,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() { ...@@ -590,6 +592,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
.GetValue(policy::key::kHttp09OnNonDefaultPortsEnabled); .GetValue(policy::key::kHttp09OnNonDefaultPortsEnabled);
if (value) if (value)
value->GetAsBoolean(&http_09_on_non_default_ports_enabled); value->GetAsBoolean(&http_09_on_non_default_ports_enabled);
#endif
network_context_params->http_09_on_non_default_ports_enabled = network_context_params->http_09_on_non_default_ports_enabled =
http_09_on_non_default_ports_enabled; http_09_on_non_default_ports_enabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment