Split cert reporter class into report building/serializing and sending

chrome/browser/ssl/ssl_browser_tests.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
 #include "chrome/browser/net/certificate_error_reporter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
+#include "chrome/browser/ssl/cert_logger.pb.h"
+#include "chrome/browser/ssl/certificate_error_report.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 170 matching lines @@
 class MockReporter : public CertificateErrorReporter {
  public:
   explicit MockReporter(net::URLRequestContext* request_context,
                         const GURL& upload_url,
                         CookiesPreference cookies_preference)
       : CertificateErrorReporter(request_context,
                                  upload_url,
                                  cookies_preference) {}
 
   void SendReport(CertificateErrorReporter::ReportType type,
-                  const std::string& hostname,
-                  const net::SSLInfo& ssl_info) override {
+                  const std::string& serialized_report) override {
+    chrome_browser_ssl::CertificateErrorReport report;
+    ASSERT_TRUE(report.InitializeFromString(serialized_report));
     EXPECT_EQ(CertificateErrorReporter::REPORT_TYPE_EXTENDED_REPORTING, type);
-    latest_hostname_reported_ = hostname;
+    latest_hostname_reported_ = report.hostname();
   }
 
   const std::string& latest_hostname_reported() {
     return latest_hostname_reported_;
   }
 
  private:
   std::string latest_hostname_reported_;
 };
 
@@ skipping 12 matching lines @@
       const scoped_refptr<SafeBrowsingUIManager>& safe_browsing_ui_manager,
       const base::Closure& report_sent_callback)
       : safe_browsing_ui_manager_(safe_browsing_ui_manager),
         reported_(false),
         expect_report_(false),
         report_sent_callback_(report_sent_callback) {}
 
   ~MockSSLCertReporter() override { EXPECT_EQ(expect_report_, reported_); }
 
   // SSLCertReporter implementation
-  void ReportInvalidCertificateChain(const std::string& hostname,
-                                     const net::SSLInfo& ssl_info) override {
+  void ReportInvalidCertificateChain(
+      const std::string& serialized_report) override {
     reported_ = true;
     if (expect_report_) {
       safe_browsing_ui_manager_->ReportInvalidCertificateChain(
-          hostname, ssl_info, report_sent_callback_);
+          serialized_report, report_sent_callback_);
     }
   }
 
   void set_expect_report(bool expect_report) { expect_report_ = expect_report; }
 
  private:
   const scoped_refptr<SafeBrowsingUIManager> safe_browsing_ui_manager_;
   bool reported_;
   bool expect_report_;
   base::Closure report_sent_callback_;
@@ skipping 2104 matching lines @@
 
 // Visit a page over https that contains a frame with a redirect.
 
 // XMLHttpRequest insecure content in synchronous mode.
 
 // XMLHttpRequest insecure content in asynchronous mode.
 
 // XMLHttpRequest over bad ssl in synchronous mode.
 
 // XMLHttpRequest over OK ssl in synchronous mode.