Add Finch testing configs for ReportCertificateErrors study

chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

 // 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.
 
 #include "chrome/browser/ssl/captive_portal_blocking_page.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 260 matching lines @@
 }
 
 // Same as above, with no SSID and no login URL.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
                        WiFi_NoSSID_NoLoginURL) {
   const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL);
   TestInterstitial(true, std::string(), kLandingUrl, EXPECT_WIFI_YES,
                    EXPECT_WIFI_SSID_NO, EXPECT_LOGIN_URL_NO);
 }
 
 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 {
  protected:
   // SecurityInterstitialIDNTest implementation
   SecurityInterstitialPage* CreateInterstitial(
       content::WebContents* contents,
       const GURL& request_url) const override {
     // Delegate is owned by the blocking page.
     FakeConnectionInfoDelegate* delegate =
         new FakeConnectionInfoDelegate(false, std::string());
     net::SSLInfo empty_ssl_info;
     // Blocking page is owned by the interstitial.
     CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
         contents, GURL(kBrokenSSL), request_url, nullptr, empty_ssl_info,
         base::Callback<void(bool)>());
     blocking_page->SetDelegate(delegate);
     return blocking_page;
   }
 };
 
 // Test that an IDN login domain is decoded properly.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest,
                        ShowLoginIDNIfPortalRedirectsDetectionURL) {
   EXPECT_TRUE(VerifyIDNDecoded());
 }