Allow preloaded pins to contain report URIs; remove special-case reporting

chrome/browser/net/certificate_error_reporter_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/net/certificate_error_reporter.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 45 matching lines @@
     crypto::curve25519::ScalarBaseMult(server_private_key_, server_public_key_);
   }
 
   ~CertificateErrorReporterTest() override {}
 
  protected:
   uint8_t server_public_key_[32];
   uint8_t server_private_key_[32];
 };
 
-// Test that CertificateErrorReporter::SendPinningViolationReport sends
-// a plaintext report for pinning violation reports.
-TEST_F(CertificateErrorReporterTest, PinningViolationSendReport) {
-  GURL url(kDummyHttpReportUri);
-  MockCertificateReportSender* mock_report_sender =
-      new MockCertificateReportSender();
-  CertificateErrorReporter reporter(url, server_public_key_,
-                                    kServerPublicKeyTestVersion,
-                                    make_scoped_ptr(mock_report_sender));
-  reporter.SendPinningViolationReport(kDummyReport);
-  EXPECT_EQ(mock_report_sender->latest_report_uri(), url);
-  EXPECT_EQ(mock_report_sender->latest_report(), kDummyReport);
-}
-
 // Test that CertificateErrorReporter::SendExtendedReportingReport sends
 // an encrypted or plaintext extended reporting report as appropriate.
 TEST_F(CertificateErrorReporterTest, ExtendedReportingSendReport) {
   // Data should not be encrypted when sent to an HTTPS URL.
   MockCertificateReportSender* mock_report_sender =
       new MockCertificateReportSender();
   GURL https_url(kDummyHttpsReportUri);
   CertificateErrorReporter https_reporter(https_url, server_public_key_,
                                           kServerPublicKeyTestVersion,
                                           make_scoped_ptr(mock_report_sender));
@@ skipping 191 matching lines @@
       std::string(reinterpret_cast<const char*>(kSerializedEncryptedReport),
                   sizeof(kSerializedEncryptedReport))));
   ASSERT_TRUE(
       chrome_browser_net::CertificateErrorReporter::
           DecryptCertificateErrorReport(server_private_key_, encrypted_request,
                                         &decrypted_serialized_report));
 }
 #endif
 
 }  // namespace