[Reland] Refactoring of SBER preference usage

chrome/browser/ssl/cert_report_helper.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/cert_report_helper.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_cert_reporter.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/security_interstitials/core/controller_client.h"
 #include "components/security_interstitials/core/metrics_helper.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace {
+
+// Returns a pointer to the Profile associated with |web_contents|.
+Profile* GetProfile(content::WebContents* web_contents) {
+  return Profile::FromBrowserContext(web_contents->GetBrowserContext());
+}
+
+}  // namespace
+
 // Constants for the HTTPSErrorReporter Finch experiment
 const char CertReportHelper::kFinchExperimentName[] = "ReportCertificateErrors";
 const char CertReportHelper::kFinchGroupShowPossiblySend[] =
     "ShowAndPossiblySend";
 const char CertReportHelper::kFinchGroupDontShowDontSend[] =
     "DontShowAndDontSend";
 const char CertReportHelper::kFinchParamName[] = "sendingThreshold";
 
 CertReportHelper::CertReportHelper(
     std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
@@ skipping 18 matching lines @@
     base::DictionaryValue* load_time_data) {
   // Only show the checkbox if not off-the-record and if this client is
   // part of the respective Finch group, and the feature is not disabled
   // by policy.
   const bool show = ShouldShowCertificateReporterCheckbox();
 
   load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, show);
   if (!show)
     return;
 
-  load_time_data->SetBoolean(
-      security_interstitials::kBoxChecked,
-      IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled));
+  load_time_data->SetBoolean(security_interstitials::kBoxChecked,
+                             safe_browsing::IsExtendedReportingEnabled(
+                                 *GetProfile(web_contents_)->GetPrefs()));
 
   const std::string privacy_link = base::StringPrintf(
       security_interstitials::kPrivacyLinkHtml,
       security_interstitials::CMD_OPEN_REPORTING_PRIVACY,
       l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE).c_str());
 
   load_time_data->SetString(
       security_interstitials::kOptInLink,
       l10n_util::GetStringFUTF16(IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE,
                                  base::UTF8ToUTF16(privacy_link)));
 }
 
 void CertReportHelper::FinishCertCollection(
     certificate_reporting::ErrorReport::ProceedDecision user_proceeded) {
   if (!ShouldShowCertificateReporterCheckbox())
     return;
 
-  if (!IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled))
+  if (!safe_browsing::IsExtendedReportingEnabled(
+          *GetProfile(web_contents_)->GetPrefs()))
     return;
 
   if (metrics_helper_) {
     metrics_helper_->RecordUserInteraction(
         security_interstitials::MetricsHelper::EXTENDED_REPORTING_IS_ENABLED);
   }
 
   if (!ShouldReportCertificateError())
     return;
 
@@ skipping 41 matching lines @@
     double sendingThreshold;
     if (base::StringToDouble(param, &sendingThreshold)) {
       if (sendingThreshold >= 0.0 && sendingThreshold <= 1.0)
         return base::RandDouble() <= sendingThreshold;
     }
   }
   return false;
 }
 
 bool CertReportHelper::IsPrefEnabled(const char* pref) {
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
-  return profile->GetPrefs()->GetBoolean(pref);
+  return GetProfile(web_contents_)->GetPrefs()->GetBoolean(pref);
 }