Split cert reporter class into report building/serializing and sending

chrome/browser/net/certificate_error_reporter.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_CERTIFICATE_ERROR_REPORTER_H_
 #define CHROME_BROWSER_NET_CERTIFICATE_ERROR_REPORTER_H_
 
 #include <set>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequestContext;
 class SSLInfo;
 }
 
 namespace chrome_browser_net {
 
-class CertLoggerRequest;
 class EncryptedCertLoggerRequest;
 
 // Provides functionality for sending reports about invalid SSL
 // certificate chains to a report collection server.
 class CertificateErrorReporter : public net::URLRequest::Delegate {
  public:
   // These represent the types of reports that can be sent.
   enum ReportType {
     // A report of a certificate chain that failed a certificate pinning
     // check.
@@ skipping 31 matching lines @@
   // SendReport actually sends the report over the network; callers are
   // responsible for enforcing any preconditions (such as obtaining user
   // opt-in, only sending reports for certain hostnames, checking for
   // incognito mode, etc.).
   //
   // On some platforms (but not all), CertificateErrorReporter can use
   // an HTTP endpoint to send encrypted extended reporting reports. On
   // unsupported platforms, callers must send extended reporting reports
   // over SSL.
   virtual void SendReport(ReportType type,
-                          const std::string& hostname,
-                          const net::SSLInfo& ssl_info);
+                          const std::string& serialized_report);

[eroman, 2015/05/12 00:27:51]

Please add some description of what serialized_report contains (data contents,
as well as the format). It doesn't need to be fully specified, but there should
be some general pointers to its value.

[estark, 2015/05/12 20:42:15]

Done.

 
   // net::URLRequest::Delegate
   void OnResponseStarted(net::URLRequest* request) override;
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
 
   // Callers can use this method to determine if sending reports over
   // HTTP is supported.
   static bool IsHttpUploadUrlSupported();
 
   // Used by tests.
   static bool DecryptCertificateErrorReport(
       const uint8 server_private_key[32],
       const EncryptedCertLoggerRequest& encrypted_report,
-      CertLoggerRequest* decrypted_report);
+      std::string* decrypted_serialized_report);
 
  private:
   // Create a URLRequest with which to send a certificate report to the
   // server.
   virtual scoped_ptr<net::URLRequest> CreateURLRequest(
       net::URLRequestContext* context);
 
-  // Serialize and send a CertLoggerRequest protobuf to the report
+  // Send a serialized report (encrypted or not) to the report

[eroman, 2015/05/12 00:27:51]

nit: All of these comments should be descriptive "Sends a serialized ..." rather
than imperative "Send a serialized". See
https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Function_Com...

[estark, 2015/05/12 20:42:16]

Done.

   // collection server.
-  void SendCertLoggerRequest(const CertLoggerRequest& request);
-
   void SendSerializedRequest(const std::string& serialized_request);
 
-  // Populate the CertLoggerRequest for a report.
-  static void BuildReport(const std::string& hostname,
-                          const net::SSLInfo& ssl_info,
-                          CertLoggerRequest* out_request);
-
   // Performs post-report cleanup.
   void RequestComplete(net::URLRequest* request);
 
   net::URLRequestContext* const request_context_;
   const GURL upload_url_;
 
   // Owns the contained requests.
   std::set<net::URLRequest*> inflight_requests_;
 
   CookiesPreference cookies_preference_;
 
   const uint8* server_public_key_;
   const uint32 server_public_key_version_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateErrorReporter);
 };
 
 }  // namespace chrome_browser_net
 
 #endif  // CHROME_BROWSER_NET_CERTIFICATE_ERROR_REPORTER_H_