Add Finch testing configs for ReportCertificateErrors study

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 31a3f6a13dbca0299249c2e0d90f7547f2626427..6d8a56d8597f35f4b4249719e023c0a4575e5505 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -1065,98 +1065,68 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestDisplaysInsecureContent) {
                           AuthState::DISPLAYED_INSECURE_CONTENT);
 }
 
-// User proceeds, checkbox is shown and checked, Finch parameter is set
-// -> we expect a report.
-IN_PROC_BROWSER_TEST_F(
-    SSLUITestWithExtendedReporting,
-    TestBrokenHTTPSProceedWithShowYesCheckYesParamYesReportYes) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "1.0");
+// Test that if the user proceeds and the checkbox is checked, a report
+// is sent or not sent depending on the Finch config.
+IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
+                       TestBrokenHTTPSProceedReporting) {
+  CertificateReportingTestUtils::ExpectReport expect_report =
+      CertificateReportingTestUtils::GetReportExpectedFromFinch();
   TestBrokenHTTPSReporting(
       CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
-      CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED,
-      CertificateReportingTestUtils::CERT_REPORT_EXPECTED, browser());
+      CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED, expect_report,
+      browser());
 }
 
-// User goes back, checkbox is shown and checked, Finch parameter is set
-// -> we expect a report.
-IN_PROC_BROWSER_TEST_F(
-    SSLUITestWithExtendedReporting,
-    TestBrokenHTTPSGoBackWithShowYesCheckYesParamYesReportYes) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "1.0");
+// Test that if the user goes back and the checkbox is checked, a report
+// is sent or not sent depending on the Finch config.
+IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
+                       TestBrokenHTTPSGoBackReporting) {
+  CertificateReportingTestUtils::ExpectReport expect_report =
+      CertificateReportingTestUtils::GetReportExpectedFromFinch();
   TestBrokenHTTPSReporting(
       CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
       CertificateReportingTestUtils::SSL_INTERSTITIAL_DO_NOT_PROCEED,
-      CertificateReportingTestUtils::CERT_REPORT_EXPECTED, browser());
+      expect_report, browser());
 }
 
-// User proceeds, checkbox is shown but unchecked, Finch parameter is set
-// -> we expect no report.
-IN_PROC_BROWSER_TEST_F(
-    SSLUITestWithExtendedReporting,
-    TestBrokenHTTPSProceedWithShowYesCheckNoParamYesReportNo) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "1.0");
+// User proceeds, checkbox is shown but unchecked. Reports should never
+// be sent, regardless of Finch config.
+IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
+                       TestBrokenHTTPSProceedReportingWithNoOptIn) {
   TestBrokenHTTPSReporting(
       CertificateReportingTestUtils::EXTENDED_REPORTING_DO_NOT_OPT_IN,
       CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED,
       CertificateReportingTestUtils::CERT_REPORT_NOT_EXPECTED, browser());
 }
 
-// User goes back, checkbox is shown but unchecked, Finch parameter is set
-// -> we expect no report.
+// User goes back, checkbox is shown but unchecked. Reports should never
+// be sent, regardless of Finch config.
 IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
                        TestBrokenHTTPSGoBackShowYesCheckNoParamYesReportNo) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "1.0");
   TestBrokenHTTPSReporting(
       CertificateReportingTestUtils::EXTENDED_REPORTING_DO_NOT_OPT_IN,
       CertificateReportingTestUtils::SSL_INTERSTITIAL_DO_NOT_PROCEED,
       CertificateReportingTestUtils::CERT_REPORT_NOT_EXPECTED, browser());
 }
 
-// User proceeds, checkbox is shown and checked, Finch parameter is not
-// set -> we expect no report.
-IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
-                       TestBrokenHTTPSProceedShowYesCheckYesParamNoReportNo) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "-1.0");
-  TestBrokenHTTPSReporting(
-      CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
-      CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED,
-      CertificateReportingTestUtils::CERT_REPORT_NOT_EXPECTED, browser());
-}
-
-// User goes back, checkbox is shown and checked, Finch parameter is not set
-// -> we expect no report.
-IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
-                       TestBrokenHTTPSGoBackShowYesCheckYesParamNoReportNo) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "-1.0");
-  TestBrokenHTTPSReporting(
-      CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
-      CertificateReportingTestUtils::SSL_INTERSTITIAL_DO_NOT_PROCEED,
-      CertificateReportingTestUtils::CERT_REPORT_NOT_EXPECTED, browser());
-}
-
-// User proceeds, checkbox is not shown but checked -> we expect no report
+// User proceeds, checkbox is not shown but checked -> we expect no
+// report.
 IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
                        TestBrokenHTTPSProceedShowNoCheckYesReportNo) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupDontShowDontSend);
-  TestBrokenHTTPSReporting(
-      CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
-      CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED,
-      CertificateReportingTestUtils::CERT_REPORT_NOT_EXPECTED, browser());
+  if (base::FieldTrialList::FindFullName(
+          CertReportHelper::kFinchExperimentName) ==
+      CertReportHelper::kFinchGroupDontShowDontSend) {
+    TestBrokenHTTPSReporting(
+        CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
+        CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED,
+        CertificateReportingTestUtils::CERT_REPORT_NOT_EXPECTED, browser());
+  }
 }
 
-// Browser is incognito, user proceeds, checkbox is shown and checked, Finch
-// parameter is set -> we expect no report
+// Browser is incognito, user proceeds, checkbox is shown and checked ->

[meacer, 2015/07/21 06:04:31]

Why do we show the checkbox in incognito if it doesn't control anything?

[estark, 2015/07/21 14:50:09]

Hmm, I think we don't, actually. "Checkbox is shown and checked" was probably
shorthand for "user is in Finch group where checkboxes get shown and had
previously opted-in in non-incognito so that the opt-in preference is set." But
the test is actually even a little more general than that now -- testing that
reports never get sent in incognito regardless of Finch config -- so I updated
the comment to match.

[meacer, 2015/07/21 17:36:25]

Ah, makes sense now.

+// no report, regardless of Finch config.
 IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
                        TestBrokenHTTPSInIncognitoReportNo) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "1.0");
   TestBrokenHTTPSReporting(
       CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
       CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED,
@@ -1164,19 +1134,6 @@ IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,
       CreateIncognitoBrowser());
 }
 
-// User proceeds, checkbox is shown and checked, Finch parameter is invalid
-// -> we expect no report.
-IN_PROC_BROWSER_TEST_F(
-    SSLUITestWithExtendedReporting,
-    TestBrokenHTTPSProceedWithShowYesCheckYesParamInvalidReportNo) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "abcdef");
-  TestBrokenHTTPSReporting(
-      CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN,
-      CertificateReportingTestUtils::SSL_INTERSTITIAL_PROCEED,
-      CertificateReportingTestUtils::CERT_REPORT_NOT_EXPECTED, browser());
-}
-
 // Test that reports don't get sent when extended reporting opt-in is
 // disabled by policy.
 IN_PROC_BROWSER_TEST_F(SSLUITestWithExtendedReporting,