Add Finch testing configs for ReportCertificateErrors study

chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

Index: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
index 0d649ee633bc87fb176f524546a33baa85c1b2c0..e641d4b53ca3ed4f5e3aa7804c9ab103ea9a3828 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -279,16 +279,18 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
 }
 
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest, CertReportingOptIn) {

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

nit: Can you add a comment here saying something like "this test should only run
if the expected report is OPT IN"? It's obvious from the code, but is also a bit
confusing given this one and the next test case almost do the same thing except
for the OPT_IN flag.

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

Done. I also remove the Finch check from the next test, since I realized it's
actually even better to test no-opt-in => no-report under all the test Finch
configs.

-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "1.0");
-  TestCertReporting(CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN);
+  if (CertificateReportingTestUtils::GetReportExpectedFromFinch() ==
+      CertificateReportingTestUtils::CERT_REPORT_EXPECTED) {
+    TestCertReporting(CertificateReportingTestUtils::EXTENDED_REPORTING_OPT_IN);
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest, CertReportingOptOut) {
-  CertificateReportingTestUtils::SetCertReportingFinchConfig(
-      CertReportHelper::kFinchGroupShowPossiblySend, "1.0");
-  TestCertReporting(
-      CertificateReportingTestUtils::EXTENDED_REPORTING_DO_NOT_OPT_IN);
+  if (CertificateReportingTestUtils::GetReportExpectedFromFinch() ==
+      CertificateReportingTestUtils::CERT_REPORT_EXPECTED) {
+    TestCertReporting(
+        CertificateReportingTestUtils::EXTENDED_REPORTING_DO_NOT_OPT_IN);
+  }
 }
 
 class CaptivePortalBlockingPageIDNTest : public SecurityInterstitialIDNTest {