Add chrome channel to cert logger reports

chrome/browser/ssl/certificate_reporting_test_utils.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_SSL_CERTIFICATE_REPORTING_TEST_UTILS_H_
 #define CHROME_BROWSER_SSL_CERTIFICATE_REPORTING_TEST_UTILS_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "chrome/browser/ssl/ssl_cert_reporter.h"
+#include "components/certificate_reporting/cert_logger.pb.h"
 #include "components/certificate_reporting/error_reporter.h"
 
 class Browser;
 
 namespace base {
 class RunLoop;
 }
 
 namespace certificate_reporting_test_utils {
 
 enum OptIn { EXTENDED_REPORTING_OPT_IN, EXTENDED_REPORTING_DO_NOT_OPT_IN };
 
 enum ExpectReport { CERT_REPORT_NOT_EXPECTED, CERT_REPORT_EXPECTED };
 
 // This class is used to keep track of the latest hostname for sent reports. An
 // SSLCertReporter is destroyed when the interstitial it's associated with is
 // dismissed, so the tests can't check whether SSLCertReporter sent a report.
 // For that reason, SSLCertReporter calls ReportSent() method on this class when
 // it sends a report. SSLCertReporterCallback outlives both the SSLCertReporter
 // and the interstitial so that the tests can query the latest hostname for
 // which a report was sent.
 class SSLCertReporterCallback {
  public:
   explicit SSLCertReporterCallback(base::RunLoop* run_loop);
   ~SSLCertReporterCallback();
 
-  void ReportSent(const std::string& hostname);
+  void ReportSent(const std::string& hostname,
+                  const certificate_reporting::CertLoggerRequest::ChromeChannel
+                      chrome_channel);
 
   const std::string& GetLatestHostnameReported() const;
+  certificate_reporting::CertLoggerRequest::ChromeChannel
+  GetLatestChromeChannelReported() const;
 
  private:
   base::RunLoop* run_loop_;
   std::string latest_hostname_reported_;
+  certificate_reporting::CertLoggerRequest::ChromeChannel chrome_channel_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLCertReporterCallback);
 };
 
 // Sets the browser preference to enable or disable extended reporting.
 void SetCertReportingOptIn(Browser* browser, OptIn opt_in);
 
 // Creates a mock SSLCertReporter and return a pointer to it, which will
 // be owned by the caller. The mock SSLCertReporter will call
 // |report_sent_callback| when a report is sent. It also checks that a
 // report is sent or not sent according to |expect_report|.
 std::unique_ptr<SSLCertReporter> CreateMockSSLCertReporter(
-    const base::Callback<void(const std::string&)>& report_sent_callback,
+    const base::Callback<
+        void(const std::string&,
+             const certificate_reporting::CertLoggerRequest_ChromeChannel)>&
+        report_sent_callback,
     ExpectReport expect_report);
 
 // Returns whether a report should be expected (due to the Finch config)
 // if the user opts in.
 ExpectReport GetReportExpectedFromFinch();
 
 }  // namespace certificate_reporting_test_utils
 
 #endif  // CHROME_BROWSER_SSL_CERTIFICATE_REPORTING_TEST_UTILS_H_