Include both certificate chains in invalid cert reporting

net/cert/cert_verify_proc_unittest.cc

Index: net/cert/cert_verify_proc_unittest.cc
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
index bb90923055f5cb804cce6043776d1cddf172e3ff..4c5bfd76f8f2b23ec50e6e0f6018a0a779900e87 100644
--- a/net/cert/cert_verify_proc_unittest.cc
+++ b/net/cert/cert_verify_proc_unittest.cc
@@ -854,7 +854,8 @@ TEST_F(CertVerifyProcTest, IntranetHostsRejected) {
 // certificates that are not ordered from end-entity to root. While this is
 // a protocol violation if sent during a TLS handshake, if multiple sources
 // of intermediate certificates are combined, it's possible that order may
-// not be maintained.
+// not be maintained. Also test that the chain as received by the client is
+// present in the |unverified_server_cert| field of CertVerifyResult.
 TEST_F(CertVerifyProcTest, VerifyReturnChainProperlyOrdered) {
   if (!SupportsReturningVerifiedChain()) {
     LOG(INFO) << "Skipping this test in this platform.";
@@ -904,6 +905,20 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainProperlyOrdered) {
                                             certs[1]->os_cert_handle()));
   EXPECT_TRUE(X509Certificate::IsSameOSCert(return_intermediates[1],
                                             certs[2]->os_cert_handle()));
+
+  // The |unverified_server_cert| field should contain the chain exactly
+  // as sent by the server.
+  EXPECT_EQ(google_full_chain, verify_result.unverified_server_cert);
+  EXPECT_TRUE(X509Certificate::IsSameOSCert(
+      google_full_chain->os_cert_handle(),
+      verify_result.unverified_server_cert->os_cert_handle()));
+  const X509Certificate::OSCertHandles& unverified_server_intermediates =
+      verify_result.unverified_server_cert->GetIntermediateCertificates();
+  ASSERT_EQ(2U, unverified_server_intermediates.size());
+  EXPECT_TRUE(X509Certificate::IsSameOSCert(unverified_server_intermediates[0],
+                                            certs[2]->os_cert_handle()));
+  EXPECT_TRUE(X509Certificate::IsSameOSCert(unverified_server_intermediates[1],
+                                            certs[1]->os_cert_handle()));
 }
 
 // Test that Verify() filters out certificates which are not related to