BASELINE: Update Chromium to 73.0.3683.37

Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 13 insertions, 12 deletions

diff --git a/chromium/net/socket/mock_client_socket_pool_manager.h b/chromium/net/socket/mock_client_socket_pool_manager.h
index 18004377abb..bf46e4475b5 100644
--- a/chromium/net/socket/mock_client_socket_pool_manager.h
+++ b/chromium/net/socket/mock_client_socket_pool_manager.h
@@ -5,9 +5,12 @@
 #ifndef NET_SOCKET_MOCK_CLIENT_SOCKET_POOL_MANAGER_H_
 #define NET_SOCKET_MOCK_CLIENT_SOCKET_POOL_MANAGER_H_
 
+#include <map>
+#include <memory>
 #include <string>
 
 #include "base/macros.h"
+#include "net/base/proxy_server.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/socket/client_socket_pool_manager_impl.h"
 
@@ -21,12 +24,12 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager {
   // Sets "override" socket pools that get used instead.
   void SetTransportSocketPool(TransportClientSocketPool* pool);
   void SetSSLSocketPool(SSLClientSocketPool* pool);
-  void SetSocketPoolForSOCKSProxy(const HostPortPair& socks_proxy,
+  void SetSocketPoolForSOCKSProxy(const ProxyServer& socks_proxy,
                                   std::unique_ptr<SOCKSClientSocketPool> pool);
   void SetSocketPoolForHTTPProxy(
-      const HostPortPair& http_proxy,
+      const ProxyServer& http_proxy,
       std::unique_ptr<HttpProxyClientSocketPool> pool);
-  void SetSocketPoolForSSLWithProxy(const HostPortPair& proxy_server,
+  void SetSocketPoolForSSLWithProxy(const ProxyServer& proxy_server,
                                     std::unique_ptr<SSLClientSocketPool> pool);
 
   // ClientSocketPoolManager methods:
@@ -35,25 +38,23 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager {
   TransportClientSocketPool* GetTransportSocketPool() override;
   SSLClientSocketPool* GetSSLSocketPool() override;
   SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy(
-      const HostPortPair& socks_proxy) override;
-  HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy(
-      const HostPortPair& http_proxy) override;
+      const ProxyServer& socks_proxy) override;
+  HttpProxyClientSocketPool* GetSocketPoolForHTTPLikeProxy(
+      const ProxyServer& http_proxy) override;
   SSLClientSocketPool* GetSocketPoolForSSLWithProxy(
-      const HostPortPair& proxy_server) override;
+      const ProxyServer& proxy_server) override;
   std::unique_ptr<base::Value> SocketPoolInfoToValue() const override;
   void DumpMemoryStats(
       base::trace_event::ProcessMemoryDump* pmd,
       const std::string& parent_dump_absolute_name) const override;
 
  private:
-  using TransportSocketPoolMap =
-      std::map<HostPortPair, std::unique_ptr<TransportClientSocketPool>>;
   using SOCKSSocketPoolMap =
-      std::map<HostPortPair, std::unique_ptr<SOCKSClientSocketPool>>;
+      std::map<ProxyServer, std::unique_ptr<SOCKSClientSocketPool>>;
   using HTTPProxySocketPoolMap =
-      std::map<HostPortPair, std::unique_ptr<HttpProxyClientSocketPool>>;
+      std::map<ProxyServer, std::unique_ptr<HttpProxyClientSocketPool>>;
   using SSLSocketPoolMap =
-      std::map<HostPortPair, std::unique_ptr<SSLClientSocketPool>>;
+      std::map<ProxyServer, std::unique_ptr<SSLClientSocketPool>>;
 
   std::unique_ptr<TransportClientSocketPool> transport_socket_pool_;
   std::unique_ptr<SSLClientSocketPool> ssl_socket_pool_;