Add chrome channel to cert logger reports

chrome/browser/ssl/ssl_browser_tests.cc

Index: chrome/browser/ssl/ssl_browser_tests.cc
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 9f72ac7c7f02c5ec1e91b1e745d51af683f86b7a..b88c9da7d923637599994fe300cdf1a6c77cd5ce 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -581,6 +581,8 @@ class SSLUITest : public InProcessBrowserTest {
         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) {
@@ -598,9 +600,13 @@ class SSLUITest : public InProcessBrowserTest {
       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());
     }
   }