BASELINE: Update Chromium to 74.0.3729.159

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

1 files changed, 7 insertions, 28 deletions

diff --git a/chromium/net/socket/mock_client_socket_pool_manager.h b/chromium/net/socket/mock_client_socket_pool_manager.h
index bf46e4475b5..25459a01d66 100644
--- a/chromium/net/socket/mock_client_socket_pool_manager.h
+++ b/chromium/net/socket/mock_client_socket_pool_manager.h
@@ -21,27 +21,14 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager {
   MockClientSocketPoolManager();
   ~MockClientSocketPoolManager() override;
 
-  // Sets "override" socket pools that get used instead.
-  void SetTransportSocketPool(TransportClientSocketPool* pool);
-  void SetSSLSocketPool(SSLClientSocketPool* pool);
-  void SetSocketPoolForSOCKSProxy(const ProxyServer& socks_proxy,
-                                  std::unique_ptr<SOCKSClientSocketPool> pool);
-  void SetSocketPoolForHTTPProxy(
-      const ProxyServer& http_proxy,
-      std::unique_ptr<HttpProxyClientSocketPool> pool);
-  void SetSocketPoolForSSLWithProxy(const ProxyServer& proxy_server,
-                                    std::unique_ptr<SSLClientSocketPool> pool);
+  // Sets socket pool that gets used for the specified ProxyServer.
+  void SetSocketPool(const ProxyServer& proxy_server,
+                     std::unique_ptr<TransportClientSocketPool> pool);
 
   // ClientSocketPoolManager methods:
   void FlushSocketPoolsWithError(int error) override;
   void CloseIdleSockets() override;
-  TransportClientSocketPool* GetTransportSocketPool() override;
-  SSLClientSocketPool* GetSSLSocketPool() override;
-  SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy(
-      const ProxyServer& socks_proxy) override;
-  HttpProxyClientSocketPool* GetSocketPoolForHTTPLikeProxy(
-      const ProxyServer& http_proxy) override;
-  SSLClientSocketPool* GetSocketPoolForSSLWithProxy(
+  TransportClientSocketPool* GetSocketPool(
       const ProxyServer& proxy_server) override;
   std::unique_ptr<base::Value> SocketPoolInfoToValue() const override;
   void DumpMemoryStats(
@@ -49,18 +36,10 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager {
       const std::string& parent_dump_absolute_name) const override;
 
  private:
-  using SOCKSSocketPoolMap =
-      std::map<ProxyServer, std::unique_ptr<SOCKSClientSocketPool>>;
-  using HTTPProxySocketPoolMap =
-      std::map<ProxyServer, std::unique_ptr<HttpProxyClientSocketPool>>;
-  using SSLSocketPoolMap =
-      std::map<ProxyServer, std::unique_ptr<SSLClientSocketPool>>;
+  using TransportClientSocketPoolMap =
+      std::map<ProxyServer, std::unique_ptr<TransportClientSocketPool>>;
 
-  std::unique_ptr<TransportClientSocketPool> transport_socket_pool_;
-  std::unique_ptr<SSLClientSocketPool> ssl_socket_pool_;
-  SOCKSSocketPoolMap socks_socket_pools_;
-  HTTPProxySocketPoolMap http_proxy_socket_pools_;
-  SSLSocketPoolMap ssl_socket_pools_for_proxies_;
+  TransportClientSocketPoolMap socket_pools_;
 
   DISALLOW_COPY_AND_ASSIGN(MockClientSocketPoolManager);
 };