[Reland] Refactoring of SBER preference usage

chrome/browser/ssl/certificate_reporting_test_utils.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/certificate_reporting_test_utils.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/ssl/cert_report_helper.h"
 #include "chrome/browser/ssl/ssl_cert_reporter.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/common/pref_names.h"
 #include "components/certificate_reporting/error_report.h"
 #include "components/prefs/pref_service.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/variations/variations_associated_data.h"
 #include "net/url_request/report_sender.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using safe_browsing::SafeBrowsingService;
 using safe_browsing::SafeBrowsingUIManager;
 
 namespace {
@@ skipping 79 matching lines @@
           base::Passed(std::unique_ptr<certificate_reporting::ErrorReporter>(
               reporter_))));
 }
 
 const std::string& CertificateReportingTest::GetLatestHostnameReported() const {
   return reporter_->latest_hostname_reported();
 }
 
 void SetCertReportingOptIn(Browser* browser, OptIn opt_in) {
   browser->profile()->GetPrefs()->SetBoolean(
-      prefs::kSafeBrowsingExtendedReportingEnabled,
+      safe_browsing::GetExtendedReportingPrefName(),
       opt_in == EXTENDED_REPORTING_OPT_IN);
 }
 
 std::unique_ptr<SSLCertReporter> SetUpMockSSLCertReporter(
     base::RunLoop* run_loop,
     ExpectReport expect_report) {
   // Set up a MockSSLCertReporter to keep track of when the blocking
   // page invokes the cert reporter.
   SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
   EXPECT_TRUE(sb_service);
@@ skipping 21 matching lines @@
     if (!base::StringToDouble(param, &sendingThreshold))
       return CERT_REPORT_NOT_EXPECTED;
 
     if (sendingThreshold == 1.0)
       return certificate_reporting_test_utils::CERT_REPORT_EXPECTED;
   }
   return certificate_reporting_test_utils::CERT_REPORT_NOT_EXPECTED;
 }
 
 }  // namespace certificate_reporting_test_utils