1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/net/proxy_config_service_qt.h b/src/core/net/proxy_config_service_qt.h
index dcd303894..09e88d445 100644
--- a/src/core/net/proxy_config_service_qt.h
+++ b/src/core/net/proxy_config_service_qt.h
@@ -43,8 +43,10 @@
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.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"
+#include "components/proxy_config/proxy_prefs.h"
 
 #include <QNetworkProxy>
 
@@ -55,7 +57,9 @@ public:
 
     static net::ProxyServer fromQNetworkProxy(const QNetworkProxy &);
 
-    explicit ProxyConfigServiceQt(std::unique_ptr<ProxyConfigService> baseService);
+    explicit ProxyConfigServiceQt(std::unique_ptr<ProxyConfigService> baseService,
+                                  const net::ProxyConfigWithAnnotation& initialConfig,
+                                  ProxyPrefs::ConfigState initialState);
     ~ProxyConfigServiceQt() override;
 
     // ProxyConfigService implementation:
@@ -76,7 +80,7 @@ private:
     void RegisterObserver();
 
     std::unique_ptr<net::ProxyConfigService> m_baseService;
-    base::ObserverList<net::ProxyConfigService::Observer, true> m_observers;
+    base::ObserverList<net::ProxyConfigService::Observer, true>::Unchecked m_observers;
 
     // Keep the last state around.
     bool m_usesSystemConfiguration;
@@ -86,6 +90,10 @@ private:
     // Indicates whether the base service registration is done.
     bool m_registeredObserver;
 
+    // Configuration as defined by prefs.
+    net::ProxyConfigWithAnnotation m_prefConfig;
+    ProxyPrefs::ConfigState m_perfState;
+
     DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceQt);
 };