[Reland] Refactoring of SBER preference usage

chrome/browser/safe_browsing/download_protection_service.cc

 // Copyright (c) 2012 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/safe_browsing/download_protection_service.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 34 matching lines @@
 #include "chrome/common/safe_browsing/binary_feature_extractor.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/common/safe_browsing/download_protection_util.h"
 #include "chrome/common/safe_browsing/file_type_policies.h"
 #include "chrome/common/safe_browsing/zip_analyzer_results.h"
 #include "chrome/common/url_constants.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/prefs/pref_service.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/page_navigator.h"
 #include "crypto/sha2.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/url_util.h"
 #include "net/cert/x509_cert_types.h"
 #include "net/cert/x509_certificate.h"
@@ skipping 104 matching lines @@
       SBStatsType dangerous_type)
       : sha256_hash_(item.GetHash()),
         url_chain_(item.GetUrlChain()),
         referrer_url_(item.GetReferrerUrl()),
         callback_(callback),
         ui_manager_(ui_manager),
         start_time_(base::TimeTicks::Now()),
         total_type_(total_type),
         dangerous_type_(dangerous_type) {
     Profile* profile = Profile::FromBrowserContext(item.GetBrowserContext());
-    is_extended_reporting_ = profile &&
-                             profile->GetPrefs()->GetBoolean(
-                                 prefs::kSafeBrowsingExtendedReportingEnabled);
+    is_extended_reporting_ =
+        profile && IsExtendedReportingEnabled(*profile->GetPrefs());
   }
 
   virtual void StartCheck() = 0;
   virtual bool IsDangerous(SBThreatType threat_type) const = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<DownloadSBClient>;
   ~DownloadSBClient() override {}
 
   void CheckDone(SBThreatType threat_type) {
@@ skipping 154 matching lines @@
                DownloadFileType::SAMPLED_PING;
   }
 
   void Start() {
     DVLOG(2) << "Starting SafeBrowsing download check for: "
              << item_->DebugString(true);
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (item_->GetBrowserContext()) {
       Profile* profile =
           Profile::FromBrowserContext(item_->GetBrowserContext());
-      is_extended_reporting_ = profile &&
-             profile->GetPrefs()->GetBoolean(
-                 prefs::kSafeBrowsingExtendedReportingEnabled);
+      is_extended_reporting_ =
+          profile && IsExtendedReportingEnabled(*profile->GetPrefs());
       is_incognito_ = item_->GetBrowserContext()->IsOffTheRecord();
     }
 
     DownloadCheckResultReason reason = REASON_MAX;
     if (!IsSupportedDownload(
         *item_, item_->GetTargetFilePath(), &reason, &type_)) {
       switch (reason) {
         case REASON_EMPTY_URL_CHAIN:
         case REASON_INVALID_URL:
         case REASON_LOCAL_FILE:
@@ skipping 245 matching lines @@
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(item_ == NULL);
   }
 
   // .zip files that look invalid to Chrome can often be successfully unpacked
   // by other archive tools, so they may be a real threat.  For that reason,
   // we send pings for them if !in_incognito && is_extended_reporting.
   bool CanReportInvalidArchives() {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     Profile* profile = Profile::FromBrowserContext(item_->GetBrowserContext());
-    if (!profile ||
-        !profile->GetPrefs()->GetBoolean(
-            prefs::kSafeBrowsingExtendedReportingEnabled))
+    if (!profile || !IsExtendedReportingEnabled(*profile->GetPrefs()))
       return false;
 
     return !item_->GetBrowserContext()->IsOffTheRecord();
   }
 
   void OnFileFeatureExtractionDone() {
     // This can run in any thread, since it just posts more messages.
 
     // TODO(noelutz): DownloadInfo should also contain the IP address of
     // every URL in the redirect chain.  We also should check whether the
@@ skipping 606 matching lines @@
         default_file_path_(default_file_path),
         alternate_extensions_(alternate_extensions),
         callback_(callback),
         service_(service),
         database_manager_(database_manager),
         start_time_(base::TimeTicks::Now()),
         supported_path_(
             GetSupportedFilePath(default_file_path, alternate_extensions)),
         weakptr_factory_(this) {
     DCHECK(profile);
-    is_extended_reporting_ = profile->GetPrefs()->GetBoolean(
-        prefs::kSafeBrowsingExtendedReportingEnabled);
+    is_extended_reporting_ = IsExtendedReportingEnabled(*profile->GetPrefs());
   }
 
   ~PPAPIDownloadRequest() override {
     if (fetcher_ && !callback_.is_null())
       Finish(RequestOutcome::REQUEST_DESTROYED, UNKNOWN);
   }
 
   // Start the process of checking the download request. The callback passed as
   // the |callback| parameter to the constructor will be invoked with the result
   // of the check at some point in the future.
@@ skipping 520 matching lines @@
 GURL DownloadProtectionService::GetDownloadRequestUrl() {
   GURL url(kDownloadRequestUrl);
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty())
     url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true));
 
   return url;
 }
 
 }  // namespace safe_browsing