Add chrome channel to cert logger reports

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 <utility>
 
 #include "base/base64.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 563 matching lines @@
             expect_report);
 
     ASSERT_TRUE(tab->GetInterstitialPage() != nullptr);
     SSLBlockingPage* interstitial_page = static_cast<SSLBlockingPage*>(
         tab->GetInterstitialPage()->GetDelegateForTesting());
     ASSERT_TRUE(interstitial_page != nullptr);
     interstitial_page->SetSSLCertReporterForTesting(
         std::move(ssl_cert_reporter));
 
     EXPECT_EQ(std::string(), reporter_callback.GetLatestHostnameReported());
+    EXPECT_EQ(certificate_reporting::CertLoggerRequest::CHROME_CHANNEL_NONE,

[estark, 2017/07/10 20:43:01]

Does this pass? I'd expect it to be CHROME_CHANNEL_UNKNOWN because
AddChromeChannel never returns CHROME_CHANNEL_NONE.

[sperigo, 2017/07/10 22:43:23]

It does! Mustafa and I spent some time designing this test late last week. Right
now we're explicitly setting the Channel to CHROME_CHANNEL_NONE in the test help
constructor in order to check that the Channel isn't set before AddChromeChannel
executes.

[estark, 2017/07/10 23:03:19]

Ohh, I see; I actually meant to put this comment on line 603, and I also misread
line 603 as EXPECT_EQ. My bad (x2) -- lgtm.

+              reporter_callback.GetLatestChromeChannelReported());
 
     // Leave the interstitial (either by proceeding or going back)
     if (proceed == SSL_INTERSTITIAL_PROCEED) {
       ProceedThroughInterstitial(tab);
     } else {
       // Click "Take me back"
       InterstitialPage* interstitial_page = tab->GetInterstitialPage();
       ASSERT_TRUE(interstitial_page);
       interstitial_page->DontProceed();
     }
 
     if (expect_report ==
         certificate_reporting_test_utils::CERT_REPORT_EXPECTED) {
       // Check that the mock reporter received a request to send a report.
       run_loop.Run();
       EXPECT_EQ(https_server_expired_.GetURL("/title1.html").host(),
                 reporter_callback.GetLatestHostnameReported());
+      EXPECT_NE(certificate_reporting::CertLoggerRequest::CHROME_CHANNEL_NONE,
+                reporter_callback.GetLatestChromeChannelReported());
     } else {
       base::RunLoop().RunUntilIdle();
       EXPECT_EQ(std::string(), reporter_callback.GetLatestHostnameReported());
+      EXPECT_EQ(certificate_reporting::CertLoggerRequest::CHROME_CHANNEL_NONE,
+                reporter_callback.GetLatestChromeChannelReported());
     }
   }
 
   // Helper function for testing invalid certificate chain reporting with the
   // bad clock interstitial.
   void TestBadClockReporting(
       certificate_reporting_test_utils::OptIn opt_in,
       certificate_reporting_test_utils::ExpectReport expect_report,
       Browser* browser) {
     ASSERT_TRUE(https_server_expired_.Start());
@@ skipping 4332 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.