Revert of Include unverified server-sent cert chain in reports

chrome/browser/ssl/certificate_error_report_unittest.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 "chrome/browser/ssl/certificate_error_report.h"
 
 #include <set>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 17 matching lines @@
 
 const net::CertStatus kCertStatus =
     net::CERT_STATUS_COMMON_NAME_INVALID | net::CERT_STATUS_REVOKED;
 const size_t kNumCertErrors = 2;
 
 const CertLoggerRequest::CertError kFirstReportedCertError =
     CertLoggerRequest::ERR_CERT_COMMON_NAME_INVALID;
 const CertLoggerRequest::CertError kSecondReportedCertError =
     CertLoggerRequest::ERR_CERT_REVOKED;
 
-// Whether to include an unverified certificate chain in the test
-// SSLInfo. In production code, an unverified cert chain will not be
-// present if the resource was loaded from cache.
-enum UnverifiedCertChainStatus {
-  INCLUDE_UNVERIFIED_CERT_CHAIN,
-  EXCLUDE_UNVERIFIED_CERT_CHAIN
-};
-
-SSLInfo GetTestSSLInfo(UnverifiedCertChainStatus unverified_cert_chain_status) {
+SSLInfo GetTestSSLInfo() {
   SSLInfo info;
   info.cert =
       net::ImportCertFromFile(net::GetTestCertsDirectory(), kTestCertFilename);
-  if (unverified_cert_chain_status == INCLUDE_UNVERIFIED_CERT_CHAIN) {
-    info.unverified_cert = net::ImportCertFromFile(net::GetTestCertsDirectory(),
-                                                   kTestCertFilename);
-  }
   info.is_issued_by_known_root = true;
   info.cert_status = kCertStatus;
   info.pinning_failure_log = kDummyFailureLog;
   return info;
 }
 
 std::string GetPEMEncodedChain() {
   base::FilePath cert_path =
       net::GetTestCertsDirectory().AppendASCII(kTestCertFilename);
   std::string cert_data;
   EXPECT_TRUE(base::ReadFileToString(cert_path, &cert_data));
   return cert_data;
 }
 
 // Test that a serialized CertificateErrorReport can be deserialized as
 // a CertLoggerRequest protobuf (which is the format that the receiving
 // server expects it in) with the right data in it.
 TEST(CertificateErrorReportTest, SerializedReportAsProtobuf) {
-  SSLInfo ssl_info = GetTestSSLInfo(INCLUDE_UNVERIFIED_CERT_CHAIN);
+  SSLInfo ssl_info = GetTestSSLInfo();
 
   std::string serialized_report;
   CertificateErrorReport report(kDummyHostname, ssl_info);
   report.Serialize(&serialized_report);
 
   CertLoggerRequest deserialized_report;
   ASSERT_TRUE(deserialized_report.ParseFromString(serialized_report));
   EXPECT_EQ(kDummyHostname, deserialized_report.hostname());
   EXPECT_EQ(GetPEMEncodedChain(), deserialized_report.cert_chain());
-  EXPECT_EQ(GetPEMEncodedChain(), deserialized_report.unverified_cert_chain());
   EXPECT_EQ(1, deserialized_report.pin().size());
   EXPECT_EQ(kDummyFailureLog, deserialized_report.pin().Get(0));
 
   std::set<CertLoggerRequest::CertError> reported_errors;
   reported_errors.insert(static_cast<CertLoggerRequest::CertError>(
       deserialized_report.cert_error().Get(0)));
   reported_errors.insert(static_cast<CertLoggerRequest::CertError>(
       deserialized_report.cert_error().Get(1)));
   EXPECT_EQ(kNumCertErrors, reported_errors.size());
   EXPECT_EQ(1u, reported_errors.count(kFirstReportedCertError));
   EXPECT_EQ(1u, reported_errors.count(kSecondReportedCertError));
 }
 
 TEST(CertificateErrorReportTest,
      SerializedReportAsProtobufWithInterstitialInfo) {
-  // Use EXCLUDE_UNVERIFIED_CERT_CHAIN here to exercise the code path
-  // where SSLInfo does not contain the unverified cert chain. (The test
-  // above exercises the path where it does.)
-  SSLInfo ssl_info = GetTestSSLInfo(EXCLUDE_UNVERIFIED_CERT_CHAIN);
+  SSLInfo ssl_info = GetTestSSLInfo();
 
   std::string serialized_report;
   CertificateErrorReport report(kDummyHostname, ssl_info);
 
   const CertificateErrorReport::InterstitialReason interstitial_reason =
       CertificateErrorReport::INTERSTITIAL_CLOCK;
   const CertificateErrorReport::ProceedDecision proceeded =
       CertificateErrorReport::USER_PROCEEDED;
   const CertificateErrorReport::Overridable overridable =
       CertificateErrorReport::INTERSTITIAL_OVERRIDABLE;
 
   report.SetInterstitialInfo(interstitial_reason, proceeded, overridable);
 
   report.Serialize(&serialized_report);
 
   CertLoggerRequest deserialized_report;
   ASSERT_TRUE(deserialized_report.ParseFromString(serialized_report));
   EXPECT_EQ(kDummyHostname, deserialized_report.hostname());
   EXPECT_EQ(GetPEMEncodedChain(), deserialized_report.cert_chain());
-  EXPECT_EQ(std::string(), deserialized_report.unverified_cert_chain());
   EXPECT_EQ(1, deserialized_report.pin().size());
   EXPECT_EQ(kDummyFailureLog, deserialized_report.pin().Get(0));
 
   EXPECT_EQ(CertLoggerInterstitialInfo::INTERSTITIAL_CLOCK,
             deserialized_report.interstitial_info().interstitial_reason());
   EXPECT_EQ(true, deserialized_report.interstitial_info().user_proceeded());
   EXPECT_EQ(true, deserialized_report.interstitial_info().overridable());
 
   std::set<CertLoggerRequest::CertError> reported_errors;
   reported_errors.insert(static_cast<CertLoggerRequest::CertError>(
       deserialized_report.cert_error().Get(0)));
   reported_errors.insert(static_cast<CertLoggerRequest::CertError>(
       deserialized_report.cert_error().Get(1)));
   EXPECT_EQ(kNumCertErrors, reported_errors.size());
   EXPECT_EQ(1u, reported_errors.count(kFirstReportedCertError));
   EXPECT_EQ(1u, reported_errors.count(kSecondReportedCertError));
 }
 
 // Test that a serialized report can be parsed.
 TEST(CertificateErrorReportTest, ParseSerializedReport) {
-  SSLInfo ssl_info = GetTestSSLInfo(EXCLUDE_UNVERIFIED_CERT_CHAIN);
+  SSLInfo ssl_info = GetTestSSLInfo();
 
   std::string serialized_report;
   CertificateErrorReport report(kDummyHostname, ssl_info);
   EXPECT_EQ(kDummyHostname, report.hostname());
   report.Serialize(&serialized_report);
 
   CertificateErrorReport parsed;
   ASSERT_TRUE(parsed.InitializeFromString(serialized_report));
   EXPECT_EQ(report.hostname(), parsed.hostname());
 }
 
 }  // namespace