Remove the deprecated cipher fallback.

net/socket/client_socket_pool_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/client_socket_pool_manager.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_proxy_client_socket_pool.h"
@@ skipping 96 matching lines @@
   // Determine the host and port to connect to.
   std::string connection_group = origin_host_port.ToString();
   DCHECK(!connection_group.empty());
   if (group_type == ClientSocketPoolManager::FTP_GROUP) {
     // Combining FTP with forced SPDY over SSL would be a "path to madness".
     // Make sure we never do that.
     DCHECK(!using_ssl);
     connection_group = "ftp/" + connection_group;
   }
   if (using_ssl) {
-    std::string prefix = "ssl/";
-    // Place sockets with and without deprecated ciphers into separate
-    // connection groups.
-    if (ssl_config_for_origin.deprecated_cipher_suites_enabled)
-      prefix += "deprecatedciphers/";
-    connection_group = prefix + connection_group;
+    connection_group = "ssl/" + connection_group;

[davidben, 2017/05/09 19:04:18]

There. Happy now? :-)

[mmenke, 2017/05/09 19:34:27]

Less happy, actually, given that I didn't even know about the deprecatedciphers/
thing before, and now it will haunt my dreams from beyond the grave.  Though I
do see that all of the "ssl(max:*)" stuff has already been removed.  :)

   }
 
   ClientSocketPool::RespectLimits respect_limits =
       ClientSocketPool::RespectLimits::ENABLED;
   if ((request_load_flags & LOAD_IGNORE_LIMITS) != 0)
     respect_limits = ClientSocketPool::RespectLimits::DISABLED;
   if (!proxy_info.is_direct()) {
     ProxyServer proxy_server = proxy_info.proxy_server();
     proxy_host_port.reset(new HostPortPair(proxy_server.host_port_pair()));
     scoped_refptr<TransportSocketParams> proxy_tcp_params(
@@ skipping 320 matching lines @@
     int num_preconnect_streams) {
   return InitSocketPoolHelper(
       group_type, endpoint, request_extra_headers, request_load_flags,
       request_priority, session, proxy_info, expect_spdy, ssl_config_for_origin,
       ssl_config_for_proxy, /*force_tunnel=*/false, privacy_mode, net_log,
       num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL,
       OnHostResolutionCallback(), CompletionCallback());
 }
 
 }  // namespace net