Delete some dead code.

net/socket/ssl_client_socket_nss.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.
 
 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
 // from AuthCertificateCallback() in
 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ skipping 315 matching lines @@
 
   // Returns the current certificate chain as a vector of DER-encoded
   // base::StringPieces. The returned vector remains valid until Reset is
   // called.
   std::vector<base::StringPiece> AsStringPieceVector() const;
 
   bool empty() const { return certs_.empty(); }
   size_t size() const { return certs_.size(); }
 
   CERTCertificate* operator[](size_t index) const {
-    DCHECK_LT(index, certs_.size());
+    DCHECK_LT(index, size());
     return certs_[index];
   }
 
  private:
   std::vector<CERTCertificate*> certs_;
 };
 
 PeerCertificateChain::PeerCertificateChain(
     const PeerCertificateChain& other) {
   *this = other;
 }
 
 PeerCertificateChain::~PeerCertificateChain() {
   Reset(NULL);
 }
 
 PeerCertificateChain& PeerCertificateChain::operator=(
     const PeerCertificateChain& other) {
   if (this == &other)
     return *this;
 
   Reset(NULL);
-  certs_.reserve(other.certs_.size());
-  for (size_t i = 0; i < other.certs_.size(); ++i)
+  certs_.reserve(other.size());
+  for (size_t i = 0; i < other.size(); ++i)

[Ryan Sleevi, 2014/03/26 21:22:45]

This = not lgtm

Not sure why Clang griped about this, but this change is inconsistent with how
line 361 works.

[Nico, 2014/03/26 21:35:12]

Why is this? It calls others.size(), not this->size().

(clang remarked that size() from line 333 was unused, so I figured I'd use it
instead of deleting it)

[Ryan Sleevi, 2014/03/26 21:42:20]

Because it's inconsistently coupling implementations - size() [a public API]
with certs_ [an implementation detail]

If size() is used, it should be using operator[] (line 335)
If certs_[] is used, it should be coupled with certs_.size() (which it's doing
today)

I think we can just nuke size() altogether - ::Core now only uses empty() before
accessing [0], and the bits that accessed the other indices are rolled into this
class, via AsStringPieceVector().

[Nico, 2014/03/26 21:43:52]

Ok, deleted size() instead.

     certs_.push_back(CERT_DupCertificate(other.certs_[i]));
 
   return *this;
 }
 
 void PeerCertificateChain::Reset(PRFileDesc* nss_fd) {
-  for (size_t i = 0; i < certs_.size(); ++i)
+  for (size_t i = 0; i < size(); ++i)
     CERT_DestroyCertificate(certs_[i]);
   certs_.clear();
 
   if (nss_fd == NULL)
     return;
 
   CERTCertList* list = SSL_PeerCertificateChain(nss_fd);
   // The handshake on |nss_fd| may not have completed.
   if (list == NULL)
     return;
 
   for (CERTCertListNode* node = CERT_LIST_HEAD(list);
        !CERT_LIST_END(node, list); node = CERT_LIST_NEXT(node)) {
     certs_.push_back(CERT_DupCertificate(node->cert));
   }
   CERT_DestroyCertList(list);
 }
 
 std::vector<base::StringPiece>
 PeerCertificateChain::AsStringPieceVector() const {
-  std::vector<base::StringPiece> v(certs_.size());
-  for (unsigned i = 0; i < certs_.size(); i++) {
+  std::vector<base::StringPiece> v(size());
+  for (unsigned i = 0; i < size(); i++) {

[Ryan Sleevi, 2014/03/26 21:22:45]

Ditto this - inconsistent with using certs_[i] immediately below.

[Nico, 2014/03/26 21:35:12]

Ditto "I don't understand" :-)

     v[i] = base::StringPiece(
         reinterpret_cast<const char*>(certs_[i]->derCert.data),
         certs_[i]->derCert.len);
   }
 
   return v;
 }
 
 // HandshakeState is a helper struct used to pass handshake state between
 // the NSS task runner and the network task runner.
@@ skipping 3192 matching lines @@
 scoped_refptr<X509Certificate>
 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
   return core_->state().server_cert.get();
 }
 
 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
   return server_bound_cert_service_;
 }
 
 }  // namespace net