summaryrefslogtreecommitdiffstats
path: root/src/core/content_browser_client_qt.cpp
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2020-04-08 13:21:43 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2020-04-10 05:04:25 +0200
commita3bc7f797d740da416b858806ce9fcfb46e77ac6 (patch)
tree68509e93a0e74766eaecbac87159a9672b4b04a5 /src/core/content_browser_client_qt.cpp
parentbebc5a1c6ff9968bf8b06ca74a76b0618a57700b (diff)
Delete last network service feature checks
Network service is required. Task-number: QTBUG-83394 Change-Id: I8b636730eba5bd2ba5895e072e134c3b1fb786d1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r--src/core/content_browser_client_qt.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 2c5ba36c8..22dbc173b 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -1058,9 +1058,6 @@ network::mojom::NetworkContext *ContentBrowserClientQt::GetSystemNetworkContext(
void ContentBrowserClientQt::OnNetworkServiceCreated(network::mojom::NetworkService *network_service)
{
- if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
- return;
-
if (!SystemNetworkContextManager::GetInstance())
SystemNetworkContextManager::CreateInstance();
@@ -1096,7 +1093,6 @@ std::vector<base::FilePath> ContentBrowserClientQt::GetNetworkContextsParentDire
void ContentBrowserClientQt::RegisterNonNetworkNavigationURLLoaderFactories(int frame_tree_node_id,
NonNetworkURLLoaderFactoryMap *factories)
{
- DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
content::WebContents *web_contents = content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
Profile *profile = Profile::FromBrowserContext(web_contents->GetBrowserContext());
ProfileAdapter *profileAdapter = static_cast<ProfileQt *>(profile)->profileAdapter();
@@ -1115,7 +1111,6 @@ void ContentBrowserClientQt::RegisterNonNetworkNavigationURLLoaderFactories(int
void ContentBrowserClientQt::RegisterNonNetworkWorkerMainResourceURLLoaderFactories(content::BrowserContext *browser_context,
NonNetworkURLLoaderFactoryMap *factories)
{
- DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
Profile *profile = Profile::FromBrowserContext(browser_context);
ProfileAdapter *profileAdapter = static_cast<ProfileQt *>(profile)->profileAdapter();
@@ -1126,8 +1121,6 @@ void ContentBrowserClientQt::RegisterNonNetworkWorkerMainResourceURLLoaderFactor
void ContentBrowserClientQt::RegisterNonNetworkSubresourceURLLoaderFactories(int render_process_id, int render_frame_id,
NonNetworkURLLoaderFactoryMap *factories)
{
- if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
- return;
content::RenderProcessHost *process_host = content::RenderProcessHost::FromID(render_process_id);
Profile *profile = Profile::FromBrowserContext(process_host->GetBrowserContext());
ProfileAdapter *profileAdapter = static_cast<ProfileQt *>(profile)->profileAdapter();
@@ -1212,9 +1205,6 @@ bool ContentBrowserClientQt::WillCreateURLLoaderFactory(
bool *bypass_redirect_checks,
network::mojom::URLLoaderFactoryOverridePtr *factory_override)
{
- if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
- return false;
-
auto proxied_receiver = std::move(*factory_receiver);
network::mojom::URLLoaderFactoryPtrInfo target_factory_info;
*factory_receiver = mojo::MakeRequest(&target_factory_info);