Don't use crypto/x509 in SSLClientSocketImpl.

net/ssl/ssl_client_session_cache.cc

 // Copyright 2015 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/ssl/ssl_client_session_cache.h"
 
 #include <utility>
 
 #include "base/containers/flat_set.h"
 #include "base/memory/memory_coordinator_client_registry.h"
@@ skipping 124 matching lines @@
         sk_CRYPTO_BUFFER_num(pair.second.session.get()->certs);
   }
   // Use a flat_set here to avoid malloc upon insertion.
   base::flat_set<const CRYPTO_BUFFER*> crypto_buffer_set;
   crypto_buffer_set.reserve(undeduped_cert_count);
   for (const auto& pair : cache_) {
     const SSL_SESSION* session = pair.second.session.get();
     size_t pair_cert_count = sk_CRYPTO_BUFFER_num(session->certs);
     for (size_t i = 0; i < pair_cert_count; ++i) {
       const CRYPTO_BUFFER* cert = sk_CRYPTO_BUFFER_value(session->certs, i);
-      // TODO(xunjieli): The multipler is added to account for the difference
-      // between the serialized form and real cert allocation. Remove after
-      // crbug.com/671420 is done.
-      size_t individual_cert_size = 4 * CRYPTO_BUFFER_len(cert);
-      undeduped_cert_size += individual_cert_size;
+      undeduped_cert_size += CRYPTO_BUFFER_len(cert);
       auto result = crypto_buffer_set.insert(cert);
       if (!result.second)
         continue;
-      cert_size += individual_cert_size;
+      cert_size += CRYPTO_BUFFER_len(cert);
       cert_count++;
     }
   }
   cache_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                         base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                         cert_size);
   cache_dump->AddScalar("cert_size",
                         base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                         cert_size);
   cache_dump->AddScalar("cert_count",
@@ skipping 35 matching lines @@
       Flush();
       break;
   }
 }
 
 void SSLClientSessionCache::OnPurgeMemory() {
   Flush();
 }
 
 }  // namespace net