Remove the fingerprint and ca_fingerprint from X509Certificate

net/cert/nss_profile_filter_chromeos_unittest.cc

 // Copyright 2014 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/cert/nss_profile_filter_chromeos.h"
 
 #include <cert.h>
 #include <pk11pub.h>
 #include <secmod.h>
+
+#include <algorithm>
 #include <utility>
 
 #include "crypto/nss_util_internal.h"
 #include "crypto/scoped_nss_types.h"
 #include "crypto/scoped_test_nss_chromeos_user.h"
 #include "crypto/scoped_test_nss_db.h"
+#include "net/base/hash_value.h"
 #include "net/base/test_data_directory.h"
 #include "net/test/cert_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 crypto::ScopedPK11Slot GetRootCertsSlot() {
   crypto::AutoSECMODListReadLock auto_lock;
@@ skipping 16 matching lines @@
   CERTCertList* cert_list = PK11_ListCertsInSlot(slot);
   for (CERTCertListNode* node = CERT_LIST_HEAD(cert_list);
        !CERT_LIST_END(node, cert_list);
        node = CERT_LIST_NEXT(node)) {
     result.push_back(X509Certificate::CreateFromHandle(
         node->cert, X509Certificate::OSCertHandles()));
   }
   CERT_DestroyCertList(cert_list);
 
   // Sort the result so that test comparisons can be deterministic.
-  std::sort(result.begin(), result.end(), X509Certificate::LessThan());
+  std::sort(

[eroman, 2016/06/09 22:18:25]

Consider extracting this to something like net/test/cert_test_util.h, as it is
used in a few places.

Duplicating is fine too given the brevity.

[Ryan Sleevi, 2016/06/09 22:59:36]

Yeah, I opted for duplication as a discouragement from doing this without having
to do the mental overhead of switching to GMock which handles this :)

+      result.begin(), result.end(),
+      [](const scoped_refptr<X509Certificate>& lhs,
+         const scoped_refptr<X509Certificate>& rhs) {
+        return SHA256HashValueLessThan()(
+            X509Certificate::CalculateFingerprint256(lhs->os_cert_handle()),
+            X509Certificate::CalculateFingerprint256(rhs->os_cert_handle()));
+      });
   return result;
 }
 
 }
 
 class NSSProfileFilterChromeOSTest : public testing::Test {
  public:
   NSSProfileFilterChromeOSTest() : user_1_("user1"), user_2_("user2") {}
 
   void SetUp() override {
@@ skipping 147 matching lines @@
   EXPECT_TRUE(profile_filter_1_.IsCertAllowed(system_cert->os_cert_handle()));
   EXPECT_TRUE(
       profile_filter_1_copy_.IsCertAllowed(system_cert->os_cert_handle()));
 
   EXPECT_FALSE(profile_filter_2_.IsCertAllowed(cert_1->os_cert_handle()));
   EXPECT_TRUE(profile_filter_2_.IsCertAllowed(cert_2->os_cert_handle()));
   EXPECT_FALSE(profile_filter_2_.IsCertAllowed(system_cert->os_cert_handle()));
 }
 
 }  // namespace net