Adding the Finch code for the certificate error reporter experiment

chrome/browser/ssl/ssl_blocking_page.cc

Index: chrome/browser/ssl/ssl_blocking_page.cc
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index e6083f8768ecf1a12308fb8d693f8b38bc584562..8a7887a59860777b5c06f3414c8ae60ec886e7f2 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -15,6 +15,7 @@
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/process/launch.h"
+#include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
@@ -35,6 +36,7 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/google/core/browser/google_util.h"
+#include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/interstitial_page.h"
@@ -100,6 +102,36 @@ enum SSLExpirationAndDecision {
 // Rappor prefix
 const char kSSLRapporPrefix[] = "ssl";
 
+// Check whether to report certificate verification errors to Google
+bool ReportCertificateErrors() {
+  // Check Finch and command line flags
+  const std::string show =
+      base::FieldTrialList::FindFullName("ReportCertificateErrors");
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(

[estark, 2015/03/27 23:23:41]

I believe we can remove this command-line flag altogether now, because the
default behavior with finch alone will be to not show the checkbox and not send
reports.

Not sure if that has to be done in this CL though.

[fahl, 2015/03/27 23:27:27]

I just left it there to not break the unittests.

+          switches::kEnableInvalidCertCollection)) {
+    return true;
+  }
+  if (show.compare("ShowAndPossiblySend") == 0) {
+    const std::string param = variations::GetVariationParamValue(
+        "ReportCertificateErrors", "possibly_send");
+    if (param.compare("") != 0) {
+      double possiblySend;
+      if (base::StringToDouble(param, &possiblySend))
+        return base::RandDouble() <= possiblySend;
+    }
+  }
+  return false;
+}
+
+// Check whether to show the certificate reporter checkbox
+bool ShowCertificateReporterCheckbox() {
+  // Check Finch and command line flags
+  return base::FieldTrialList::FindFullName("ReportCertificateErrors")
+                 .compare("ShowAndPossiblySend") == 0 ||
+         base::CommandLine::ForCurrentProcess()->HasSwitch(
+             switches::kEnableInvalidCertCollection);
+}
+
 void RecordSSLExpirationPageEventState(bool expired_but_previously_allowed,
                                        bool proceed,
                                        bool overridable) {
@@ -458,8 +490,7 @@ void SSLBlockingPage::PopulateExtendedReportingOption(
   // Only show the checkbox if not off-the-record and if the
   // command-line option is set.
   const bool show = !web_contents()->GetBrowserContext()->IsOffTheRecord() &&
-                    base::CommandLine::ForCurrentProcess()->HasSwitch(
-                        switches::kEnableInvalidCertCollection);
+                    ShowCertificateReporterCheckbox();
 
   load_time_data->SetBoolean(interstitials::kDisplayCheckBox, show);
   if (!show)
@@ -660,11 +691,12 @@ void SSLBlockingPage::FinishCertCollection() {
   metrics_helper()->RecordUserInteraction(
       SecurityInterstitialMetricsHelper::EXTENDED_REPORTING_IS_ENABLED);
 
-  if (certificate_report_callback_for_testing_.is_null())
-    scoped_callback.Reset(base::Bind(&base::DoNothing));
-
-  safe_browsing_ui_manager_->ReportInvalidCertificateChain(
-      request_url().host(), ssl_info_, scoped_callback.Release());
+  if (ReportCertificateErrors()) {
+    if (certificate_report_callback_for_testing_.is_null())
+      scoped_callback.Reset(base::Bind(&base::DoNothing));
+    safe_browsing_ui_manager_->ReportInvalidCertificateChain(
+        request_url().host(), ssl_info_, scoped_callback.Release());
+  }
 }
 
 // static