[Reland] Refactoring of SBER preference usage

chrome/browser/safe_browsing/srt_fetcher_win.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/safe_browsing/srt_fetcher_win.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 26 matching lines @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/component_updater/pref_names.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/prefs/pref_service.h"
 #include "components/rappor/rappor_service.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
@@ skipping 489 matching lines @@
       }
     }
   }
   if (show_bubble)
     global_error->ShowBubbleView(browser);
 }
 
 bool SafeBrowsingExtendedEnabledForBrowser(const Browser* browser) {
   const Profile* profile = browser->profile();
   return profile && !profile->IsOffTheRecord() &&
-         profile->GetPrefs()->GetBoolean(
-             prefs::kSafeBrowsingExtendedReportingEnabled);
+         IsExtendedReportingEnabled(*profile->GetPrefs());
 }
 
 // Returns true if there is a profile that is not in incognito mode and the user
 // has opted into Safe Browsing extended reporting.
 bool SafeBrowsingExtendedReportingEnabled() {
   BrowserList* browser_list = BrowserList::GetInstance();
   return std::any_of(browser_list->begin_last_active(),
                      browser_list->end_last_active(),
                      &SafeBrowsingExtendedEnabledForBrowser);
 }
@@ skipping 508 matching lines @@
   return srt_cleaner_key.Open(HKEY_CURRENT_USER, cleaner_key_path.c_str(),
                               KEY_QUERY_VALUE) == ERROR_SUCCESS &&
          srt_cleaner_key.GetValueCount() > 0;
 }
 
 void SetSwReporterTestingDelegate(SwReporterTestingDelegate* delegate) {
   g_testing_delegate_ = delegate;
 }
 
 }  // namespace safe_browsing