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>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/test/histogram_tester.h"
 #include "components/certificate_reporting/encrypted_cert_logger.pb.h"
 #include "crypto/curve25519.h"
 #include "net/test/url_request/url_request_failed_job.h"
+#include "net/test/url_request/url_request_mock_data_job.h"
 #include "net/url_request/report_sender.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace certificate_reporting {
 
 namespace {
 
 const char kDummyHttpReportUri[] = "http://example.test";
 const char kDummyHttpsReportUri[] = "https://example.test";
 const char kDummyReport[] = "a dummy report";
 const uint32_t kServerPublicKeyTestVersion = 16;
-const char kFailureHistogramName[] = "SSL.CertificateErrorReportFailure";
+
+void ErrorCallback(bool* called,
+                   int expected_report_id,
+                   const GURL& report_uri,
+                   int net_error,
+                   int report_id) {
+  EXPECT_NE(net::OK, net_error);
+  *called = true;
+  EXPECT_EQ(expected_report_id, report_id);
+}
+
+void SuccessCallback(bool* called, int expected_report_id, int report_id) {
+  *called = true;
+  EXPECT_EQ(expected_report_id, report_id);
+}
 
 // A mock ReportSender that keeps track of the last report
 // sent.
 class MockCertificateReportSender : public net::ReportSender {
  public:
   MockCertificateReportSender()
       : net::ReportSender(nullptr, DO_NOT_SEND_COOKIES) {}
   ~MockCertificateReportSender() override {}
 
   void Send(const GURL& report_uri,
@@ skipping 67 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()));
   EXPECT_EQ(kServerPublicKeyTestVersion,
             encrypted_request.server_public_key_version());
   EXPECT_EQ(EncryptedCertLoggerRequest::AEAD_ECDH_AES_128_CTR_HMAC_SHA256,
             encrypted_request.algorithm());
   ASSERT_TRUE(ErrorReporter::DecryptErrorReport(
       server_private_key_, encrypted_request, &uploaded_report));
 
   EXPECT_EQ(kDummyReport, uploaded_report);
 }
 
 // Tests that an UMA histogram is recorded if a report fails to send.
-TEST_F(ErrorReporterTest, UMAOnFailure) {
+TEST_F(ErrorReporterTest, ErroredRequestCallsCallback) {
   net::URLRequestFailedJob::AddUrlHandler();
 
-  base::HistogramTester histograms;
-  histograms.ExpectTotalCount(kFailureHistogramName, 0);
-
   base::RunLoop run_loop;
   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);
+
+  bool error_callback_called = false;
+  bool success_callback_called = false;
+  const int report_id = 42;
+  reporter.SetErrorCallback(
+      base::Bind(&ErrorCallback, &error_callback_called, report_id));
+  reporter.SetSuccessCallback(
+      base::Bind(&SuccessCallback, &success_callback_called, report_id));
+  reporter.SendExtendedReportingReport(kDummyReport, report_id);
   run_loop.Run();
 
-  histograms.ExpectTotalCount(kFailureHistogramName, 1);
-  histograms.ExpectBucketCount(kFailureHistogramName,
-                               -net::ERR_CONNECTION_FAILED, 1);
+  EXPECT_TRUE(error_callback_called);
+  EXPECT_FALSE(success_callback_called);
+}
+
+// Tests that an UMA histogram is recorded if a report fails to send.
+TEST_F(ErrorReporterTest, SuccessfulRequestCallsCallback) {
+  net::URLRequestMockDataJob::AddUrlHandler();
+
+  base::RunLoop run_loop;
+  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::URLRequestMockDataJob::GetMockHttpUrl("some data", 1));
+  ErrorReporter reporter(&context, report_uri,
+                         net::ReportSender::DO_NOT_SEND_COOKIES);
+
+  bool error_callback_called = false;
+  bool success_callback_called = false;
+  const int report_id = 42;
+  reporter.SetErrorCallback(
+      base::Bind(&ErrorCallback, &error_callback_called, report_id));
+  reporter.SetSuccessCallback(
+      base::Bind(&SuccessCallback, &success_callback_called, report_id));
+  reporter.SendExtendedReportingReport(kDummyReport, report_id);
+  run_loop.Run();
+
+  EXPECT_FALSE(error_callback_called);
+  EXPECT_TRUE(success_callback_called);
 }
 
 // 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[] = {
@@ skipping 145 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