[Reland] Refactoring of SBER preference usage

chrome/browser/interstitials/security_interstitial_page.cc

 // Copyright (c) 2014 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/interstitials/security_interstitial_page.h"
 
 #include <utility>
 
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 52 matching lines @@
   interstitial_page_ = content::InterstitialPage::Create(
       web_contents_, ShouldCreateNewNavigation(), request_url_, this);
   if (!create_view_)
     interstitial_page_->DontCreateViewForTesting();
   interstitial_page_->Show();
 
   controller_->set_interstitial_page(interstitial_page_);
   AfterShow();
 }
 
+Profile* SecurityInterstitialPage::profile() {
+  return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+}
+
 bool SecurityInterstitialPage::IsPrefEnabled(const char* pref) {
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-  return profile->GetPrefs()->GetBoolean(pref);
+  return profile()->GetPrefs()->GetBoolean(pref);
 }
 
 ChromeControllerClient* SecurityInterstitialPage::controller() {
   return controller_.get();
 }
 
 security_interstitials::MetricsHelper*
 SecurityInterstitialPage::metrics_helper() {
   return controller_->metrics_helper();
 }
 
 base::string16 SecurityInterstitialPage::GetFormattedHostName() const {
   return security_interstitials::common_string_util::GetFormattedHostName(
       request_url_);
 }
 
 std::string SecurityInterstitialPage::GetHTMLContents() {
   base::DictionaryValue load_time_data;
   PopulateInterstitialStrings(&load_time_data);
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   webui::SetLoadTimeDataDefaults(app_locale, &load_time_data);
   std::string html = ResourceBundle::GetSharedInstance()
                          .GetRawDataResource(IDR_SECURITY_INTERSTITIAL_HTML)
                          .as_string();
   webui::AppendWebUiCssTextDefaults(&html);
   return webui::GetI18nTemplateHtml(html, &load_time_data);
 }