From 6d1582b948448eb4ea257f930d31f0c0d852d0c4 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Wed, 30 Nov 2022 14:49:47 +0100
Subject: Clean up header includes in proxy config files

Change-Id: I8f0154f7f664a2b438cbe6e06b4638156d04f550
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/net/proxy_config_monitor.cpp    | 6 ++----
 src/core/net/proxy_config_monitor.h      | 7 +------
 src/core/net/proxy_config_service_qt.cpp | 5 ++---
 src/core/net/proxy_config_service_qt.h   | 2 --
 4 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/core/net/proxy_config_monitor.cpp b/src/core/net/proxy_config_monitor.cpp
index 96a33f1e3..8315b7bf2 100644
--- a/src/core/net/proxy_config_monitor.cpp
+++ b/src/core/net/proxy_config_monitor.cpp
@@ -10,13 +10,11 @@
 #include "proxy_config_monitor.h"
 #include "proxy_config_service_qt.h"
 
-#include "base/strings/utf_string_conversions.h"
-#include "build/build_config.h"
-#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "content/public/browser/browser_task_traits.h"
+#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
-#include "net/proxy_resolution/proxy_resolution_service.h"
+#include "net/proxy_resolution/proxy_config_with_annotation.h"
 #include "services/network/public/mojom/network_context.mojom.h"
 
 #include <utility>
diff --git a/src/core/net/proxy_config_monitor.h b/src/core/net/proxy_config_monitor.h
index 69655b807..585e4b7ed 100644
--- a/src/core/net/proxy_config_monitor.h
+++ b/src/core/net/proxy_config_monitor.h
@@ -10,16 +10,11 @@
 #define PROXY_CONFIG_MONITOR_H
 
 #include <memory>
-#include <string>
 
-#include "build/buildflag.h"
-#include "extensions/buildflags/buildflags.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "mojo/public/cpp/bindings/remote_set.h"
 #include "net/proxy_resolution/proxy_config_service.h"
 #include "services/network/public/mojom/network_context.mojom-forward.h"
-#include "services/network/public/mojom/network_service.mojom-forward.h"
-#include "services/network/public/mojom/proxy_config.mojom-forward.h"
 #include "services/network/public/mojom/proxy_config_with_annotation.mojom.h"
 
 namespace net {
@@ -61,4 +56,4 @@ private:
     mojo::RemoteSet<network::mojom::ProxyConfigClient> proxy_config_client_set_;
 };
 
-#endif // !PROXY_CONFIG_MONITOR_H
+#endif // PROXY_CONFIG_MONITOR_H
diff --git a/src/core/net/proxy_config_service_qt.cpp b/src/core/net/proxy_config_service_qt.cpp
index fbd6aecaf..70bcb59b4 100644
--- a/src/core/net/proxy_config_service_qt.cpp
+++ b/src/core/net/proxy_config_service_qt.cpp
@@ -9,11 +9,10 @@
 
 #include "proxy_config_service_qt.h"
 
-#include "base/bind.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
-#include "content/public/browser/browser_thread.h"
+#include "net/base/proxy_server.h"
 
-using content::BrowserThread;
+#include <QNetworkProxy>
 
 net::ProxyServer ProxyConfigServiceQt::fromQNetworkProxy(const QNetworkProxy &qtProxy)
 {
diff --git a/src/core/net/proxy_config_service_qt.h b/src/core/net/proxy_config_service_qt.h
index dcbc5074f..49c9877a5 100644
--- a/src/core/net/proxy_config_service_qt.h
+++ b/src/core/net/proxy_config_service_qt.h
@@ -4,10 +4,8 @@
 #ifndef PROXY_CONFIG_SERVICE_QT_H
 #define PROXY_CONFIG_SERVICE_QT_H
 
-#include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/task/sequenced_task_runner.h"
-
 #include "net/proxy_resolution/proxy_config.h"
 #include "net/proxy_resolution/proxy_config_service.h"
 #include "net/proxy_resolution/proxy_config_with_annotation.h"
-- 
cgit v1.2.3