Add report_id to ErrorReporter interface.

components/certificate_reporting/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 "components/certificate_reporting/error_reporter.h"
 
 #include <stdint.h>
 #include <string.h>
 
 #include <set>
@@ skipping 102 matching lines @@
 // Test that ErrorReporter::SendExtendedReportingReport sends
 // an encrypted or plaintext extended reporting report as appropriate.
 TEST_F(ErrorReporterTest, ExtendedReportingSendReport) {
   // Data should not be encrypted when sent to an HTTPS URL.
   MockCertificateReportSender* mock_report_sender =
       new MockCertificateReportSender();
   GURL https_url(kDummyHttpsReportUri);
   ErrorReporter https_reporter(https_url, server_public_key_,
                                kServerPublicKeyTestVersion,
                                base::WrapUnique(mock_report_sender));
-  https_reporter.SendExtendedReportingReport(kDummyReport);
+  https_reporter.SendExtendedReportingReport(kDummyReport, 0);
   EXPECT_EQ(mock_report_sender->latest_report_uri(), https_url);
   EXPECT_EQ(mock_report_sender->latest_report(), kDummyReport);
 
   // Data should be encrypted when sent to an HTTP URL.
   MockCertificateReportSender* http_mock_report_sender =
       new MockCertificateReportSender();
   GURL http_url(kDummyHttpReportUri);
   ErrorReporter http_reporter(http_url, server_public_key_,
                               kServerPublicKeyTestVersion,
                               base::WrapUnique(http_mock_report_sender));
-  http_reporter.SendExtendedReportingReport(kDummyReport);
+  http_reporter.SendExtendedReportingReport(kDummyReport, 0);
 
   EXPECT_EQ(http_mock_report_sender->latest_report_uri(), http_url);
   EXPECT_EQ("application/octet-stream",
             http_mock_report_sender->latest_content_type());
   EXPECT_EQ(0, http_mock_report_sender->latest_report_id());
 
   std::string uploaded_report;
   EncryptedCertLoggerRequest encrypted_request;
   ASSERT_TRUE(encrypted_request.ParseFromString(
       http_mock_report_sender->latest_report()));
@@ skipping 18 matching lines @@
   net::TestURLRequestContext context(true);
   TestCertificateReporterNetworkDelegate test_delegate;
   test_delegate.set_url_request_destroyed_callback(run_loop.QuitClosure());
   context.set_network_delegate(&test_delegate);
   context.Init();
 
   GURL report_uri(
       net::URLRequestFailedJob::GetMockHttpUrl(net::ERR_CONNECTION_FAILED));
   ErrorReporter reporter(&context, report_uri,
                          net::ReportSender::DO_NOT_SEND_COOKIES);
-  reporter.SendExtendedReportingReport(kDummyReport);
+  reporter.SendExtendedReportingReport(kDummyReport, 0);
   run_loop.Run();
 
   histograms.ExpectTotalCount(kFailureHistogramName, 1);
   histograms.ExpectBucketCount(kFailureHistogramName,
                                -net::ERR_CONNECTION_FAILED, 1);
 }
 

[estark, 2016/11/11 01:15:49]

Could you add a test that the success/error callbacks get called with the
correct report id?

[meacer, 2016/11/11 19:59:29]

Added. I moved the UMA test to ping_manager_unittest.cc since it's recorded by
the ping manager now. Though, it's only temporarily so, as the new
CertificateManagerService will do it later on.

 // This test decrypts a "known gold" report. It's intentionally brittle
 // in order to catch changes in report encryption that could cause the
 // server to no longer be able to decrypt reports that it receives from
 // Chrome.
 TEST_F(ErrorReporterTest, DecryptExampleReport) {
   // This data should not be changed without also changing the
   // corresponding server-side test.
   const unsigned char kSerializedEncryptedReport[] = {
       0x0A, 0xFB, 0x0C, 0xD5, 0x44, 0x21, 0x36, 0x4D, 0xFC, 0x29, 0x56, 0xBD,
       0x47, 0x18, 0xB1, 0x6F, 0x97, 0xF1, 0xF0, 0x3C, 0x31, 0x31, 0x1D, 0xD7,
@@ skipping 143 matching lines @@
   ASSERT_TRUE(encrypted_request.ParseFromString(
       std::string(reinterpret_cast<const char*>(kSerializedEncryptedReport),
                   sizeof(kSerializedEncryptedReport))));
   ASSERT_TRUE(ErrorReporter::DecryptErrorReport(
       server_private_key_, encrypted_request, &decrypted_serialized_report));
 }
 
 }  // namespace
 
 }  // namespace certificate_reporting