Minor clean-up tasks that were TODO(snej)

net/base/x509_cert_types.h

 // Copyright (c) 2007-2010 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.
 
-#ifndef NET_BASE_X509_TYPES_H_
-#define NET_BASE_X509_TYPES_H_
+#ifndef NET_BASE_X509_CERT_TYPES_H_
+#define NET_BASE_X509_CERT_TYPES_H_
 
 #include <string.h>
 
+#include <functional>
 #include <iostream>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/singleton.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
@@ skipping 17 matching lines @@
   bool Equals(const SHA1Fingerprint& other) const {
     return memcmp(data, other.data, sizeof(data)) == 0;
   }
 
   unsigned char data[20];
 };
 
 class SHA1FingerprintLessThan
     : public std::binary_function<SHA1Fingerprint, SHA1Fingerprint, bool> {
  public:
-  bool operator() (const SHA1Fingerprint& lhs, const SHA1Fingerprint& rhs) const;
+  bool operator() (const SHA1Fingerprint& lhs,
+                   const SHA1Fingerprint& rhs) const {
+    return memcmp(lhs.data, rhs.data, sizeof(lhs.data)) < 0;
+  }
 };
 
 // CertPrincipal represents the issuer or subject field of an X.509 certificate.
 struct CertPrincipal {
   CertPrincipal() { }
   explicit CertPrincipal(const std::string& name) : common_name(name) { }
 
   // Parses a BER-format DistinguishedName.
   bool ParseDistinguishedName(const void* ber_name_data, size_t length);
 
@@ skipping 65 matching lines @@
 #if defined(OS_MACOSX)
 // Compares two OIDs by value.
 inline bool CSSMOIDEqual(const CSSM_OID* oid1, const CSSM_OID* oid2) {
   return oid1->Length == oid2->Length &&
   (memcmp(oid1->Data, oid2->Data, oid1->Length) == 0);
 }
 #endif
 
 }  // namespace net
 
-#endif  // NET_BASE_X509_TYPES_H_
+#endif  // NET_BASE_X509_CERT_TYPES_H_